summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--accessibility/Makefile1
-rw-r--r--accessibility/at-spi/Makefile4
-rw-r--r--accessibility/at-spi/distinfo6
-rw-r--r--accessibility/at-spi/pkg-plist2
-rw-r--r--accessibility/atk/Makefile4
-rw-r--r--accessibility/atk/distinfo6
-rw-r--r--accessibility/atk/pkg-plist4
-rw-r--r--accessibility/dasher/Makefile5
-rw-r--r--accessibility/dasher/distinfo6
-rw-r--r--accessibility/dasher/files/patch-Src_DasherCore_BasicLog.cpp11
-rw-r--r--accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp15
-rw-r--r--accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp17
-rw-r--r--accessibility/dasher/files/patch-configure18
-rw-r--r--accessibility/dasher/pkg-plist49
-rw-r--r--accessibility/gail/Makefile4
-rw-r--r--accessibility/gail/distinfo6
-rw-r--r--accessibility/gail/pkg-plist6
-rw-r--r--accessibility/gnome-mag/Makefile6
-rw-r--r--accessibility/gnome-mag/distinfo6
-rw-r--r--accessibility/gnome-mag/pkg-plist15
-rw-r--r--accessibility/java-access-bridge/Makefile35
-rw-r--r--accessibility/java-access-bridge/distinfo3
-rw-r--r--accessibility/java-access-bridge/pkg-descr3
-rw-r--r--accessibility/orca/Makefile6
-rw-r--r--accessibility/orca/distinfo6
-rw-r--r--accessibility/orca/pkg-plist54
-rw-r--r--archivers/file-roller/Makefile4
-rw-r--r--archivers/file-roller/distinfo6
-rw-r--r--archivers/file-roller/files/patch-src_file-utils.h16
-rw-r--r--archivers/file-roller/files/patch-src_fr-command-tar.c13
-rw-r--r--archivers/file-roller/pkg-plist68
-rw-r--r--audio/gnome-media/Makefile5
-rw-r--r--audio/gnome-media/distinfo6
-rw-r--r--audio/gnome-media/files/patch-configure74
-rw-r--r--audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c16
-rw-r--r--audio/rhythmbox-devel/Makefile5
-rw-r--r--audio/rhythmbox/Makefile5
-rw-r--r--databases/evolution-data-server/Makefile10
-rw-r--r--databases/evolution-data-server/distinfo6
-rw-r--r--databases/evolution-data-server/pkg-plist137
-rw-r--r--deskutils/alacarte/Makefile6
-rw-r--r--deskutils/alacarte/distinfo6
-rw-r--r--deskutils/alacarte/files/patch-Alacarte_DialogHandler.py11
-rw-r--r--deskutils/alacarte/pkg-plist10
-rw-r--r--deskutils/chmsee/Makefile5
-rw-r--r--deskutils/deskbar-applet/Makefile13
-rw-r--r--deskutils/deskbar-applet/distinfo6
-rw-r--r--deskutils/deskbar-applet/pkg-plist37
-rw-r--r--deskutils/evolution-jescs/Makefile8
-rw-r--r--deskutils/evolution-jescs/distinfo6
-rw-r--r--deskutils/evolution-jescs/pkg-plist1
-rw-r--r--deskutils/gnome-utils/Makefile4
-rw-r--r--deskutils/gnome-utils/distinfo6
-rw-r--r--deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c29
-rw-r--r--deskutils/gnome-utils/pkg-plist57
-rw-r--r--deskutils/gnotime/Makefile8
-rw-r--r--deskutils/gucharmap/Makefile4
-rw-r--r--deskutils/gucharmap/distinfo6
-rw-r--r--deskutils/gucharmap/pkg-plist8
-rw-r--r--deskutils/logjam/Makefile4
-rw-r--r--deskutils/nautilus-open-terminal/Makefile7
-rw-r--r--deskutils/nautilus-open-terminal/distinfo6
-rw-r--r--deskutils/nautilus-open-terminal/pkg-plist15
-rw-r--r--deskutils/nautilus-sendto/Makefile4
-rw-r--r--deskutils/nautilus-sendto/distinfo6
-rw-r--r--deskutils/nautilus-sendto/pkg-plist10
-rw-r--r--deskutils/ontv/Makefile17
-rw-r--r--deskutils/ontv/distinfo6
-rw-r--r--deskutils/ontv/files/patch-data_Makefile.in11
-rw-r--r--deskutils/ontv/files/patch-ontv___init__.in.py8
-rw-r--r--deskutils/ontv/pkg-descr5
-rw-r--r--deskutils/ontv/pkg-plist32
-rw-r--r--devel/Makefile2
-rw-r--r--devel/bug-buddy/Makefile6
-rw-r--r--devel/bug-buddy/distinfo6
-rw-r--r--devel/bug-buddy/files/patch-src_bug-buddy.menu.in6
-rw-r--r--devel/bug-buddy/pkg-plist2
-rw-r--r--devel/gamin/Makefile4
-rw-r--r--devel/gamin/distinfo6
-rw-r--r--devel/gconf2/Makefile4
-rw-r--r--devel/gconf2/distinfo6
-rw-r--r--devel/gconf2/files/patch-gconf_gconftool.c22
-rw-r--r--devel/gconfmm26/Makefile4
-rw-r--r--devel/gconfmm26/distinfo6
-rw-r--r--devel/glade3/Makefile30
-rw-r--r--devel/glade3/distinfo6
-rw-r--r--devel/glade3/pkg-plist146
-rw-r--r--devel/glibmm/Makefile4
-rw-r--r--devel/glibmm/distinfo6
-rw-r--r--devel/glibmm/pkg-plist2
-rw-r--r--devel/gnome-build/Makefile20
-rw-r--r--devel/gnome-build/distinfo6
-rw-r--r--devel/gnome-build/files/current-src_backends_libgbf_am_gbf-am-project.c11
-rw-r--r--devel/gnome-build/files/stable-src_backends_libgbf_am_gbf-am-project.c11
-rw-r--r--devel/gnome-build/pkg-plist30
-rw-r--r--devel/gnome-vfs/Makefile4
-rw-r--r--devel/gnome-vfs/distinfo6
-rw-r--r--devel/gnome-vfs/files/patch-configure52
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c10
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c10
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h17
-rw-r--r--devel/gnome-vfs/files/patch-modules_file-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-plist3
-rw-r--r--devel/gnome-vfsmm/Makefile4
-rw-r--r--devel/gnome-vfsmm/distinfo6
-rw-r--r--devel/goffice/Makefile10
-rw-r--r--devel/goffice/distinfo6
-rw-r--r--devel/goffice/files/patch-plugins_plot_radar_gog-radar.c15
-rw-r--r--devel/goffice/pkg-plist724
-rw-r--r--devel/goffice04/Makefile10
-rw-r--r--devel/goffice04/distinfo6
-rw-r--r--devel/goffice04/files/patch-plugins_plot_radar_gog-radar.c15
-rw-r--r--devel/goffice04/pkg-plist724
-rw-r--r--devel/goffice1/Makefile10
-rw-r--r--devel/goffice1/distinfo6
-rw-r--r--devel/goffice1/files/patch-plugins_plot_radar_gog-radar.c15
-rw-r--r--devel/goffice1/pkg-plist724
-rw-r--r--devel/libYGP/Makefile4
-rw-r--r--devel/libbonobo/Makefile9
-rw-r--r--devel/libbonobo/distinfo6
-rw-r--r--devel/libbonobo/pkg-plist6
-rw-r--r--devel/liboobs/Makefile27
-rw-r--r--devel/liboobs/distinfo3
-rw-r--r--devel/liboobs/files/patch-src_oobs-group.c25
-rw-r--r--devel/liboobs/files/patch-src_oobs-user.c23
-rw-r--r--devel/liboobs/pkg-descr1
-rw-r--r--devel/liboobs/pkg-plist81
-rw-r--r--devel/py-dbus/Makefile23
-rw-r--r--devel/py-dbus/distinfo6
-rw-r--r--devel/py-dbus/pkg-plist53
-rw-r--r--devel/py-gamin/Makefile2
-rw-r--r--devel/py-gamin/pkg-plist10
-rw-r--r--devel/xdg-user-dirs-gtk/Makefile22
-rw-r--r--devel/xdg-user-dirs-gtk/distinfo3
-rw-r--r--devel/xdg-user-dirs-gtk/pkg-descr2
-rw-r--r--devel/xdg-user-dirs-gtk/pkg-plist5
-rw-r--r--editors/gedit-plugins/Makefile7
-rw-r--r--editors/gedit-plugins/distinfo6
-rw-r--r--editors/gedit-plugins/pkg-plist19
-rw-r--r--editors/gedit/Makefile8
-rw-r--r--editors/gedit/distinfo6
-rw-r--r--editors/gedit/files/patch-plugins_externaltools_data_Makefile.in11
-rw-r--r--editors/gedit/pkg-plist38
-rw-r--r--finance/gnucash/Makefile7
-rw-r--r--finance/gnucash/files/patch-src_gnome-utils_gnc-html.c11
-rw-r--r--games/gnome-games-extra-data/Makefile5
-rw-r--r--games/gnome-games-extra-data/distinfo6
-rw-r--r--games/gnome-games-extra-data/pkg-plist2
-rw-r--r--games/gnome-games/Makefile32
-rw-r--r--games/gnome-games/distinfo6
-rw-r--r--games/gnome-games/pkg-install2
-rw-r--r--games/gnome-games/pkg-plist316
-rw-r--r--graphics/cairo/Makefile16
-rw-r--r--graphics/cairo/distinfo6
-rw-r--r--graphics/cairo/pkg-plist1
-rw-r--r--graphics/eog/Makefile5
-rw-r--r--graphics/eog/distinfo6
-rw-r--r--graphics/eog/files/patch-libeog_eog-image-list.c17
-rw-r--r--graphics/eog/pkg-plist42
-rw-r--r--graphics/evince/Makefile13
-rw-r--r--graphics/evince/distinfo6
-rw-r--r--graphics/evince/files/patch-CVE-2006-586422
-rw-r--r--graphics/evince/files/patch-backend_ps_ps-interpreter.c10
-rw-r--r--graphics/evince/files/patch-configure11
-rw-r--r--graphics/evince/pkg-plist157
-rw-r--r--graphics/p5-Cairo/Makefile4
-rw-r--r--graphics/p5-Cairo/distinfo6
-rw-r--r--graphics/py-cairo/Makefile7
-rw-r--r--graphics/py-cairo/distinfo6
-rw-r--r--mail/balsa/Makefile6
-rw-r--r--mail/evolution-exchange/Makefile25
-rw-r--r--mail/evolution-exchange/distinfo6
-rw-r--r--mail/evolution/Makefile32
-rw-r--r--mail/evolution/distinfo6
-rw-r--r--mail/evolution/files/patch-90_build_with_new_pisock907
-rw-r--r--mail/evolution/files/patch-data_Makefile.in25
-rw-r--r--mail/evolution/files/patch-mail_em-utils.h10
-rw-r--r--mail/evolution/files/patch-plugins_groupwise-features_junk-settings.c10
-rw-r--r--mail/evolution/pkg-plist478
-rw-r--r--mail/mail-notification/Makefile3
-rw-r--r--math/gcalctool/Makefile4
-rw-r--r--math/gcalctool/distinfo6
-rw-r--r--math/gcalctool/pkg-plist3
-rw-r--r--math/gnumeric/Makefile16
-rw-r--r--math/gnumeric/distinfo6
-rw-r--r--math/gnumeric/files/patch-src_tools_solver_lp_solve_lp_solve.c25
-rw-r--r--math/gnumeric/pkg-plist175
-rw-r--r--misc/gnome-icon-theme/Makefile5
-rw-r--r--misc/gnome-icon-theme/distinfo6
-rw-r--r--misc/gnome-icon-theme/pkg-plist627
-rw-r--r--misc/gnome-user-docs/Makefile4
-rw-r--r--misc/gnome-user-docs/distinfo6
-rw-r--r--misc/gnome-user-docs/pkg-plist226
-rw-r--r--misc/hicolor-icon-theme/Makefile9
-rw-r--r--misc/hicolor-icon-theme/distinfo6
-rw-r--r--misc/hicolor-icon-theme/files/pkg-install.in2
-rw-r--r--multimedia/Makefile2
-rw-r--r--multimedia/totem-gstreamer/Makefile22
-rw-r--r--multimedia/totem-xine/Makefile20
-rw-r--r--multimedia/totem/Makefile29
-rw-r--r--multimedia/totem/distinfo6
-rw-r--r--multimedia/totem/files/patch-browser-plugin_Makefile.in110
-rw-r--r--multimedia/totem/pkg-plist89
-rw-r--r--net-im/gaim/Makefile4
-rw-r--r--net-im/libgaim/Makefile6
-rw-r--r--net-im/libpurple/Makefile6
-rw-r--r--net/gnome-nettool/Makefile4
-rw-r--r--net/gnome-nettool/distinfo6
-rw-r--r--net/gnome-nettool/files/patch-src_info.c29
-rw-r--r--net/gnome-nettool/pkg-plist24
-rw-r--r--net/vino/Makefile5
-rw-r--r--net/vino/distinfo6
-rw-r--r--net/vino/files/patch-server_vino-prefs.c15
-rw-r--r--print/libgnomeprint/Makefile10
-rw-r--r--print/libgnomeprint/distinfo6
-rw-r--r--print/libgnomeprint/pkg-plist26
-rw-r--r--security/gaim-encryption/Makefile3
-rw-r--r--security/gnome-keyring-manager/Makefile4
-rw-r--r--security/gnome-keyring-manager/distinfo6
-rw-r--r--security/gnome-keyring-manager/pkg-plist26
-rw-r--r--security/gnome-keyring/Makefile5
-rw-r--r--security/gnome-keyring/distinfo6
-rw-r--r--security/gnome-keyring/files/patch-gnome-keyring.c30
-rw-r--r--security/gnome-keyring/pkg-plist4
-rw-r--r--security/nss/Makefile51
-rw-r--r--security/nss/files/nss-config.in137
-rw-r--r--security/nss/files/nss.pc.in11
-rw-r--r--security/nss/files/patch-..::coreconf::command.mk2
-rw-r--r--security/nss/files/patch-..::coreconf::rules.mk3
-rw-r--r--security/nss/files/patch-cmd::platlibs.mk3
-rw-r--r--security/nss/pkg-plist29
-rw-r--r--security/pidgin-encryption/Makefile3
-rw-r--r--security/seahorse/Makefile69
-rw-r--r--security/seahorse/distinfo6
-rw-r--r--security/seahorse/files/patch-agent_seahorse-agent.c40
-rw-r--r--security/seahorse/files/patch-configure20
-rw-r--r--security/seahorse/files/patch-libseahorse_seahorse-key-store.c22
-rw-r--r--security/seahorse/files/patch-libseahorse_seahorse-server-source.c15
-rw-r--r--security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c10
-rw-r--r--security/seahorse/files/patch-src_seahorse-generate-druid.c13
-rw-r--r--security/seahorse/pkg-plist231
-rw-r--r--sysutils/brasero/Makefile6
-rw-r--r--sysutils/brasero/distinfo6
-rw-r--r--sysutils/brasero/pkg-plist19
-rw-r--r--sysutils/gconf-editor/Makefile4
-rw-r--r--sysutils/gconf-editor/distinfo6
-rw-r--r--sysutils/gconf-editor/pkg-plist18
-rw-r--r--sysutils/gnome-control-center/Makefile8
-rw-r--r--sysutils/gnome-control-center/distinfo6
-rw-r--r--sysutils/gnome-control-center/files/patch-configure26
-rw-r--r--sysutils/gnome-control-center/files/patch-libslab_directory-tile.c9
-rw-r--r--sysutils/gnome-control-center/pkg-plist211
-rw-r--r--sysutils/gnome-mount/Makefile15
-rw-r--r--sysutils/gnome-mount/distinfo6
-rw-r--r--sysutils/gnome-mount/files/mntent.h56
-rw-r--r--sysutils/gnome-mount/files/patch-gnome-mount.schemas.in38
-rw-r--r--sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c87
-rw-r--r--sysutils/gnome-mount/files/patch-src_gnome-mount-properties.c4
-rw-r--r--sysutils/gnome-mount/files/patch-src_gnome-mount.c131
-rw-r--r--sysutils/gnome-mount/pkg-plist6
-rw-r--r--sysutils/gnome-power-manager/Makefile17
-rw-r--r--sysutils/gnome-power-manager/distinfo6
-rw-r--r--sysutils/gnome-power-manager/pkg-plist137
-rw-r--r--sysutils/gnome-system-monitor/Makefile12
-rw-r--r--sysutils/gnome-system-monitor/distinfo6
-rw-r--r--sysutils/gnome-system-monitor/files/patch-src::proctable.c33
-rw-r--r--sysutils/gnome-system-monitor/files/patch-src_openfiles.c10
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist66
-rw-r--r--sysutils/gnome-system-tools/Makefile21
-rw-r--r--sysutils/gnome-system-tools/distinfo6
-rw-r--r--sysutils/gnome-system-tools/files/patch-configure11
-rw-r--r--sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c110
-rw-r--r--sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c26
-rw-r--r--sysutils/gnome-system-tools/pkg-plist238
-rw-r--r--sysutils/gnome-volume-manager/Makefile6
-rw-r--r--sysutils/gnome-volume-manager/distinfo6
-rw-r--r--sysutils/gnome-volume-manager/files/patch-src_manager.c216
-rw-r--r--sysutils/gnome-volume-manager/pkg-plist10
-rw-r--r--sysutils/nautilus-cd-burner/Makefile4
-rw-r--r--sysutils/nautilus-cd-burner/distinfo6
-rw-r--r--sysutils/nautilus-cd-burner/pkg-plist3
-rw-r--r--sysutils/system-tools-backends/Makefile24
-rw-r--r--sysutils/system-tools-backends/distinfo6
-rw-r--r--sysutils/system-tools-backends/files/patch-network-conf.in11
-rw-r--r--sysutils/system-tools-backends/files/patch-network.pl.in97
-rw-r--r--sysutils/system-tools-backends/files/patch-platform.pl.in10
-rw-r--r--sysutils/system-tools-backends/files/patch-replace.pl.in29
-rw-r--r--sysutils/system-tools-backends/files/patch-service-list.pl.in20
-rw-r--r--sysutils/system-tools-backends/files/patch-service.pl.in18
-rw-r--r--sysutils/system-tools-backends/files/patch-services-conf.in11
-rw-r--r--sysutils/system-tools-backends/files/patch-shares-conf.in10
-rw-r--r--sysutils/system-tools-backends/files/patch-time-conf.in27
-rw-r--r--sysutils/system-tools-backends/files/patch-users-conf.in19
-rw-r--r--sysutils/system-tools-backends/files/system-tools-backends.in26
-rw-r--r--sysutils/system-tools-backends/pkg-plist189
-rw-r--r--textproc/docbook-sk/Makefile3
-rw-r--r--textproc/docbook-sk/pkg-plist2
-rw-r--r--textproc/gnome-doc-utils/Makefile9
-rw-r--r--textproc/gnome-doc-utils/distinfo6
-rw-r--r--textproc/gnome-doc-utils/files/patch-xml2po__xml2po.py41
-rw-r--r--textproc/gnome-doc-utils/pkg-plist24
-rw-r--r--textproc/libxml++26/Makefile8
-rw-r--r--textproc/libxml++26/distinfo6
-rw-r--r--textproc/libxml++26/pkg-plist65
-rw-r--r--textproc/scrollkeeper/Makefile19
-rw-r--r--textproc/scrollkeeper/files/patch-configure19
-rw-r--r--www/epiphany-extensions/Makefile9
-rw-r--r--www/epiphany-extensions/distinfo6
-rw-r--r--www/epiphany-extensions/pkg-plist31
-rw-r--r--www/epiphany/Makefile4
-rw-r--r--www/epiphany/distinfo6
-rw-r--r--www/epiphany/pkg-plist73
-rw-r--r--www/erwn/Makefile4
-rw-r--r--www/evolution-webcal/Makefile4
-rw-r--r--www/evolution-webcal/distinfo6
-rw-r--r--www/evolution-webcal/pkg-plist9
-rw-r--r--www/gtkhtml3/Makefile9
-rw-r--r--www/gtkhtml3/distinfo6
-rw-r--r--www/gtkhtml3/pkg-plist43
-rw-r--r--www/gtkhtml38/Makefile9
-rw-r--r--www/gtkhtml38/distinfo6
-rw-r--r--www/gtkhtml38/pkg-plist43
-rw-r--r--www/mozilla/Makefile5
-rw-r--r--www/mozilla/Makefile.common31
-rw-r--r--www/mozilla/bsd.gecko.mk2
-rw-r--r--www/mozilla/pkg-deinstall.in2
-rw-r--r--www/mozilla/pkg-install.in2
-rw-r--r--www/peacock/Makefile6
-rw-r--r--x11-fm/nautilus/Makefile19
-rw-r--r--x11-fm/nautilus/distinfo6
-rw-r--r--x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c10
-rw-r--r--x11-fm/nautilus/pkg-plist8
-rw-r--r--x11-fonts/fontconfig/Makefile36
-rw-r--r--x11-fonts/fontconfig/distinfo9
-rw-r--r--x11-fonts/fontconfig/files/fc-cache.175
-rw-r--r--x11-fonts/fontconfig/files/fc-cat.137
-rw-r--r--x11-fonts/fontconfig/files/fc-list.161
-rw-r--r--x11-fonts/fontconfig/files/fc-match.151
-rw-r--r--x11-fonts/fontconfig/files/patch-Makefile.in19
-rw-r--r--x11-fonts/fontconfig/files/patch-fc_match.c11
-rw-r--r--x11-fonts/fontconfig/files/pkg-install.in4
-rw-r--r--x11-fonts/fontconfig/pkg-plist49
-rw-r--r--x11-fonts/linux-f10-fontconfig/Makefile4
-rw-r--r--x11-fonts/linux-f10-fontconfig/files/fonts.conf436
-rw-r--r--x11-fonts/linux-f8-fontconfig/Makefile4
-rw-r--r--x11-fonts/linux-f8-fontconfig/files/fonts.conf436
-rw-r--r--x11-fonts/linux-fontconfig/Makefile4
-rw-r--r--x11-fonts/linux-fontconfig/files/fonts.conf436
-rw-r--r--x11-themes/gnome-themes/Makefile8
-rw-r--r--x11-themes/gnome-themes/distinfo6
-rw-r--r--x11-themes/gnome-themes/pkg-plist67
-rw-r--r--x11-themes/gtk-engines2/Makefile23
-rw-r--r--x11-themes/gtk-engines2/distinfo6
-rw-r--r--x11-themes/gtk-engines2/pkg-plist25
-rw-r--r--x11-toolkits/Makefile2
-rw-r--r--x11-toolkits/eel/Makefile4
-rw-r--r--x11-toolkits/eel/distinfo6
-rw-r--r--x11-toolkits/eel/pkg-plist1
-rw-r--r--x11-toolkits/gdl/Makefile6
-rw-r--r--x11-toolkits/gdl/distinfo6
-rw-r--r--x11-toolkits/gdl/pkg-plist24
-rw-r--r--x11-toolkits/gnome-sharp20/Makefile6
-rw-r--r--x11-toolkits/gtk-sharp10/Makefile5
-rw-r--r--x11-toolkits/libbonoboui/Makefile4
-rw-r--r--x11-toolkits/libbonoboui/distinfo6
-rw-r--r--x11-toolkits/libbonoboui/files/patch-Makefile.in14
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist6
-rw-r--r--x11-toolkits/libgail-gnome/Makefile24
-rw-r--r--x11-toolkits/libgail-gnome/distinfo6
-rw-r--r--x11-toolkits/libgail-gnome/pkg-plist4
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile7
-rw-r--r--x11-toolkits/libgnomeprintui/distinfo6
-rw-r--r--x11-toolkits/libgnomeprintui/pkg-plist36
-rw-r--r--x11-toolkits/libgnomeui/Makefile4
-rw-r--r--x11-toolkits/libgnomeui/distinfo6
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist6
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile6
-rw-r--r--x11-toolkits/libgnomeuimm26/distinfo6
-rw-r--r--x11-toolkits/libgtksourceviewmm/Makefile28
-rw-r--r--x11-toolkits/libgtksourceviewmm/distinfo3
-rw-r--r--x11-toolkits/libgtksourceviewmm/pkg-descr3
-rw-r--r--x11-toolkits/libgtksourceviewmm/pkg-plist34
-rw-r--r--x11-toolkits/libwnck/Makefile4
-rw-r--r--x11-toolkits/libwnck/distinfo6
-rw-r--r--x11-toolkits/libwnck/pkg-plist3
-rw-r--r--x11-toolkits/pango/Makefile6
-rw-r--r--x11-toolkits/pango/distinfo6
-rw-r--r--x11-toolkits/pango/pkg-plist3
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile11
-rw-r--r--x11-toolkits/py-gnome-desktop/distinfo6
-rw-r--r--x11-toolkits/py-gnome-desktop/pkg-plist124
-rw-r--r--x11-toolkits/py-gnome2/Makefile4
-rw-r--r--x11-toolkits/py-gnome2/distinfo6
-rw-r--r--x11-toolkits/py-gnome2/pkg-plist2
-rw-r--r--x11-toolkits/py-vte/Makefile27
-rw-r--r--x11-toolkits/py-vte/pkg-descr3
-rw-r--r--x11-toolkits/py-vte/pkg-plist3
-rw-r--r--x11-toolkits/vte/Makefile19
-rw-r--r--x11-toolkits/vte/distinfo6
-rw-r--r--x11-toolkits/vte/files/patch-configure10
-rw-r--r--x11-toolkits/vte/files/patch-python_Makefile.in19
-rw-r--r--x11-toolkits/vte/files/patch-src_pty.c27
-rw-r--r--x11-toolkits/vte/pkg-descr2
-rw-r--r--x11-toolkits/vte/pkg-plist3
-rw-r--r--x11-wm/metacity/Makefile8
-rw-r--r--x11-wm/metacity/distinfo6
-rw-r--r--x11-wm/metacity/files/patch-configure15
-rw-r--r--x11-wm/metacity/pkg-plist14
-rw-r--r--x11/Makefile1
-rw-r--r--x11/fast-user-switch-applet/Makefile5
-rw-r--r--x11/fast-user-switch-applet/distinfo6
-rw-r--r--x11/fast-user-switch-applet/files/patch-src_gdm-queue.c10
-rw-r--r--x11/fast-user-switch-applet/pkg-plist40
-rw-r--r--x11/gdm/Makefile7
-rw-r--r--x11/gdm/distinfo6
-rw-r--r--x11/gdm/files/extra-patch-daemon_slave.c8
-rw-r--r--x11/gdm/files/gdm.in2
-rw-r--r--x11/gdm/files/patch-config_locale.alias57
-rw-r--r--x11/gdm/pkg-plist4
-rw-r--r--x11/gnome-applets/Makefile19
-rw-r--r--x11/gnome-applets/distinfo6
-rw-r--r--x11/gnome-applets/files/patch-cpufreq-freebsd311
-rw-r--r--x11/gnome-applets/files/patch-cpufreq-selector-freebsd88
-rw-r--r--x11/gnome-applets/pkg-plist189
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-desktop/distinfo6
-rw-r--r--x11/gnome-desktop/pkg-plist54
-rw-r--r--x11/gnome-menus/Makefile4
-rw-r--r--x11/gnome-menus/distinfo6
-rw-r--r--x11/gnome-menus/files/patch-layout::preferences.menu14
-rw-r--r--x11/gnome-menus/files/patch-layout::settings.menu22
-rw-r--r--x11/gnome-menus/pkg-plist13
-rw-r--r--x11/gnome-panel/Makefile8
-rw-r--r--x11/gnome-panel/distinfo6
-rw-r--r--x11/gnome-panel/pkg-plist38
-rw-r--r--x11/gnome-screensaver/Makefile13
-rw-r--r--x11/gnome-screensaver/distinfo6
-rw-r--r--x11/gnome-screensaver/files/patch-src_gs-auth-pam.c11
-rw-r--r--x11/gnome-screensaver/pkg-plist201
-rw-r--r--x11/gnome-session/Makefile21
-rw-r--r--x11/gnome-session/distinfo12
-rw-r--r--x11/gnome-session/files/patch-data_Makefile.in20
-rw-r--r--x11/gnome-session/files/patch-dbus429
-rw-r--r--x11/gnome-session/files/patch-gnome-session_Makefile.in26
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-dbus.c35
-rw-r--r--x11/gnome-session/pkg-plist7
-rw-r--r--x11/gnome-terminal/Makefile5
-rw-r--r--x11/gnome-terminal/distinfo6
-rw-r--r--x11/gnome-terminal/files/patch-src_terminal-window.c276
-rw-r--r--x11/gnome-terminal/files/patch-src_terminal-window.h18
-rw-r--r--x11/gnome-terminal/pkg-plist8
-rw-r--r--x11/gnome2-fifth-toe/Makefile3
-rw-r--r--x11/gnome2-lite/Makefile4
-rw-r--r--x11/gnome2-power-tools/Makefile4
-rw-r--r--x11/gnome2/Makefile19
-rw-r--r--x11/libgnome/Makefile8
-rw-r--r--x11/libgnome/distinfo6
-rw-r--r--x11/libgnome/files/pkg-deinstall.in2
-rw-r--r--x11/libgnome/pkg-plist4
-rw-r--r--x11/libgnomekbd/Makefile33
-rw-r--r--x11/libgnomekbd/distinfo3
-rw-r--r--x11/libgnomekbd/pkg-descr1
-rw-r--r--x11/libgnomekbd/pkg-plist30
-rw-r--r--x11/libgnomemm26/Makefile4
-rw-r--r--x11/libgnomemm26/distinfo6
-rw-r--r--x11/libxklavier/Makefile15
-rw-r--r--x11/libxklavier/distinfo6
-rw-r--r--x11/libxklavier/files/patch-configure44
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_config.c24
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c11
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c11
-rw-r--r--x11/libxklavier/pkg-plist1
-rw-r--r--x11/yelp/Makefile4
-rw-r--r--x11/yelp/distinfo6
-rw-r--r--x11/zenity/Makefile4
-rw-r--r--x11/zenity/distinfo6
-rw-r--r--x11/zenity/pkg-plist3
479 files changed, 9725 insertions, 6360 deletions
diff --git a/accessibility/Makefile b/accessibility/Makefile
index 321e8cc..241425f 100644
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@@ -15,6 +15,7 @@
SUBDIR += gnome-speech
SUBDIR += gnopernicus
SUBDIR += gok
+ SUBDIR += java-access-bridge
SUBDIR += kdeaccessibility
SUBDIR += linux-atk
SUBDIR += orca
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index b489bd7..5d01337 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/at-spi/Makefile,v 1.50 2006/10/02 00:50:26 ahze Exp $
+# $MCom: ports/accessibility/at-spi/Makefile,v 1.56 2007/03/12 13:22:49 ahze Exp $
#
PORTNAME= at-spi
-PORTVERSION= 1.7.15
+PORTVERSION= 1.18.0
PORTREVISION?= 0
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index 4090543..4527c3b 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/at-spi-1.7.15.tar.bz2) = b8af15556d24e850feb2ffb40eda1d31
-SHA256 (gnome2/at-spi-1.7.15.tar.bz2) = 84b54825c61177bbdba9e58f7f31a733c36ba721e729744fde7011f08f01d14d
-SIZE (gnome2/at-spi-1.7.15.tar.bz2) = 776710
+MD5 (gnome2/at-spi-1.18.0.tar.bz2) = d77f3b7111a847903f66f5cb111ee89e
+SHA256 (gnome2/at-spi-1.18.0.tar.bz2) = 1d77e06c4cea6111faee520beb3d2fbc0d746879e16eb9fb0782e7d3743a58eb
+SIZE (gnome2/at-spi-1.18.0.tar.bz2) = 778719
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 4e55eb5..4c68362 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -146,7 +146,7 @@ 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
@dirrm share/gnome/idl/at-spi-1.0
-@dirrm lib/orbit-2.0
+@dirrmtry lib/orbit-2.0
@dirrm include/at-spi-1.0/login-helper
@dirrm include/at-spi-1.0/libspi
@dirrm include/at-spi-1.0/cspi
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 69d9f15..9c68eb4 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/atk/Makefile,v 1.73 2006/10/02 00:43:11 ahze Exp $
+# $MCom: ports/accessibility/atk/Makefile,v 1.78 2007/03/12 13:28:58 ahze Exp $
#
PORTNAME= atk
-PORTVERSION= 1.12.4
+PORTVERSION= 1.18.0
PORTREVISION?= 0
CATEGORIES= accessibility devel
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 6f68979..5fada46 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/atk-1.12.4.tar.bz2) = 0a2c6a7bbc380e3a3d94e9061f76a849
-SHA256 (gnome2/atk-1.12.4.tar.bz2) = bb62ff3809785512b44d1a523056c28a79844df13e39bddac89045be4adc0500
-SIZE (gnome2/atk-1.12.4.tar.bz2) = 647699
+MD5 (gnome2/atk-1.18.0.tar.bz2) = 9fc33ec48fd32933f7f630479dfad667
+SHA256 (gnome2/atk-1.18.0.tar.bz2) = be2d537642a43b5a1e85a2d0f813167b8585781ff83203a4f68206c3ecd6a315
+SIZE (gnome2/atk-1.18.0.tar.bz2) = 655890
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index b4b98d2..f919f09 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -9,6 +9,7 @@ include/atk-1.0/atk/atkhyperlink.h
include/atk-1.0/atk/atkhyperlinkimpl.h
include/atk-1.0/atk/atkhypertext.h
include/atk-1.0/atk/atkimage.h
+include/atk-1.0/atk/atkmisc.h
include/atk-1.0/atk/atknoopobject.h
include/atk-1.0/atk/atknoopobjectfactory.h
include/atk-1.0/atk/atkobject.h
@@ -36,6 +37,7 @@ share/locale/ar/LC_MESSAGES/atk10.mo
share/locale/as/LC_MESSAGES/atk10.mo
share/locale/az/LC_MESSAGES/atk10.mo
share/locale/be/LC_MESSAGES/atk10.mo
+share/locale/be@latin/LC_MESSAGES/atk10.mo
share/locale/bg/LC_MESSAGES/atk10.mo
share/locale/bn/LC_MESSAGES/atk10.mo
share/locale/bn_IN/LC_MESSAGES/atk10.mo
@@ -177,6 +179,8 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
@dirrmtry share/locale/as/LC_MESSAGES
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index a6d827bb..81f4fa7 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -3,11 +3,11 @@
# Whom: lewiz <purple@lewiz.net>
#
# $FreeBSD$
-# $MCom: ports/accessibility/dasher/Makefile,v 1.44 2006/09/03 21:33:52 marcus Exp $
+# $MCom: ports/accessibility/dasher/Makefile,v 1.50 2007/03/12 20:16:34 mezz Exp $
#
PORTNAME= dasher
-PORTVERSION= 4.2.2
+PORTVERSION= 4.4.0
PORTEPOCH= 1
CATEGORIES= accessibility editors x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -34,6 +34,7 @@ USE_GCC= 3.4+
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+GCONF_SCHEMAS= dasher.schemas
MAN1= dasher.1
.include <bsd.port.pre.mk>
diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo
index 062659c..2c598e4 100644
--- a/accessibility/dasher/distinfo
+++ b/accessibility/dasher/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/dasher-4.2.2.tar.bz2) = eff0aeda6c02b03263c4712f56bd3b1c
-SHA256 (gnome2/dasher-4.2.2.tar.bz2) = a51a3bf9a3a1b28a5e9dacc82bad14903a93389a0df92b289e8c2f4180e8bdcf
-SIZE (gnome2/dasher-4.2.2.tar.bz2) = 5625199
+MD5 (gnome2/dasher-4.4.0.tar.bz2) = e47684793d29904f64370393234cf604
+SHA256 (gnome2/dasher-4.4.0.tar.bz2) = 66fab7ac772fa1cb2fad1fe9183effa73d345fec364942e1dbc8084600d1d73a
+SIZE (gnome2/dasher-4.4.0.tar.bz2) = 6741569
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_BasicLog.cpp b/accessibility/dasher/files/patch-Src_DasherCore_BasicLog.cpp
new file mode 100644
index 0000000..baf4706
--- /dev/null
+++ b/accessibility/dasher/files/patch-Src_DasherCore_BasicLog.cpp
@@ -0,0 +1,11 @@
+--- Src/DasherCore/BasicLog.cpp.orig Tue Dec 5 22:01:38 2006
++++ Src/DasherCore/BasicLog.cpp Tue Dec 5 22:02:14 2006
+@@ -87,7 +87,7 @@ std::string CBasicLog::GetDateStamp() {
+ szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+ gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+- szTimeLine = ctime(&(sTimeBuffer.tv_sec));
++ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+ #endif
+
+ return std::string(szTimeLine).substr(0, 24);
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
index 6b5fdba..ec71875 100644
--- a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
@@ -1,6 +1,6 @@
---- Src/DasherCore/FileLogger.cpp.orig Fri Apr 21 17:41:01 2006
-+++ Src/DasherCore/FileLogger.cpp Sun Jun 11 07:33:19 2006
-@@ -511,7 +511,7 @@
+--- Src/DasherCore/FileLogger.cpp.orig Sun Dec 3 09:50:34 2006
++++ Src/DasherCore/FileLogger.cpp Sun Dec 3 18:45:55 2006
+@@ -511,7 +511,7 @@ std::string CFileLogger::GetTimeDateStam
szTimeLine = ctime(&(sTimeBuffer.time));
#else
gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
@@ -9,12 +9,3 @@
#endif
// Format is:
-@@ -538,7 +538,7 @@
- #ifdef _WIN32
- sprintf(strMs, "%d", sTimeBuffer.millitm);
- #else
-- sprintf(strMs, "%d", sTimeBuffer.tv_usec / 1000);
-+ sprintf(strMs, "%d", (int) (sTimeBuffer.tv_usec / 1000));
- #endif
- if (strlen(strMs) == 1)
- strTimeStamp += "00";
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
index d41cf9b..c10219f 100644
--- a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
@@ -1,6 +1,6 @@
---- Src/DasherCore/TimeSpan.cpp.orig Fri Apr 21 17:41:02 2006
-+++ Src/DasherCore/TimeSpan.cpp Sun Jun 11 09:21:30 2006
-@@ -122,7 +122,7 @@
+--- Src/DasherCore/TimeSpan.cpp.orig Sun Dec 3 09:50:34 2006
++++ Src/DasherCore/TimeSpan.cpp Sun Dec 3 18:47:02 2006
+@@ -122,7 +122,7 @@ string CTimeSpan::GetTimeStamp()
szTimeLine = ctime(&(sTimeBuffer.time));
#else
gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
@@ -9,16 +9,7 @@
#endif
if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
-@@ -134,7 +134,7 @@
- #ifdef _WIN32
- sprintf(szMs, "%d", sTimeBuffer.millitm);
- #else
-- sprintf(szMs, "%d", sTimeBuffer.tv_usec / 1000);
-+ sprintf(szMs, "%d", (int) (sTimeBuffer.tv_usec / 1000));
- #endif
- if (strlen(szMs) == 1)
- strTimeStamp += "00";
-@@ -196,7 +196,7 @@
+@@ -196,7 +196,7 @@ string CTimeSpan::GetDateStamp()
szTimeLine = ctime(&(sTimeBuffer.time));
#else
gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
diff --git a/accessibility/dasher/files/patch-configure b/accessibility/dasher/files/patch-configure
index 7ade63c..bde9cc5 100644
--- a/accessibility/dasher/files/patch-configure
+++ b/accessibility/dasher/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig Wed May 17 00:00:16 2006
-+++ configure Wed May 17 00:01:21 2006
-@@ -24000,7 +24000,7 @@ GTK2BUILD_CFLAGS="$GTK2_CFLAGS $SETTINGS
- if [ x"$WITHDARWIN" = xtrue ]; then
- GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS"
+--- configure.orig Sun Dec 3 18:59:04 2006
++++ configure Sun Dec 3 18:59:15 2006
+@@ -23152,7 +23152,7 @@ echo "$as_me:$LINENO: result: $have_prog
+ echo "${ECHO_T}$have_prog_gnu_ld" >&6
+
+ if [ x"$have_prog_gnu_ld" = xyes ]; then
+- ed_flags="-Wl,--export-dynamic,"
++ ed_flags="-Wl,--export-dynamic"
else
-- 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"
+ ed_flags=""
fi
-
-
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index 27fbfaa..8dbe0c0 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -3,7 +3,6 @@ share/gnome/applications/dasher.desktop
share/gnome/dasher/alphabet.AfaanOromo.xml
share/gnome/dasher/alphabet.Armenian.xml
share/gnome/dasher/alphabet.Assamese.xml
-share/gnome/dasher/alphabet.Austen.xml
share/gnome/dasher/alphabet.Azerbaijani.xml
share/gnome/dasher/alphabet.Belarusian.xml
share/gnome/dasher/alphabet.Bulgarian.xml
@@ -105,6 +104,7 @@ share/gnome/dasher/alphabet.latvian.xml
share/gnome/dasher/alphabet.lithuanian.xml
share/gnome/dasher/alphabet.luxembourgish.xml
share/gnome/dasher/alphabet.macedonian.xml
+share/gnome/dasher/alphabet.malagasy.xml
share/gnome/dasher/alphabet.maltese.xml
share/gnome/dasher/alphabet.mongolian.xml
share/gnome/dasher/alphabet.myanmar.xml
@@ -113,7 +113,6 @@ share/gnome/dasher/alphabet.norwegian.xml
share/gnome/dasher/alphabet.occitan.xml
share/gnome/dasher/alphabet.ogham.xml
share/gnome/dasher/alphabet.pashto.xml
-share/gnome/dasher/alphabet.perl.xml
share/gnome/dasher/alphabet.persian.xml
share/gnome/dasher/alphabet.pinyin.xml
share/gnome/dasher/alphabet.polish.xml
@@ -147,11 +146,15 @@ 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/dasher.compose.glade
+share/gnome/dasher/dasher.direct.glade
+share/gnome/dasher/dasher.fullscreen.glade
+share/gnome/dasher/dasher.traditional.glade
+share/gnome/dasher/dashermaemo.glade
+share/gnome/dasher/dashermaemofullscreen.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
@@ -192,7 +195,41 @@ share/gnome/help/dasher/C/figures/prefs2.png
share/gnome/help/dasher/C/figures/prefs3.png
share/gnome/help/dasher/C/figures/prefs4.png
share/gnome/help/dasher/C/figures/prefs5.png
+share/gnome/help/dasher/fr/dasher.xml
+share/gnome/help/dasher/fr/figures/a-z.gif
+share/gnome/help/dasher/fr/figures/aa-az.gif
+share/gnome/help/dasher/fr/figures/ala-alz.gif
+share/gnome/help/dasher/fr/figures/exampleHad2.png
+share/gnome/help/dasher/fr/figures/exampleHad2a.png
+share/gnome/help/dasher/fr/figures/exampleHad3a.png
+share/gnome/help/dasher/fr/figures/exampleHad4.png
+share/gnome/help/dasher/fr/figures/figure2.png
+share/gnome/help/dasher/fr/figures/main.png
+share/gnome/help/dasher/fr/figures/object.gif
+share/gnome/help/dasher/fr/figures/prefs1.png
+share/gnome/help/dasher/fr/figures/prefs2.png
+share/gnome/help/dasher/fr/figures/prefs3.png
+share/gnome/help/dasher/fr/figures/prefs4.png
+share/gnome/help/dasher/fr/figures/prefs5.png
+share/gnome/help/dasher/sv/dasher.xml
+share/gnome/help/dasher/sv/figures/a-z.gif
+share/gnome/help/dasher/sv/figures/aa-az.gif
+share/gnome/help/dasher/sv/figures/ala-alz.gif
+share/gnome/help/dasher/sv/figures/exampleHad2.png
+share/gnome/help/dasher/sv/figures/exampleHad2a.png
+share/gnome/help/dasher/sv/figures/exampleHad3a.png
+share/gnome/help/dasher/sv/figures/exampleHad4.png
+share/gnome/help/dasher/sv/figures/figure2.png
+share/gnome/help/dasher/sv/figures/main.png
+share/gnome/help/dasher/sv/figures/object.gif
+share/gnome/help/dasher/sv/figures/prefs1.png
+share/gnome/help/dasher/sv/figures/prefs2.png
+share/gnome/help/dasher/sv/figures/prefs3.png
+share/gnome/help/dasher/sv/figures/prefs4.png
+share/gnome/help/dasher/sv/figures/prefs5.png
share/gnome/omf/dasher/dasher-C.omf
+share/gnome/omf/dasher/dasher-fr.omf
+share/gnome/omf/dasher/dasher-sv.omf
share/icons/hicolor/48x48/apps/dasher.png
share/icons/hicolor/scalable/apps/dasher.svg
share/locale/ar/LC_MESSAGES/dasher.mo
@@ -268,6 +305,10 @@ share/locale/zh_CN/LC_MESSAGES/dasher.mo
share/locale/zh_HK/LC_MESSAGES/dasher.mo
share/locale/zh_TW/LC_MESSAGES/dasher.mo
@dirrm share/gnome/omf/dasher
+@dirrm share/gnome/help/dasher/sv/figures
+@dirrm share/gnome/help/dasher/sv
+@dirrm share/gnome/help/dasher/fr/figures
+@dirrm share/gnome/help/dasher/fr
@dirrm share/gnome/help/dasher/C/figures
@dirrm share/gnome/help/dasher/C
@dirrm share/gnome/help/dasher
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index c9986f9..f01d500 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gail/Makefile,v 1.52 2006/10/02 00:47:13 ahze Exp $
+# $MCom: ports/accessibility/gail/Makefile,v 1.57 2007/03/12 13:34:38 ahze Exp $
#
PORTNAME= gail
-PORTVERSION= 1.9.4
+PORTVERSION= 1.18.0
PORTREVISION?= 0
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo
index d63ac0c..302d99f 100644
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gail-1.9.4.tar.bz2) = eff7a5d2fffe914295ca937b128c5f40
-SHA256 (gnome2/gail-1.9.4.tar.bz2) = 7c5663e8429747b84b303a4369e20edc3e070be0b96246e36ab2f0b9e4ada50e
-SIZE (gnome2/gail-1.9.4.tar.bz2) = 603416
+MD5 (gnome2/gail-1.18.0.tar.bz2) = d58ad8cc79d3cb6778bc015ef69fb499
+SHA256 (gnome2/gail-1.18.0.tar.bz2) = 1a047f1aa43ad455baff1e9a0abf94c957c42490d365ffde19707d0f039a9705
+SIZE (gnome2/gail-1.18.0.tar.bz2) = 610187
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index a0e18c2..976bd49 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -14,6 +14,7 @@ share/locale/ar/LC_MESSAGES/gail.mo
share/locale/as/LC_MESSAGES/gail.mo
share/locale/az/LC_MESSAGES/gail.mo
share/locale/be/LC_MESSAGES/gail.mo
+share/locale/be@latin/LC_MESSAGES/gail.mo
share/locale/bg/LC_MESSAGES/gail.mo
share/locale/bn/LC_MESSAGES/gail.mo
share/locale/bn_IN/LC_MESSAGES/gail.mo
@@ -49,6 +50,7 @@ share/locale/ko/LC_MESSAGES/gail.mo
share/locale/ku/LC_MESSAGES/gail.mo
share/locale/lt/LC_MESSAGES/gail.mo
share/locale/lv/LC_MESSAGES/gail.mo
+share/locale/mg/LC_MESSAGES/gail.mo
share/locale/mi/LC_MESSAGES/gail.mo
share/locale/mk/LC_MESSAGES/gail.mo
share/locale/ml/LC_MESSAGES/gail.mo
@@ -117,6 +119,8 @@ share/locale/zh_TW/LC_MESSAGES/gail.mo
@dirrmtry share/locale/ne
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/ko/LC_MESSAGES
@@ -135,6 +139,8 @@ share/locale/zh_TW/LC_MESSAGES/gail.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
@dirrmtry share/locale/as/LC_MESSAGES
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 01f5566..b628989 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.22 2006/09/10 00:51:05 mezz Exp $
+# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.27 2007/03/11 06:58:01 marcus Exp $
#
PORTNAME= gnome-mag
-PORTVERSION= 0.13.2
+PORTVERSION= 0.14.3
CATEGORIES= accessibility gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -28,4 +28,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
DOCSDIR= ${PREFIX}/share/doc/gnome-mag-${PORTVERSION}
+MAN1= magnifier.1
+
.include <bsd.port.mk>
diff --git a/accessibility/gnome-mag/distinfo b/accessibility/gnome-mag/distinfo
index d0217e7..6265333 100644
--- a/accessibility/gnome-mag/distinfo
+++ b/accessibility/gnome-mag/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-mag-0.13.2.tar.bz2) = 093c153c0d8bad40d40d4f7c21be8975
-SHA256 (gnome2/gnome-mag-0.13.2.tar.bz2) = 077a5d8e9dfb42413de54e188fddf88535b48b009754b0780c119a23de639eab
-SIZE (gnome2/gnome-mag-0.13.2.tar.bz2) = 731140
+MD5 (gnome2/gnome-mag-0.14.3.tar.bz2) = db9660614f7948a12b18464683a5704f
+SHA256 (gnome2/gnome-mag-0.14.3.tar.bz2) = 70796a74ff38a4ef61e32c1f153ca0d650b3f4fa12bcc15bdfafb44cdec116f1
+SIZE (gnome2/gnome-mag-0.14.3.tar.bz2) = 789808
diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist
index 58c9c92..d5b7d15 100644
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@@ -22,13 +22,9 @@ libdata/pkgconfig/gnome-mag-1.0.pc
%%DOCSDIR%%/reference/html/GNOME__Magnifier_8idl-source.html
%%DOCSDIR%%/reference/html/GNOME__Magnifier_8idl.html
%%DOCSDIR%%/reference/html/annotated.html
-%%DOCSDIR%%/reference/html/damage-client_8c-source.html
-%%DOCSDIR%%/reference/html/damage-client_8c.html
-%%DOCSDIR%%/reference/html/damage-client_8h-source.html
-%%DOCSDIR%%/reference/html/damage-client_8h.html
-%%DOCSDIR%%/reference/html/dir_87465088ddb33e7a87f93e298b526e3e.html
-%%DOCSDIR%%/reference/html/dir_be9d3086025220affea426c40de4e445.html
%%DOCSDIR%%/reference/html/dirs.html
+%%DOCSDIR%%/reference/html/dir_6873ac4aad386abfe4dc85b1c4c7162f.html
+%%DOCSDIR%%/reference/html/dir_ed2a549a3a7169145b90da06827de1bb.html
%%DOCSDIR%%/reference/html/doxygen.css
%%DOCSDIR%%/reference/html/doxygen.png
%%DOCSDIR%%/reference/html/files.html
@@ -45,6 +41,7 @@ libdata/pkgconfig/gnome-mag-1.0.pc
%%DOCSDIR%%/reference/html/functions_0x6c.html
%%DOCSDIR%%/reference/html/functions_0x6d.html
%%DOCSDIR%%/reference/html/functions_0x6e.html
+%%DOCSDIR%%/reference/html/functions_0x6f.html
%%DOCSDIR%%/reference/html/functions_0x70.html
%%DOCSDIR%%/reference/html/functions_0x71.html
%%DOCSDIR%%/reference/html/functions_0x72.html
@@ -72,6 +69,7 @@ libdata/pkgconfig/gnome-mag-1.0.pc
%%DOCSDIR%%/reference/html/functions_vars_0x6c.html
%%DOCSDIR%%/reference/html/functions_vars_0x6d.html
%%DOCSDIR%%/reference/html/functions_vars_0x6e.html
+%%DOCSDIR%%/reference/html/functions_vars_0x6f.html
%%DOCSDIR%%/reference/html/functions_vars_0x70.html
%%DOCSDIR%%/reference/html/functions_vars_0x71.html
%%DOCSDIR%%/reference/html/functions_vars_0x72.html
@@ -128,6 +126,10 @@ libdata/pkgconfig/gnome-mag-1.0.pc
%%DOCSDIR%%/reference/html/globals_func_0x7a.html
%%DOCSDIR%%/reference/html/globals_type.html
%%DOCSDIR%%/reference/html/globals_vars.html
+%%DOCSDIR%%/reference/html/gmag-events_8c-source.html
+%%DOCSDIR%%/reference/html/gmag-events_8c.html
+%%DOCSDIR%%/reference/html/gmag-events_8h-source.html
+%%DOCSDIR%%/reference/html/gmag-events_8h.html
%%DOCSDIR%%/reference/html/index.html
%%DOCSDIR%%/reference/html/interfaceGNOME_1_1Magnifier_1_1Magnifier.html
%%DOCSDIR%%/reference/html/interfaceGNOME_1_1Magnifier_1_1ZoomRegion.html
@@ -183,6 +185,7 @@ libdata/pkgconfig/gnome-mag-1.0.pc
%%DOCSDIR%%/reference/html/structPOA__GNOME__Magnifier__ZoomRegion____vepv.html
%%DOCSDIR%%/reference/html/structZoomRegion.html
%%DOCSDIR%%/reference/html/structZoomRegionClass.html
+%%DOCSDIR%%/reference/html/struct__GmagWin.html
%%DOCSDIR%%/reference/html/struct__MagnifierPrivate.html
%%DOCSDIR%%/reference/html/struct__ZoomRegionPrivate.html
%%DOCSDIR%%/reference/html/structtiming.html
diff --git a/accessibility/java-access-bridge/Makefile b/accessibility/java-access-bridge/Makefile
new file mode 100644
index 0000000..a0b505a
--- /dev/null
+++ b/accessibility/java-access-bridge/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for: java-access-bridge
+# Date created: 2006-11-04
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/accessibility/java-access-bridge/Makefile,v 1.2 2007/03/06 14:03:02 ahze Exp $
+
+PORTNAME= java-access-bridge
+PORTVERSION= 1.18.0
+CATEGORIES= accessibility java gnome
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gnome Java Accessibility Bridge
+
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_GNOME= atspi gnomehack
+USE_JAVA= 1.4+
+JAVA_OS= native
+USE_GMAKE= yes
+CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR}
+
+PLIST_FILES= share/jar/JNav.jar \
+ share/jar/accessibility.properties \
+ share/java/classes/gnome-java-bridge.jar
+
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|$${prefix}/share/jar|${JAVAJARDIR}|' \
+ ${WRKSRC}/Makefile.in \
+ ${WRKSRC}/bridge/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/accessibility/java-access-bridge/distinfo b/accessibility/java-access-bridge/distinfo
new file mode 100644
index 0000000..8c085f9
--- /dev/null
+++ b/accessibility/java-access-bridge/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/java-access-bridge-1.18.0.tar.bz2) = 9d250af333d03a091be06d2baab8cad4
+SHA256 (gnome2/java-access-bridge-1.18.0.tar.bz2) = 1cabcdd4b81882bc3489912596532922c21a51a9d404664375252aafacc5f197
+SIZE (gnome2/java-access-bridge-1.18.0.tar.bz2) = 108895
diff --git a/accessibility/java-access-bridge/pkg-descr b/accessibility/java-access-bridge/pkg-descr
new file mode 100644
index 0000000..4c121b1
--- /dev/null
+++ b/accessibility/java-access-bridge/pkg-descr
@@ -0,0 +1,3 @@
+Connects the built-in GNOME accessibility support in Java Swing apps to the
+GNOME Accessibility framework, specifically the Assistive Technology Service
+Provider Interface (AT-SPI).
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index ea314c6..3344b31 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/orca/Makefile,v 1.4 2006/09/04 02:19:06 marcus Exp $
+# $MCom: ports/accessibility/orca/Makefile,v 1.15 2007/03/13 00:05:30 marcus Exp $
#
PORTNAME= orca
-PORTVERSION= 1.0.1
+PORTVERSION= 2.18.0
CATEGORIES= accessibility x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -31,4 +31,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+MAN1= orca.1
+
.include <bsd.port.mk>
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
index d4cc1b4..2e633b6 100644
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/orca-1.0.1.tar.bz2) = 860172c6dadf6a655d8e0b2b3df90628
-SHA256 (gnome2/orca-1.0.1.tar.bz2) = 6e68fb41118c91fa17c20df6315d86a3ac6aeae147d53ff5874e1ac3c2a954de
-SIZE (gnome2/orca-1.0.1.tar.bz2) = 742059
+MD5 (gnome2/orca-2.18.0.tar.bz2) = 900500c94f8870882b0842556bb3f3b3
+SHA256 (gnome2/orca-2.18.0.tar.bz2) = 407eedadc7cab4eb0bd6326e840f433e3cfbe37316ed3b764be9c3b14f42594c
+SIZE (gnome2/orca-2.18.0.tar.bz2) = 962736
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index a9568be..cb50ff6 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -1,4 +1,7 @@
bin/orca
+%%PYTHON_SITELIBDIR%%/orca/Gecko.py
+%%PYTHON_SITELIBDIR%%/orca/Gecko.pyc
+%%PYTHON_SITELIBDIR%%/orca/Gecko.pyo
%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.py
%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.pyc
%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.pyo
@@ -40,6 +43,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/eventsynthesizer.py
%%PYTHON_SITELIBDIR%%/orca/eventsynthesizer.pyc
%%PYTHON_SITELIBDIR%%/orca/eventsynthesizer.pyo
+%%PYTHON_SITELIBDIR%%/orca/find.py
+%%PYTHON_SITELIBDIR%%/orca/find.pyc
+%%PYTHON_SITELIBDIR%%/orca/find.pyo
%%PYTHON_SITELIBDIR%%/orca/flat_review.py
%%PYTHON_SITELIBDIR%%/orca/flat_review.pyc
%%PYTHON_SITELIBDIR%%/orca/flat_review.pyo
@@ -73,6 +79,15 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.py
%%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.pyc
%%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_glade.py
+%%PYTHON_SITELIBDIR%%/orca/orca_glade.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_glade.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_find.py
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_find.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_find.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_main.py
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_main.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_main.pyo
%%PYTHON_SITELIBDIR%%/orca/orca_gui_prefs.py
%%PYTHON_SITELIBDIR%%/orca/orca_gui_prefs.pyc
%%PYTHON_SITELIBDIR%%/orca/orca_gui_prefs.pyo
@@ -82,18 +97,27 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/orca_prefs.py
%%PYTHON_SITELIBDIR%%/orca/orca_prefs.pyc
%%PYTHON_SITELIBDIR%%/orca/orca_prefs.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_quit.py
+%%PYTHON_SITELIBDIR%%/orca/orca_quit.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_quit.pyo
%%PYTHON_SITELIBDIR%%/orca/orca_state.py
%%PYTHON_SITELIBDIR%%/orca/orca_state.pyc
%%PYTHON_SITELIBDIR%%/orca/orca_state.pyo
%%PYTHON_SITELIBDIR%%/orca/outloud.py
%%PYTHON_SITELIBDIR%%/orca/outloud.pyc
%%PYTHON_SITELIBDIR%%/orca/outloud.pyo
+%%PYTHON_SITELIBDIR%%/orca/phonnames.py
+%%PYTHON_SITELIBDIR%%/orca/phonnames.pyc
+%%PYTHON_SITELIBDIR%%/orca/phonnames.pyo
%%PYTHON_SITELIBDIR%%/orca/platform.py
%%PYTHON_SITELIBDIR%%/orca/platform.pyc
%%PYTHON_SITELIBDIR%%/orca/platform.pyo
%%PYTHON_SITELIBDIR%%/orca/presentation_manager.py
%%PYTHON_SITELIBDIR%%/orca/presentation_manager.pyc
%%PYTHON_SITELIBDIR%%/orca/presentation_manager.pyo
+%%PYTHON_SITELIBDIR%%/orca/pronunciation_dict.py
+%%PYTHON_SITELIBDIR%%/orca/pronunciation_dict.pyc
+%%PYTHON_SITELIBDIR%%/orca/pronunciation_dict.pyo
%%PYTHON_SITELIBDIR%%/orca/punctuation_settings.py
%%PYTHON_SITELIBDIR%%/orca/punctuation_settings.pyc
%%PYTHON_SITELIBDIR%%/orca/punctuation_settings.pyo
@@ -112,9 +136,15 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.py
%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/Thunderbird.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/Thunderbird.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/Thunderbird.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.py
%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/acroread.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/acroread.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/acroread.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.py
%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.pyo
@@ -127,12 +157,27 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.py
%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-power-manager.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-power-manager.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-power-manager.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.py
%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.py
%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome_segv2.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome_segv2.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome_segv2.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/liferea.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/liferea.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/liferea.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.py
%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyo
@@ -142,6 +187,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.py
%%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/users-admin.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/users-admin.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/users-admin.pyo
%%PYTHON_SITELIBDIR%%/orca/settings.py
%%PYTHON_SITELIBDIR%%/orca/settings.pyc
%%PYTHON_SITELIBDIR%%/orca/settings.pyo
@@ -157,7 +205,13 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/util.py
%%PYTHON_SITELIBDIR%%/orca/util.pyc
%%PYTHON_SITELIBDIR%%/orca/util.pyo
+%%PYTHON_SITELIBDIR%%/orca/where_am_I.py
+%%PYTHON_SITELIBDIR%%/orca/where_am_I.pyc
+%%PYTHON_SITELIBDIR%%/orca/where_am_I.pyo
share/gnome/applications/orca.desktop
+share/gnome/orca/glade/orca-find.glade
+share/gnome/orca/glade/orca-mainwin.glade
+share/gnome/orca/glade/orca-quit.glade
share/gnome/orca/glade/orca-setup.glade
share/icons/hicolor/48x48/apps/orca.png
share/locale/ar/LC_MESSAGES/orca.mo
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 8701cd1..cb13cd5 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,11 +3,11 @@
# Whom: Anders Nordby <anders@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/archivers/file-roller/Makefile,v 1.104 2006/10/03 20:20:38 mezz Exp $
+# $MCom: ports/archivers/file-roller/Makefile,v 1.117 2007/03/12 23:23:57 marcus Exp $
#
PORTNAME= file-roller
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index c5c0583..78db0bb 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.16.3.tar.bz2) = 3ee134c04b73a584c9ec494d5e542c6d
-SHA256 (gnome2/file-roller-2.16.3.tar.bz2) = ac9a0c671c64cc1ee59f4a82655b68f917e204143c9d77c252f5cf4af0a71f6b
-SIZE (gnome2/file-roller-2.16.3.tar.bz2) = 1130693
+MD5 (gnome2/file-roller-2.18.0.tar.bz2) = 8f8b6b0e4598f2773f6948a631ca8721
+SHA256 (gnome2/file-roller-2.18.0.tar.bz2) = 3305c9a4b832576d0cf63d6040b6aba9e350d6214fba802e4a94d3a0afac4e88
+SIZE (gnome2/file-roller-2.18.0.tar.bz2) = 1126681
diff --git a/archivers/file-roller/files/patch-src_file-utils.h b/archivers/file-roller/files/patch-src_file-utils.h
deleted file mode 100644
index d322329..0000000
--- a/archivers/file-roller/files/patch-src_file-utils.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/file-utils.h.orig Sun Jul 3 19:11:59 2005
-+++ src/file-utils.h Sun Jul 3 19:12:52 2005
-@@ -25,8 +25,13 @@
-
- #include <sys/types.h>
- #include <time.h>
-+#include <stdlib.h>
-+#include <limits.h>
- #include <libgnomevfs/gnome-vfs-file-size.h>
- #include <libgnomevfs/gnome-vfs-mime-handlers.h>
-+
-+#undef fr_atoll
-+#define fr_atoll(nptr) strtoll(nptr, (char **)NULL, 10)
-
-
- #define FILENAME_MAX_LENGTH 30 /* FIXME: find out the best value */
diff --git a/archivers/file-roller/files/patch-src_fr-command-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c
index c4e3bac..78843a2 100644
--- a/archivers/file-roller/files/patch-src_fr-command-tar.c
+++ b/archivers/file-roller/files/patch-src_fr-command-tar.c
@@ -1,13 +1,12 @@
---- src/fr-command-tar.c.orig Fri Jul 1 14:41:32 2005
-+++ src/fr-command-tar.c Sun Jul 3 19:03:01 2005
-@@ -222,6 +223,10 @@ begin_tar_command (FRCommand *comm)
+--- src/fr-command-tar.c.orig Sun Oct 15 12:33:56 2006
++++ src/fr-command-tar.c Mon Oct 16 19:18:03 2006
+@@ -231,6 +231,9 @@
#if defined (__SVR4) && defined (__sun)
- if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) {
+ if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE))
command = g_strdup ("/usr/sfw/bin/gtar");
-+ }
+#elif defined(__FreeBSD__)
-+ if (g_file_test ("%%LOCALBASE%%/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) {
++ if (g_file_test ("%%LOCALBASE%%/bin/gtar", G_FILE_TEST_IS_EXECUTABLE))
+ command = g_strdup ("%%LOCALBASE%%/bin/gtar");
- }
#endif
if (command != NULL)
+ fr_process_begin_command (comm->process, command);
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 311d5c6..3b06de9 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -2,13 +2,22 @@ bin/file-roller
lib/nautilus/extensions-1.0/libnautilus-fileroller.a
lib/nautilus/extensions-1.0/libnautilus-fileroller.la
lib/nautilus/extensions-1.0/libnautilus-fileroller.so
+libexec/file-roller/isoinfo.sh
+libexec/file-roller/move-here.sh
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
share/gnome/applications/file-roller.desktop
-share/gnome/file-roller/glade/file-roller-extract.glade
+share/gnome/file-roller/glade/ask-password.glade
share/gnome/file-roller/glade/file-roller.glade
+share/gnome/file-roller/icons/hicolor/16x16/actions/add-files-to-archive.png
+share/gnome/file-roller/icons/hicolor/16x16/actions/add-folder-to-archive.png
+share/gnome/file-roller/icons/hicolor/16x16/actions/extract-archive.png
+share/gnome/file-roller/icons/hicolor/24x24/actions/add-files-to-archive.png
+share/gnome/file-roller/icons/hicolor/24x24/actions/add-folder-to-archive.png
+share/gnome/file-roller/icons/hicolor/24x24/actions/extract-archive.png
+share/gnome/file-roller/icons/hicolor/24x24/actions/preview-file.png
share/gnome/help/file-roller/C/figures/file-roller_home.png
share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png
share/gnome/help/file-roller/C/figures/file-roller_main_window.png
@@ -46,18 +55,6 @@ share/gnome/help/file-roller/it/figures/file-roller_main_window.png
share/gnome/help/file-roller/it/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/it/figures/file-roller_uparrow.png
share/gnome/help/file-roller/it/file-roller.xml
-share/gnome/help/file-roller/ja/figures/file-roller_home.png
-share/gnome/help/file-roller/ja/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/ja/figures/file-roller_main_window.png
-share/gnome/help/file-roller/ja/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/ja/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/ja/file-roller.xml
-share/gnome/help/file-roller/ko/figures/file-roller_home.png
-share/gnome/help/file-roller/ko/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/ko/figures/file-roller_main_window.png
-share/gnome/help/file-roller/ko/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/ko/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/ko/file-roller.xml
share/gnome/help/file-roller/nl/figures/file-roller_home.png
share/gnome/help/file-roller/nl/figures/file-roller_leftarrow.png
share/gnome/help/file-roller/nl/figures/file-roller_main_window.png
@@ -82,40 +79,20 @@ share/gnome/help/file-roller/uk/figures/file-roller_main_window.png
share/gnome/help/file-roller/uk/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/uk/figures/file-roller_uparrow.png
share/gnome/help/file-roller/uk/file-roller.xml
-share/gnome/help/file-roller/zh_CN/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/zh_CN/file-roller.xml
-share/gnome/help/file-roller/zh_HK/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_main_window.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/zh_HK/file-roller.xml
-share/gnome/help/file-roller/zh_TW/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_leftarrow.png
-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/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
share/gnome/omf/file-roller/file-roller-it.omf
-share/gnome/omf/file-roller/file-roller-ja.omf
-share/gnome/omf/file-roller/file-roller-ko.omf
share/gnome/omf/file-roller/file-roller-nl.omf
share/gnome/omf/file-roller/file-roller-ru.omf
share/gnome/omf/file-roller/file-roller-sv.omf
share/gnome/omf/file-roller/file-roller-uk.omf
-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/icons/hicolor/48x48/apps/file-roller.png
+share/icons/hicolor/16x16/apps/file-roller.png
+share/icons/hicolor/22x22/apps/file-roller.png
+share/icons/hicolor/32x32/apps/file-roller.png
+share/icons/hicolor/scalable/apps/file-roller.svg
share/locale/am/LC_MESSAGES/file-roller.mo
share/locale/ar/LC_MESSAGES/file-roller.mo
share/locale/az/LC_MESSAGES/file-roller.mo
@@ -195,12 +172,6 @@ share/locale/zh_CN/LC_MESSAGES/file-roller.mo
share/locale/zh_HK/LC_MESSAGES/file-roller.mo
share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/omf/file-roller
-@dirrm share/gnome/help/file-roller/zh_TW/figures
-@dirrm share/gnome/help/file-roller/zh_TW
-@dirrm share/gnome/help/file-roller/zh_HK/figures
-@dirrm share/gnome/help/file-roller/zh_HK
-@dirrm share/gnome/help/file-roller/zh_CN/figures
-@dirrm share/gnome/help/file-roller/zh_CN
@dirrm share/gnome/help/file-roller/uk/figures
@dirrm share/gnome/help/file-roller/uk
@dirrm share/gnome/help/file-roller/sv/figures
@@ -209,10 +180,6 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/help/file-roller/ru
@dirrm share/gnome/help/file-roller/nl/figures
@dirrm share/gnome/help/file-roller/nl
-@dirrm share/gnome/help/file-roller/ko/figures
-@dirrm share/gnome/help/file-roller/ko
-@dirrm share/gnome/help/file-roller/ja/figures
-@dirrm share/gnome/help/file-roller/ja
@dirrm share/gnome/help/file-roller/it/figures
@dirrm share/gnome/help/file-roller/it
@dirrm share/gnome/help/file-roller/fr/figures
@@ -226,9 +193,16 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/help/file-roller/C/figures
@dirrm share/gnome/help/file-roller/C
@dirrm share/gnome/help/file-roller
+@dirrm share/gnome/file-roller/icons/hicolor/24x24/actions
+@dirrm share/gnome/file-roller/icons/hicolor/24x24
+@dirrm share/gnome/file-roller/icons/hicolor/16x16/actions
+@dirrm share/gnome/file-roller/icons/hicolor/16x16
+@dirrm share/gnome/file-roller/icons/hicolor
+@dirrm share/gnome/file-roller/icons
@dirrm share/gnome/file-roller/glade
@dirrm share/gnome/file-roller
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm libexec/file-roller
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/locale/zh_TW/LC_MESSAGES
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 1185736..e1d2e12 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/gnome-media/Makefile,v 1.98 2006/09/04 15:30:37 ahze Exp $
+# $MCom: ports/audio/gnome-media/Makefile,v 1.105 2007/03/12 12:00:20 ahze Exp $
#
PORTNAME= gnome-media
-PORTVERSION= 2.16.1
-PORTREVISION= 2
+PORTVERSION= 2.18.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index 5a5e63e..cd94122 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.16.1.tar.bz2) = 4fa1e8e8bd31e2db1cb49679170a98a8
-SHA256 (gnome2/gnome-media-2.16.1.tar.bz2) = a8f343b772c509c7e44bf792b2df97378b91e6cd85f8b4c82d8d7937bae6d007
-SIZE (gnome2/gnome-media-2.16.1.tar.bz2) = 2973824
+MD5 (gnome2/gnome-media-2.18.0.tar.bz2) = a472d8c7733b119376bc6127ee55a82d
+SHA256 (gnome2/gnome-media-2.18.0.tar.bz2) = 9d52a03f98c5ad9230ac2bcf1cb65644786c71a1ded2f47f7c46a79ad7d769e3
+SIZE (gnome2/gnome-media-2.18.0.tar.bz2) = 3007639
diff --git a/audio/gnome-media/files/patch-configure b/audio/gnome-media/files/patch-configure
new file mode 100644
index 0000000..c907f2f
--- /dev/null
+++ b/audio/gnome-media/files/patch-configure
@@ -0,0 +1,74 @@
+--- configure.orig Mon Feb 12 16:07:48 2007
++++ configure Mon Feb 12 16:08:23 2007
+@@ -5808,7 +5808,7 @@ if test "${enable_cddbslave+set}" = set;
+ else
+ enable_cddbslave=yes
+ fi;
+-if test "x$enable_cddbslave" == "xyes"; then
++if test "x$enable_cddbslave" = "xyes"; then
+
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for CDDBSLAVE" >&5
+@@ -6750,7 +6750,7 @@ if test "${enable_profiles+set}" = set;
+ else
+ enable_profiles=yes
+ fi;
+-if test "x$enable_profiles" == "xyes"; then
++if test "x$enable_profiles" = "xyes"; then
+
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for GMP" >&5
+@@ -6967,7 +6967,7 @@ echo "$as_me: WARNING: Grecord will be
+ PROGRAMS_GRECORD_ERROR=" gnome media profiles is disabled"
+ fi
+
+-if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" == "xyes"; then
++if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" = "xyes"; then
+ PROGRAMS_GRECORD="grecord"
+
+ gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
+@@ -24186,7 +24186,7 @@ if test "${enable_vumeter+set}" = set; t
+ else
+ enable_vumeter=yes
+ fi;
+-if test -n "$we_have_esd" && test "x$enable_vumeter" == "xyes"; then
++if test -n "$we_have_esd" && test "x$enable_vumeter" = "xyes"; then
+
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for VUMETER" >&5
+@@ -24304,7 +24304,7 @@ if test "${enable_gnomecd+set}" = set; t
+ else
+ enable_gnomecd=yes
+ fi;
+-if test "x$enable_gnomecd" == "xyes"; then
++if test "x$enable_gnomecd" = "xyes"; then
+
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for GNOMECD" >&5
+@@ -24640,7 +24640,7 @@ fi
+
+
+
+-if test "x$HAVE_GNOMECD" = "xyes" && test "x$enable_gnomecd" == "xyes" ; then
++if test "x$HAVE_GNOMECD" = "xyes" && test "x$enable_gnomecd" = "xyes" ; then
+ cdrom_header=""
+
+ for ac_header in linux/cdrom.h
+@@ -25510,7 +25510,7 @@ if test "${enable_gstprops+set}" = set;
+ else
+ enable_gstprops=yes
+ fi;
+-if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" == "xyes";
++if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" = "xyes";
+ then
+ COMMON_MODULES="gconf-2.0 libgnomeui-2.0 libglade-2.0 >= 1.99.12 gstreamer-$GST_MAJORMINOR"
+
+@@ -25673,7 +25673,7 @@ if test "${enable_gstmix+set}" = set; th
+ else
+ enable_gstmix=yes
+ fi;
+-if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" == "xyes";
++if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" = "xyes";
+ then
+
+ pkg_failed=no
diff --git a/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c
index fadbb04..dee1aa9 100644
--- a/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c
+++ b/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c
@@ -1,9 +1,9 @@
---- gnome-cd/gst-cdrom.c.orig Tue Dec 12 00:18:40 2006
-+++ gnome-cd/gst-cdrom.c Tue Dec 12 00:23:17 2006
-@@ -41,13 +41,17 @@
+--- gnome-cd/gst-cdrom.c.orig Mon Jan 22 09:01:38 2007
++++ gnome-cd/gst-cdrom.c Mon Feb 12 15:59:18 2007
+@@ -44,13 +44,17 @@
#endif
- #if defined(__FreeBSD__)
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCCAPABILITY
+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCGETVOL
+struct ioc_vol vol_value;
@@ -19,10 +19,10 @@
# define GST_CDROM_IOCTL_EJECT_REQUEST CDROMEJECT
#endif
-@@ -184,7 +188,7 @@ gst_cdrom_is_cdrom_device (GnomeCDRom *
-
- fd = open (device, O_RDONLY | O_NONBLOCK);
- if (fd >= 0) {
+@@ -190,7 +194,7 @@ gst_cdrom_is_cdrom_device (GnomeCDRom *
+ #ifdef __sun
+ res = TRUE;
+ #else
- if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, 0) >= 0) {
+ if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR) >= 0) {
res = TRUE;
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index d41b8ea..5b14051 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.67 2006/10/12 19:04:47 marcus Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.70 2007/03/07 17:00:36 adamw Exp $
#
PORTNAME= rhythmbox
PORTVERSION= 0.9.8
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
@@ -18,7 +19,7 @@ COMMENT= Audio player for GNOME
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
id3tag.0:${PORTSDIR}/audio/libid3tag \
- totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+ totem-plparser.1:${PORTSDIR}/multimedia/totem \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
soup-2.2.8:${PORTSDIR}/devel/libsoup \
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index d41b8ea..5b14051 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.67 2006/10/12 19:04:47 marcus Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.70 2007/03/07 17:00:36 adamw Exp $
#
PORTNAME= rhythmbox
PORTVERSION= 0.9.8
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
@@ -18,7 +19,7 @@ COMMENT= Audio player for GNOME
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
id3tag.0:${PORTSDIR}/audio/libid3tag \
- totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+ totem-plparser.1:${PORTSDIR}/multimedia/totem \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
soup-2.2.8:${PORTSDIR}/devel/libsoup \
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index cafa83a..54b4b2a 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/evolution-data-server/Makefile,v 1.99 2006/10/03 00:13:42 ahze Exp $
+# $MCom: ports/databases/evolution-data-server/Makefile,v 1.112 2007/03/13 04:35:01 marcus Exp $
#
PORTNAME= evolution-data-server
-PORTVERSION= 1.8.3
+PORTVERSION= 1.10.0
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -34,16 +34,12 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static \
--enable-nss=yes \
--with-openldap=yes \
- --with-nss-includes=${LOCALBASE}/include/nss/nss \
- --with-nss-libs=${LOCALBASE}/lib \
- --with-nspr-includes=${LOCALBASE}/include/nspr \
- --with-nspr-libs=${LOCALBASE}/lib \
--with-krb5=/usr \
--with-libdb=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-PLIST_SUB= VERSION="1.8" EVO_VERSION="1.2"
+PLIST_SUB= VERSION="1.10" EVO_VERSION="1.2"
OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index d90a8f9..14cc9fd 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-1.8.3.tar.bz2) = f6a824f2553fd97555b8785a452fb6ab
-SHA256 (gnome2/evolution-data-server-1.8.3.tar.bz2) = cbc067d87722afef84e8c4914787d990015e0c69b3bf3576fc15c8193ffd2fcc
-SIZE (gnome2/evolution-data-server-1.8.3.tar.bz2) = 7024111
+MD5 (gnome2/evolution-data-server-1.10.0.tar.bz2) = 390ea134306b667a2d77b7e859c8cba0
+SHA256 (gnome2/evolution-data-server-1.10.0.tar.bz2) = 0a2ee6540ffa767d3c841993300fb4320cffc3738230e2a2ad1c566de35b1214
+SIZE (gnome2/evolution-data-server-1.10.0.tar.bz2) = 7095934
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index f603e10..c68e1f0 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -351,11 +351,11 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.so
lib/libcamel-%%EVO_VERSION%%.a
lib/libcamel-%%EVO_VERSION%%.la
lib/libcamel-%%EVO_VERSION%%.so
-lib/libcamel-%%EVO_VERSION%%.so.0
+lib/libcamel-%%EVO_VERSION%%.so.10
lib/libcamel-provider-%%EVO_VERSION%%.a
lib/libcamel-provider-%%EVO_VERSION%%.la
lib/libcamel-provider-%%EVO_VERSION%%.so
-lib/libcamel-provider-%%EVO_VERSION%%.so.8
+lib/libcamel-provider-%%EVO_VERSION%%.so.10
lib/libebook-%%EVO_VERSION%%.a
lib/libebook-%%EVO_VERSION%%.la
lib/libebook-%%EVO_VERSION%%.so
@@ -375,7 +375,7 @@ lib/libedata-cal-%%EVO_VERSION%%.so.6
lib/libedataserver-%%EVO_VERSION%%.a
lib/libedataserver-%%EVO_VERSION%%.la
lib/libedataserver-%%EVO_VERSION%%.so
-lib/libedataserver-%%EVO_VERSION%%.so.7
+lib/libedataserver-%%EVO_VERSION%%.so.9
lib/libedataserverui-%%EVO_VERSION%%.a
lib/libedataserverui-%%EVO_VERSION%%.la
lib/libedataserverui-%%EVO_VERSION%%.so
@@ -383,11 +383,11 @@ lib/libedataserverui-%%EVO_VERSION%%.so.8
lib/libegroupwise-%%EVO_VERSION%%.a
lib/libegroupwise-%%EVO_VERSION%%.la
lib/libegroupwise-%%EVO_VERSION%%.so
-lib/libegroupwise-%%EVO_VERSION%%.so.12
+lib/libegroupwise-%%EVO_VERSION%%.so.13
lib/libexchange-storage-%%EVO_VERSION%%.a
lib/libexchange-storage-%%EVO_VERSION%%.la
lib/libexchange-storage-%%EVO_VERSION%%.so
-lib/libexchange-storage-%%EVO_VERSION%%.so.2
+lib/libexchange-storage-%%EVO_VERSION%%.so.3
libdata/bonobo/servers/GNOME_Evolution_DataServer_%%EVO_VERSION%%.server
libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
libdata/pkgconfig/camel-provider-%%EVO_VERSION%%.pc
@@ -413,6 +413,7 @@ share/doc/libebook/ch01.html
share/doc/libebook/home.png
share/doc/libebook/index.html
share/doc/libebook/index.sgml
+share/doc/libebook/ix01.html
share/doc/libebook/left.png
share/doc/libebook/libebook-EAddressWestern.html
share/doc/libebook/libebook-ENameWestern.html
@@ -425,15 +426,16 @@ share/doc/libebook/right.png
share/doc/libebook/style.css
share/doc/libebook/up.png
share/doc/libecal/ECal.html
+share/doc/libecal/ECalListener.html
share/doc/libecal/ECalComponent.html
+share/doc/libecal/ECalView.html
+share/doc/libecal/ECalViewListener.html
share/doc/libecal/ch01.html
share/doc/libecal/home.png
share/doc/libecal/index.html
share/doc/libecal/index.sgml
+share/doc/libecal/ix01.html
share/doc/libecal/left.png
-share/doc/libecal/libecal-ECalListener.html
-share/doc/libecal/libecal-ECalView.html
-share/doc/libecal/libecal-ECalViewListener.html
share/doc/libecal/libecal-e-cal-recur.html
share/doc/libecal/libecal-e-cal-time-util.html
share/doc/libecal/libecal-e-cal-types.html
@@ -443,19 +445,43 @@ share/doc/libecal/libecal.devhelp2
share/doc/libecal/right.png
share/doc/libecal/style.css
share/doc/libecal/up.png
+share/doc/libedata-book/EBookBackend.html
+share/doc/libedata-book/EBookBackendCache.html
+share/doc/libedata-book/EBookBackendFactory.html
+share/doc/libedata-book/EBookBackendSExp.html
+share/doc/libedata-book/EBookBackendSummary.html
+share/doc/libedata-book/EBookBackendSync.html
+share/doc/libedata-book/EDataBook.html
+share/doc/libedata-book/EDataBookView.html
+share/doc/libedata-book/ch01.html
+share/doc/libedata-book/home.png
+share/doc/libedata-book/index.html
+share/doc/libedata-book/index.sgml
+share/doc/libedata-book/ix01.html
+share/doc/libedata-book/left.png
+share/doc/libedata-book/libedata-book-EDataBookFactory.html
+share/doc/libedata-book/libedata-book-e-book-backend-db-cache.html
+share/doc/libedata-book/libedata-book-e-data-book-marshal.html
+share/doc/libedata-book/libedata-book-ximian-vcard.html
+share/doc/libedata-book/libedata-book.devhelp
+share/doc/libedata-book/libedata-book.devhelp2
+share/doc/libedata-book/right.png
+share/doc/libedata-book/style.css
+share/doc/libedata-book/up.png
share/doc/libedata-cal/ECalBackend.html
+share/doc/libedata-cal/ECalBackendCache.html
+share/doc/libedata-cal/ECalBackendFactory.html
share/doc/libedata-cal/ECalBackendSExp.html
+share/doc/libedata-cal/ECalBackendSync.html
share/doc/libedata-cal/EDataCal.html
+share/doc/libedata-cal/EDataCalFactory.html
share/doc/libedata-cal/EDataCalView.html
share/doc/libedata-cal/ch01.html
share/doc/libedata-cal/home.png
share/doc/libedata-cal/index.html
share/doc/libedata-cal/index.sgml
+share/doc/libedata-cal/ix01.html
share/doc/libedata-cal/left.png
-share/doc/libedata-cal/libedata-cal-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
@@ -467,17 +493,18 @@ share/doc/libedataserver/home.png
share/doc/libedataserver/index.html
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
-share/doc/libedataserver/libedataserver-EListIterator.html
+share/doc/libedataserver/EAccount.html
+share/doc/libedataserver/EAccountList.html
+share/doc/libedataserver/EComponentListener.html
+share/doc/libedataserver/EFileCache.html
+share/doc/libedataserver/EIterator.html
+share/doc/libedataserver/EList.html
+share/doc/libedataserver/EListIterator.html
+share/doc/libedataserver/ESource.html
+share/doc/libedataserver/ESourceGroup.html
+share/doc/libedataserver/ESourceList.html
+share/doc/libedataserver/ix01.html
share/doc/libedataserver/libedataserver-ESExp.html
-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
@@ -497,6 +524,32 @@ share/doc/libedataserver/libedataserver.devhelp2
share/doc/libedataserver/right.png
share/doc/libedataserver/style.css
share/doc/libedataserver/up.png
+share/doc/libedataserverui/ECategoriesDialog.html
+share/doc/libedataserverui/EContactStore.html
+share/doc/libedataserverui/EDestinationStore.html
+share/doc/libedataserverui/ENameSelector.html
+share/doc/libedataserverui/ENameSelectorDialog.html
+share/doc/libedataserverui/ENameSelectorEntry.html
+share/doc/libedataserverui/ENameSelectorList.html
+share/doc/libedataserverui/ENameSelectorModel.html
+share/doc/libedataserverui/ESourceOptionMenu.html
+share/doc/libedataserverui/ESourceSelector.html
+share/doc/libedataserverui/ESourceSelectorDialog.html
+share/doc/libedataserverui/ETreeModelGenerator.html
+share/doc/libedataserverui/ch01.html
+share/doc/libedataserverui/home.png
+share/doc/libedataserverui/index.html
+share/doc/libedataserverui/index.sgml
+share/doc/libedataserverui/ix01.html
+share/doc/libedataserverui/left.png
+share/doc/libedataserverui/libedataserverui-e-book-auth-util.html
+share/doc/libedataserverui/libedataserverui-e-data-server-ui-marshal.html
+share/doc/libedataserverui/libedataserverui-e-passwords.html
+share/doc/libedataserverui/libedataserverui.devhelp
+share/doc/libedataserverui/libedataserverui.devhelp2
+share/doc/libedataserverui/right.png
+share/doc/libedataserverui/style.css
+share/doc/libedataserverui/up.png
share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema
share/gnome/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade
share/gnome/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade
@@ -883,24 +936,24 @@ share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/zones.tab
share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Addressbook.idl
share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Calendar.idl
share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer.idl
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_birthday_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_business_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_favorites_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_gifts_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_goals_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_holiday-cards_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_holiday_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_hot-contacts_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_ideas_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_international_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_key-customer_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_miscellaneous_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_personal_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_phonecalls_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_status_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_strategies_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_suppliers_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_time-and-expenses_16.png
+share/gnome/pixmaps/evolution-data-server/category_birthday_16.png
+share/gnome/pixmaps/evolution-data-server/category_business_16.png
+share/gnome/pixmaps/evolution-data-server/category_favorites_16.png
+share/gnome/pixmaps/evolution-data-server/category_gifts_16.png
+share/gnome/pixmaps/evolution-data-server/category_goals_16.png
+share/gnome/pixmaps/evolution-data-server/category_holiday-cards_16.png
+share/gnome/pixmaps/evolution-data-server/category_holiday_16.png
+share/gnome/pixmaps/evolution-data-server/category_hot-contacts_16.png
+share/gnome/pixmaps/evolution-data-server/category_ideas_16.png
+share/gnome/pixmaps/evolution-data-server/category_international_16.png
+share/gnome/pixmaps/evolution-data-server/category_key-customer_16.png
+share/gnome/pixmaps/evolution-data-server/category_miscellaneous_16.png
+share/gnome/pixmaps/evolution-data-server/category_personal_16.png
+share/gnome/pixmaps/evolution-data-server/category_phonecalls_16.png
+share/gnome/pixmaps/evolution-data-server/category_status_16.png
+share/gnome/pixmaps/evolution-data-server/category_strategies_16.png
+share/gnome/pixmaps/evolution-data-server/category_suppliers_16.png
+share/gnome/pixmaps/evolution-data-server/category_time-and-expenses_16.png
share/locale/am/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/ar/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -974,7 +1027,7 @@ 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
-@dirrm share/gnome/pixmaps/evolution-data-server-%%VERSION%%
+@dirrm share/gnome/pixmaps/evolution-data-server
@dirrm share/gnome/idl/evolution-data-server-%%EVO_VERSION%%
@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific
@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian
@@ -993,8 +1046,10 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@dirrm share/gnome/evolution-data-server-%%VERSION%%/weather
@dirrm share/gnome/evolution-data-server-%%VERSION%%/glade
@dirrm share/gnome/evolution-data-server-%%VERSION%%
+@dirrm share/doc/libedataserverui
@dirrm share/doc/libedataserver
@dirrm share/doc/libedata-cal
+@dirrm share/doc/libedata-book
@dirrm share/doc/libecal
@dirrm share/doc/libebook
@dirrm lib/evolution-data-server-%%EVO_VERSION%%/extensions
diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index 33b491b..7b14855 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -3,10 +3,11 @@
# Whom: FreeBSD GNOME Team
#
# $FreeBSD$
-# $MCom: ports/deskutils/alacarte/Makefile,v 1.10 2006/10/10 18:48:41 marcus Exp $
+# $MCom: ports/deskutils/alacarte/Makefile,v 1.14 2007/02/13 06:29:20 mezz Exp $
+#
PORTNAME= alacarte
-PORTVERSION= 0.10.2
+PORTVERSION= 0.11.3
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -30,7 +31,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
${WRKSRC}/Alacarte/MenuEditor.py
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
- ${WRKSRC}/Alacarte/DialogHandler.py \
${WRKSRC}/Alacarte/util.py
@${REINPLACE_CMD} -e 's|gmsgfmt|msgfmt|g ; \
s|python2.4|${PYTHON_VERSION}|g' \
diff --git a/deskutils/alacarte/distinfo b/deskutils/alacarte/distinfo
index ad27fa8..35a5ad0 100644
--- a/deskutils/alacarte/distinfo
+++ b/deskutils/alacarte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/alacarte-0.10.2.tar.bz2) = abf5d95b968a34d034c47e3bfab95719
-SHA256 (gnome2/alacarte-0.10.2.tar.bz2) = 40955f7a0bac25da5d576fea015dd9b35f62033004b01bdc000885b337bfef3d
-SIZE (gnome2/alacarte-0.10.2.tar.bz2) = 201452
+MD5 (gnome2/alacarte-0.11.3.tar.bz2) = 5ca9f07e839f64b7fcefc84cfb05aa17
+SHA256 (gnome2/alacarte-0.11.3.tar.bz2) = 9983e56cd43ee97e6f294145ea4420f7a8aa3f76284928f16e590b7d9b5039c0
+SIZE (gnome2/alacarte-0.11.3.tar.bz2) = 217547
diff --git a/deskutils/alacarte/files/patch-Alacarte_DialogHandler.py b/deskutils/alacarte/files/patch-Alacarte_DialogHandler.py
deleted file mode 100644
index 5cc05fc..0000000
--- a/deskutils/alacarte/files/patch-Alacarte_DialogHandler.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- Alacarte/DialogHandler.py.orig Wed Jul 26 20:53:06 2006
-+++ Alacarte/DialogHandler.py Wed Jul 26 20:53:14 2006
-@@ -84,7 +84,7 @@ class DialogHandler:
- if button.icon_path:
- dialog.set_current_folder(button.icon_path.rsplit('/', 1)[0])
- else:
-- dialog.set_current_folder('/usr/share/icons/')
-+ dialog.set_current_folder('/usr/local/share/icons/')
- preview = gtk.VBox()
- preview.set_spacing(8)
- preview.set_size_request(92, 92)
diff --git a/deskutils/alacarte/pkg-plist b/deskutils/alacarte/pkg-plist
index 8a9af48..a821c20 100644
--- a/deskutils/alacarte/pkg-plist
+++ b/deskutils/alacarte/pkg-plist
@@ -1,7 +1,4 @@
bin/alacarte
-%%PYTHON_SITELIBDIR%%/Alacarte/DialogHandler.py
-%%PYTHON_SITELIBDIR%%/Alacarte/DialogHandler.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/DialogHandler.pyo
%%PYTHON_SITELIBDIR%%/Alacarte/MainWindow.py
%%PYTHON_SITELIBDIR%%/Alacarte/MainWindow.pyc
%%PYTHON_SITELIBDIR%%/Alacarte/MainWindow.pyo
@@ -24,6 +21,7 @@ share/icons/hicolor/22x22/apps/alacarte.png
share/icons/hicolor/scalable/apps/alacarte.svg
share/locale/ar/LC_MESSAGES/alacarte.mo
share/locale/as/LC_MESSAGES/alacarte.mo
+share/locale/be/LC_MESSAGES/alacarte.mo
share/locale/bg/LC_MESSAGES/alacarte.mo
share/locale/bn/LC_MESSAGES/alacarte.mo
share/locale/bn_IN/LC_MESSAGES/alacarte.mo
@@ -33,6 +31,7 @@ share/locale/da/LC_MESSAGES/alacarte.mo
share/locale/de/LC_MESSAGES/alacarte.mo
share/locale/dz/LC_MESSAGES/alacarte.mo
share/locale/el/LC_MESSAGES/alacarte.mo
+share/locale/en_CA/LC_MESSAGES/alacarte.mo
share/locale/en_GB/LC_MESSAGES/alacarte.mo
share/locale/eo/LC_MESSAGES/alacarte.mo
share/locale/es/LC_MESSAGES/alacarte.mo
@@ -64,6 +63,7 @@ share/locale/pa/LC_MESSAGES/alacarte.mo
share/locale/pl/LC_MESSAGES/alacarte.mo
share/locale/pt/LC_MESSAGES/alacarte.mo
share/locale/pt_BR/LC_MESSAGES/alacarte.mo
+share/locale/ro/LC_MESSAGES/alacarte.mo
share/locale/ru/LC_MESSAGES/alacarte.mo
share/locale/si/LC_MESSAGES/alacarte.mo
share/locale/sl/LC_MESSAGES/alacarte.mo
@@ -96,6 +96,8 @@ share/locale/zh_TW/LC_MESSAGES/alacarte.mo
@dirrmtry share/locale/sl
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
+@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
@@ -122,6 +124,8 @@ share/locale/zh_TW/LC_MESSAGES/alacarte.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
@dirrm share/gnome/alacarte
diff --git a/deskutils/chmsee/Makefile b/deskutils/chmsee/Makefile
index 4758585..b0857be 100644
--- a/deskutils/chmsee/Makefile
+++ b/deskutils/chmsee/Makefile
@@ -7,6 +7,7 @@
PORTNAME= chmsee
PORTVERSION= 0.9.6
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= http://chmsee.gro.clinux.org/
@@ -26,4 +27,8 @@ USE_BZIP2= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+post-patch:
+ @${REINPLACE_CMD} -e 's|libgtkhtml-3.8|libgtkhtml-3.14|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 2cdb731..25fda09 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.42 2006/09/07 19:05:16 marcus Exp $
+# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.54 2007/03/14 11:58:47 ahze Exp $
#
PORTNAME= deskbar-applet
-PORTVERSION= 2.16.2
+PORTVERSION= 2.18.0
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,6 +16,9 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Omnipresent versatile search interface
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree
+
USE_BZIP2= yes
USE_GETTEXT= yes
USE_XLIB= yes
@@ -24,7 +27,7 @@ USE_PYTHON= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --disable-beagle
+INSTALLS_OMF= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -34,10 +37,6 @@ OPTIONS= EVO "Enable evolution support" on
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-BROKEN= Does not build on 4.X
-.endif
-
.if !defined(WITHOUT_EVO)
USE_GNOME+= evolutiondataserver
PLIST_SUB+= EVO=""
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 1cd366f..ece34fe 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-2.16.2.tar.bz2) = 6a4780813a55e2f464e69cdfac89894d
-SHA256 (gnome2/deskbar-applet-2.16.2.tar.bz2) = 60af4a2924bc67eb497b3df24b710cc5d586336eab9ef338f5538c07e3bff18f
-SIZE (gnome2/deskbar-applet-2.16.2.tar.bz2) = 617194
+MD5 (gnome2/deskbar-applet-2.18.0.tar.bz2) = 2fb3bfc4d1a657adf175fa444a2309f0
+SHA256 (gnome2/deskbar-applet-2.18.0.tar.bz2) = 51c6c8cd68793a92dc172d5cfb9bad9fbc80e9be49cdbcff449635c482931e5f
+SIZE (gnome2/deskbar-applet-2.18.0.tar.bz2) = 645787
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index 9b7b048..8856f3c 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -17,18 +17,12 @@ lib/deskbar-applet/handlers/epiphany.pyo
lib/deskbar-applet/handlers/files.py
lib/deskbar-applet/handlers/files.pyc
lib/deskbar-applet/handlers/files.pyo
-lib/deskbar-applet/handlers/galago.py
-lib/deskbar-applet/handlers/galago.pyc
-lib/deskbar-applet/handlers/galago.pyo
lib/deskbar-applet/handlers/galeon.py
lib/deskbar-applet/handlers/galeon.pyc
lib/deskbar-applet/handlers/galeon.pyo
lib/deskbar-applet/handlers/gdmactions.py
lib/deskbar-applet/handlers/gdmactions.pyc
lib/deskbar-applet/handlers/gdmactions.pyo
-lib/deskbar-applet/handlers/google-live.py
-lib/deskbar-applet/handlers/google-live.pyc
-lib/deskbar-applet/handlers/google-live.pyo
lib/deskbar-applet/handlers/history.py
lib/deskbar-applet/handlers/history.pyc
lib/deskbar-applet/handlers/history.pyo
@@ -41,6 +35,9 @@ lib/deskbar-applet/handlers/mozilla.pyo
lib/deskbar-applet/handlers/programs.py
lib/deskbar-applet/handlers/programs.pyc
lib/deskbar-applet/handlers/programs.pyo
+lib/deskbar-applet/handlers/recent.py
+lib/deskbar-applet/handlers/recent.pyc
+lib/deskbar-applet/handlers/recent.pyo
lib/deskbar-applet/handlers/web_address.py
lib/deskbar-applet/handlers/web_address.pyc
lib/deskbar-applet/handlers/web_address.pyo
@@ -77,6 +74,9 @@ lib/deskbar-applet/handlers/yahoo.pyo
%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.py
%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyc
%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.py
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.pyo
%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.py
%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyc
%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyo
@@ -203,6 +203,18 @@ lib/deskbar-applet/handlers/yahoo.pyo
%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.py
%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.pyc
%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.py
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.py
+%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.py
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.pyo
libdata/bonobo/servers/Deskbar_Applet.server
libdata/pkgconfig/deskbar-applet.pc
share/gnome/deskbar-applet/Deskbar_Applet.xml
@@ -221,6 +233,10 @@ 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/help/deskbar/C/deskbar.xml
+share/gnome/help/deskbar/C/figures/deskbar-applet.png
+share/gnome/help/deskbar/C/legal.xml
+share/gnome/omf/deskbar/deskbar-C.omf
share/icons/hicolor/16x16/apps/deskbar-applet.png
share/icons/hicolor/22x22/apps/deskbar-applet.png
share/icons/hicolor/32x32/apps/deskbar-applet.png
@@ -243,6 +259,7 @@ share/locale/en_GB/LC_MESSAGES/deskbar-applet.mo
share/locale/es/LC_MESSAGES/deskbar-applet.mo
share/locale/et/LC_MESSAGES/deskbar-applet.mo
share/locale/eu/LC_MESSAGES/deskbar-applet.mo
+share/locale/fa/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
@@ -271,6 +288,7 @@ 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/ro/LC_MESSAGES/deskbar-applet.mo
share/locale/ru/LC_MESSAGES/deskbar-applet.mo
share/locale/sk/LC_MESSAGES/deskbar-applet.mo
share/locale/sl/LC_MESSAGES/deskbar-applet.mo
@@ -286,8 +304,13 @@ 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
+@dirrm share/gnome/omf/deskbar
+@dirrm share/gnome/help/deskbar/C/figures
+@dirrm share/gnome/help/deskbar/C
+@dirrm share/gnome/help/deskbar
@dirrm share/gnome/deskbar-applet/art
@dirrm share/gnome/deskbar-applet
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/updater
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/window
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/entriac
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac
@@ -317,6 +340,8 @@ share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo
@dirrmtry share/locale/sl
@dirrmtry share/locale/sk/LC_MESSAGES
@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
@dirrmtry share/locale/pt/LC_MESSAGES
@dirrmtry share/locale/pt
@dirrmtry share/locale/pl/LC_MESSAGES
diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index 763ded9..c169110b 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.14 2006/09/29 20:24:23 ahze Exp $
+# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.17 2007/03/12 04:55:09 marcus Exp $
#
PORTNAME= jescs
-PORTVERSION= 2.8.2
+PORTVERSION= 2.9.1
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -29,8 +29,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-EVO_VERSION= 2.8
-PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.8"
+EVO_VERSION= 2.10
+PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.10"
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 a0a6aac..479f68f 100644
--- a/deskutils/evolution-jescs/distinfo
+++ b/deskutils/evolution-jescs/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-jescs-2.8.2.tar.bz2) = d1a103854ea1ee30f2186474a0d2bb73
-SHA256 (evolution-jescs-2.8.2.tar.bz2) = 2075b5a42b19ab0ad2343816aefc0d0f9707594fa6ffceaf7f82a0591efdb4e1
-SIZE (evolution-jescs-2.8.2.tar.bz2) = 499151
+MD5 (evolution-jescs-2.9.1.tar.bz2) = d29106ca0412e2397409813d46d094b7
+SHA256 (evolution-jescs-2.9.1.tar.bz2) = f1736e27ffcb9fc826cb5f946fc3e2f958b22fc518304d440bdd25d1b7164402
+SIZE (evolution-jescs-2.9.1.tar.bz2) = 519693
diff --git a/deskutils/evolution-jescs/pkg-plist b/deskutils/evolution-jescs/pkg-plist
index a5b4c40..caf6129 100644
--- a/deskutils/evolution-jescs/pkg-plist
+++ b/deskutils/evolution-jescs/pkg-plist
@@ -9,6 +9,7 @@ share/gnome/evolution/%%EVO_VERSION%%/images/sunone-invitations-mini.png
share/gnome/evolution-jescs/glade/sunone-add-permission-dialog.glade
share/gnome/evolution-jescs/glade/sunone-permissions-dialog.glade
share/gnome/evolution-jescs/glade/sunone-subscription-dialog.glade
+share/locale/ar/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index aa8c322..a4d30ec 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.108 2006/10/03 13:21:06 ahze Exp $
+# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.115 2007/03/11 20:46:37 mezz Exp $
#
PORTNAME= gnome-utils
-PORTVERSION= 2.16.2
+PORTVERSION= 2.18.0
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 3f661cc..6782e48 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.16.2.tar.bz2) = 4e70e667a78fc5bee4a4b8f2f3ae8440
-SHA256 (gnome2/gnome-utils-2.16.2.tar.bz2) = 40cf468e6393bc0840e1a38380742d9f91ad236440a4b240318c35f979809425
-SIZE (gnome2/gnome-utils-2.16.2.tar.bz2) = 3369888
+MD5 (gnome2/gnome-utils-2.18.0.tar.bz2) = 33fad81655eed993dea8b5bb7a5789bb
+SHA256 (gnome2/gnome-utils-2.18.0.tar.bz2) = de0d7d54d0c55f1712c7851fbaa9fb38af513ef0752c02532151e2a7b90480c8
+SIZE (gnome2/gnome-utils-2.18.0.tar.bz2) = 4077531
diff --git a/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c b/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c
deleted file mode 100644
index 0cc8959..0000000
--- a/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- gnome-screenshot/screenshot-save.c.orig Mon Nov 1 15:56:19 2004
-+++ gnome-screenshot/screenshot-save.c Fri Dec 17 23:11:51 2004
-@@ -94,16 +94,20 @@
- gchar *message = NULL;
- gchar *error_message = NULL;
- GtkWidget *dialog;
-+ GIOStatus status;
-
-- g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
-- message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
-- dialog = gtk_message_dialog_new (NULL, 0,
-+ status = g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
-+ if (status == G_IO_STATUS_NORMAL)
-+ {
-+ message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
-+ dialog = gtk_message_dialog_new (NULL, 0,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- message);
-- gtk_dialog_run (GTK_DIALOG (dialog));
-- gtk_widget_destroy (dialog);
-- exit (1);
-+ gtk_dialog_run (GTK_DIALOG (dialog));
-+ gtk_widget_destroy (dialog);
-+ exit (1);
-+ }
- }
-
- (*save_callback) (save_user_data);
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index b65f63e..8c17640 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -13,6 +13,7 @@ include/gdict-1.0/gdict/gdict-enum-types.h
include/gdict-1.0/gdict/gdict-source-loader.h
include/gdict-1.0/gdict/gdict-source.h
include/gdict-1.0/gdict/gdict-speller.h
+include/gdict-1.0/gdict/gdict-strategy-chooser.h
include/gdict-1.0/gdict/gdict-utils.h
include/gdict-1.0/gdict/gdict-version.h
include/gdict-1.0/gdict/gdict.h
@@ -48,27 +49,11 @@ share/gnome/applications/gnome-dictionary.desktop
share/gnome/applications/gnome-screenshot.desktop
share/gnome/applications/gnome-search-tool.desktop
share/gnome/applications/gnome-system-log.desktop
-share/gnome/baobab/pixmaps/alfa_sort.png
share/gnome/baobab/pixmaps/baobab.glade
-share/gnome/baobab/pixmaps/baobab.xpm
-share/gnome/baobab/pixmaps/busy.gif
-share/gnome/baobab/pixmaps/done.png
-share/gnome/baobab/pixmaps/format_numeric.png
-share/gnome/baobab/pixmaps/format_percent.png
-share/gnome/baobab/pixmaps/green.png
-share/gnome/baobab/pixmaps/nautilus.png
-share/gnome/baobab/pixmaps/num_sort.png
-share/gnome/baobab/pixmaps/red.png
-share/gnome/baobab/pixmaps/scan_directory.png
-share/gnome/baobab/pixmaps/scan_harddisk.png
-share/gnome/baobab/pixmaps/search.png
-share/gnome/baobab/pixmaps/searchall.png
share/gnome/baobab/pixmaps/shot.png
-share/gnome/baobab/pixmaps/stop.png
-share/gnome/baobab/pixmaps/white.png
-share/gnome/baobab/pixmaps/yellow.png
share/gnome/gdict-1.0/sources/default.desktop
share/gnome/gdict-1.0/sources/spanish.desktop
+share/gnome/gdict-1.0/sources/thai.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
@@ -83,6 +68,18 @@ share/gnome/help/baobab/C/figures/baobab_remote.png
share/gnome/help/baobab/C/figures/baobab_treemaps.png
share/gnome/help/baobab/C/figures/baobab_window.png
share/gnome/help/baobab/C/legal.xml
+share/gnome/help/baobab/en_GB/baobab.xml
+share/gnome/help/baobab/en_GB/figures/baobab_fullscan.png
+share/gnome/help/baobab/en_GB/figures/baobab_prefs.png
+share/gnome/help/baobab/en_GB/figures/baobab_remote.png
+share/gnome/help/baobab/en_GB/figures/baobab_treemaps.png
+share/gnome/help/baobab/en_GB/figures/baobab_window.png
+share/gnome/help/baobab/es/baobab.xml
+share/gnome/help/baobab/es/figures/baobab_fullscan.png
+share/gnome/help/baobab/es/figures/baobab_prefs.png
+share/gnome/help/baobab/es/figures/baobab_remote.png
+share/gnome/help/baobab/es/figures/baobab_treemaps.png
+share/gnome/help/baobab/es/figures/baobab_window.png
share/gnome/help/baobab/fr/baobab.xml
share/gnome/help/baobab/fr/figures/baobab_fullscan.png
share/gnome/help/baobab/fr/figures/baobab_prefs.png
@@ -132,6 +129,15 @@ share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-lookup.png
share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-preferences-print.png
share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-preferences-source.png
share/gnome/help/gnome-dictionary/fr/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/it/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-add-source.png
share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-applet-window.png
share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-applet.png
@@ -181,17 +187,22 @@ share/gnome/help/gnome-system-log/fr/figures/syslog_window.png
share/gnome/help/gnome-system-log/fr/gnome-system-log.xml
share/gnome/help/gnome-system-log/it/figures/syslog_window.png
share/gnome/help/gnome-system-log/it/gnome-system-log.xml
+share/gnome/help/gnome-system-log/ru/figures/syslog_window.png
+share/gnome/help/gnome-system-log/ru/gnome-system-log.xml
share/gnome/help/gnome-system-log/sv/figures/syslog_window.png
share/gnome/help/gnome-system-log/sv/gnome-system-log.xml
share/gnome/help/gnome-system-log/uk/figures/syslog_window.png
share/gnome/help/gnome-system-log/uk/gnome-system-log.xml
share/gnome/omf/baobab/baobab-C.omf
+share/gnome/omf/baobab/baobab-en_GB.omf
+share/gnome/omf/baobab/baobab-es.omf
share/gnome/omf/baobab/baobab-fr.omf
share/gnome/omf/baobab/baobab-sv.omf
share/gnome/omf/gnome-dictionary/gnome-dictionary-C.omf
share/gnome/omf/gnome-dictionary/gnome-dictionary-el.omf
share/gnome/omf/gnome-dictionary/gnome-dictionary-es.omf
share/gnome/omf/gnome-dictionary/gnome-dictionary-fr.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-it.omf
share/gnome/omf/gnome-dictionary/gnome-dictionary-ru.omf
share/gnome/omf/gnome-dictionary/gnome-dictionary-sv.omf
share/gnome/omf/gnome-dictionary/gnome-dictionary-uk.omf
@@ -205,11 +216,13 @@ share/gnome/omf/gnome-system-log/gnome-system-log-C.omf
share/gnome/omf/gnome-system-log/gnome-system-log-es.omf
share/gnome/omf/gnome-system-log/gnome-system-log-fr.omf
share/gnome/omf/gnome-system-log/gnome-system-log-it.omf
+share/gnome/omf/gnome-system-log/gnome-system-log-ru.omf
share/gnome/omf/gnome-system-log/gnome-system-log-sv.omf
share/gnome/omf/gnome-system-log/gnome-system-log-uk.omf
share/gnome/pixmaps/gsearchtool/thumbnail_frame.png
-share/icons/hicolor/48x48/apps/baobab.png
+share/icons/hicolor/24x24/apps/baobab.png
share/icons/hicolor/48x48/apps/gnome-dictionary.png
+share/icons/hicolor/scalable/apps/baobab.svg
share/icons/hicolor/scalable/apps/gnome-dictionary.svg
share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
@@ -291,6 +304,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@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/ru/figures
+@dirrm share/gnome/help/gnome-system-log/ru
@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
@@ -319,6 +334,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-dictionary/sv
@dirrm share/gnome/help/gnome-dictionary/ru/figures
@dirrm share/gnome/help/gnome-dictionary/ru
+@dirrm share/gnome/help/gnome-dictionary/it/figures
+@dirrm share/gnome/help/gnome-dictionary/it
@dirrm share/gnome/help/gnome-dictionary/fr/figures
@dirrm share/gnome/help/gnome-dictionary/fr
@dirrm share/gnome/help/gnome-dictionary/es/figures
@@ -332,6 +349,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/baobab/sv
@dirrm share/gnome/help/baobab/fr/figures
@dirrm share/gnome/help/baobab/fr
+@dirrm share/gnome/help/baobab/es/figures
+@dirrm share/gnome/help/baobab/es
+@dirrm share/gnome/help/baobab/en_GB/figures
+@dirrm share/gnome/help/baobab/en_GB
@dirrm share/gnome/help/baobab/C/figures
@dirrm share/gnome/help/baobab/C
@dirrm share/gnome/help/baobab
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index 95c2064..40c1318 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -3,12 +3,12 @@
# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/deskutils/gnotime/Makefile,v 1.18 2007/03/14 17:45:39 marcus Exp $
#
PORTNAME= gnotime
PORTVERSION= 2.2.2
-PORTREVISON= 2
+PORTREVISON= 3
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gttr
@@ -31,4 +31,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
MAN1= gnotime.1
GCONF_SCHEMAS= gnotime.schemas
+post-patch:
+ @${REINPLACE_CMD} -e 's|libgtkhtml-3.8|libgtkhtml-3.14|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index f118b5f..e09c5fc 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gucharmap/Makefile,v 1.30 2006/10/02 04:52:51 bland Exp $
+# $MCom: ports/deskutils/gucharmap/Makefile,v 1.35 2007/03/13 00:40:44 mezz Exp $
#
PORTNAME= gucharmap
-PORTVERSION= 1.8.0
+PORTVERSION= 1.10.0
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index 0e3fdb6..e8520ec 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gucharmap-1.8.0.tar.bz2) = a75cc3dcc9fb3d2edecc4da936e80e3a
-SHA256 (gnome2/gucharmap-1.8.0.tar.bz2) = 54ca751dda9e187bab19a609d42159a656c2bb933a15024b27841bf08a2185ab
-SIZE (gnome2/gucharmap-1.8.0.tar.bz2) = 2542413
+MD5 (gnome2/gucharmap-1.10.0.tar.bz2) = a0e01bcff2bc5e35ec88f60a383051d3
+SHA256 (gnome2/gucharmap-1.10.0.tar.bz2) = 67efc04e6c70db7a342315a291a49869aff4c262b83233e3e4d1dd654a2d753b
+SIZE (gnome2/gucharmap-1.10.0.tar.bz2) = 2506883
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index 6b68a43..e1f9719 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -15,7 +15,7 @@ include/gucharmap/gucharmap-window.h
include/gucharmap/gucharmap.h
lib/libgucharmap.la
lib/libgucharmap.so
-lib/libgucharmap.so.5
+lib/libgucharmap.so.6
libdata/pkgconfig/gucharmap.pc
share/gnome/applications/gucharmap.desktop
share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png
@@ -28,6 +28,9 @@ 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/en_GB/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/en_GB/figures/gucharmap_window.png
+share/gnome/help/gucharmap/en_GB/gucharmap.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
@@ -61,6 +64,7 @@ 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-en_GB.omf
share/gnome/omf/gucharmap/gucharmap-es.omf
share/gnome/omf/gucharmap/gucharmap-fi.omf
share/gnome/omf/gucharmap/gucharmap-fr.omf
@@ -165,6 +169,8 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
@dirrm share/gnome/help/gucharmap/fi
@dirrm share/gnome/help/gucharmap/es/figures
@dirrm share/gnome/help/gucharmap/es
+@dirrm share/gnome/help/gucharmap/en_GB/figures
+@dirrm share/gnome/help/gucharmap/en_GB
@dirrm share/gnome/help/gucharmap/de/figures
@dirrm share/gnome/help/gucharmap/de
@dirrm share/gnome/help/gucharmap/bg/figures
diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile
index f75ceca..d938fd3 100644
--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@@ -7,7 +7,7 @@
PORTNAME= logjam
PORTVERSION= 4.5.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils
MASTER_SITES= http://logjam.danga.com/download/
@@ -69,6 +69,6 @@ pre-everything::
@${ECHO_MSG} ""
post-patch:
- @${REINPLACE_CMD} -e 's|libgtkhtml-3.0|libgtkhtml-3.1|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|libgtkhtml-3.0|libgtkhtml-3.18|g' ${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/deskutils/nautilus-open-terminal/Makefile b/deskutils/nautilus-open-terminal/Makefile
index a3dab5c..3517508 100644
--- a/deskutils/nautilus-open-terminal/Makefile
+++ b/deskutils/nautilus-open-terminal/Makefile
@@ -3,14 +3,13 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/nautilus-open-terminal/Makefile,v 1.7 2006/08/09 13:07:37 ahze Exp $
+# $MCom: ports/deskutils/nautilus-open-terminal/Makefile,v 1.9 2007/03/05 13:36:03 ahze Exp $
#
PORTNAME= nautilus-open-terminal
-PORTVERSION= 0.7
+PORTVERSION= 0.8
CATEGORIES= deskutils
-MASTER_SITES= http://manny.cluecoder.org/packages/nautilus-open-terminal/ \
- http://www.marcuscom.com/downloads/
+MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Nautilus extension which allows you to open a terminal
diff --git a/deskutils/nautilus-open-terminal/distinfo b/deskutils/nautilus-open-terminal/distinfo
index 57846ca..2152a2b 100644
--- a/deskutils/nautilus-open-terminal/distinfo
+++ b/deskutils/nautilus-open-terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-open-terminal-0.7.tar.gz) = 318e9673017d9faf9a56aeeb74d36124
-SHA256 (nautilus-open-terminal-0.7.tar.gz) = 136adadbabed4b2436ddbff49f967c8dc17ad632aaaf1bff69f2fa17182e64eb
-SIZE (nautilus-open-terminal-0.7.tar.gz) = 360315
+MD5 (nautilus-open-terminal-0.8.tar.gz) = 4f335934935e2d53ebb893e7ad2bd9bd
+SHA256 (nautilus-open-terminal-0.8.tar.gz) = 3650860cacdaa0f2e3f97f7aca2620fd50163d12aca40d2fb48ba7e7581e854d
+SIZE (nautilus-open-terminal-0.8.tar.gz) = 365879
diff --git a/deskutils/nautilus-open-terminal/pkg-plist b/deskutils/nautilus-open-terminal/pkg-plist
index 80add23..f8848d6 100644
--- a/deskutils/nautilus-open-terminal/pkg-plist
+++ b/deskutils/nautilus-open-terminal/pkg-plist
@@ -1,18 +1,24 @@
lib/nautilus/extensions-1.0/libnautilus-open-terminal.a
lib/nautilus/extensions-1.0/libnautilus-open-terminal.la
lib/nautilus/extensions-1.0/libnautilus-open-terminal.so
+share/locale/ar/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/be/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/bg/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/bn_IN/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/ca/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/cs/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/da/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/de/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/dz/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/en_CA/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/en_GB/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/es/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/et/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/eu/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/fi/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/fr/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/gl/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/gu/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/he/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/hu/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/it/LC_MESSAGES/nautilus-open-terminal.mo
@@ -31,6 +37,7 @@ share/locale/ro/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/ru/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/rw/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/sk/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/sl/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/sr/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/sr@Latn/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/sv/LC_MESSAGES/nautilus-open-terminal.mo
@@ -48,6 +55,8 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-open-terminal.mo
@dirrmtry share/locale/uk
@dirrmtry share/locale/sr/LC_MESSAGES
@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
@dirrmtry share/locale/sk/LC_MESSAGES
@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@@ -64,7 +73,13 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-open-terminal.mo
@dirrmtry share/locale/gl
@dirrmtry share/locale/fi/LC_MESSAGES
@dirrmtry share/locale/fi
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index 4fff880..519338b 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.5 2006/10/12 16:46:23 marcus Exp $
+# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.7 2007/03/12 11:50:11 ahze Exp $
PORTNAME= nautilus-sendto
-PORTVERSION= 0.8
+PORTVERSION= 0.10
CATEGORIES= deskutils
MASTER_SITES= GNOME
diff --git a/deskutils/nautilus-sendto/distinfo b/deskutils/nautilus-sendto/distinfo
index b0e85cb..84bb28e 100644
--- a/deskutils/nautilus-sendto/distinfo
+++ b/deskutils/nautilus-sendto/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-sendto-0.8.tar.bz2) = 19165c7404c4956efd4366a8ebe3ddfa
-SHA256 (nautilus-sendto-0.8.tar.bz2) = b046c9993029a0e5cc3976252420e5ba1413fa7174541a10815222a41c522c73
-SIZE (nautilus-sendto-0.8.tar.bz2) = 310098
+MD5 (nautilus-sendto-0.10.tar.bz2) = cc47d4364d71d6f35776c5634e2f1ed1
+SHA256 (nautilus-sendto-0.10.tar.bz2) = f5d3a654070464929c751775c767cf39ce27f8f37a7d9ef5f336598631d3ea8d
+SIZE (nautilus-sendto-0.10.tar.bz2) = 322104
diff --git a/deskutils/nautilus-sendto/pkg-plist b/deskutils/nautilus-sendto/pkg-plist
index 7048347..a7f63be 100644
--- a/deskutils/nautilus-sendto/pkg-plist
+++ b/deskutils/nautilus-sendto/pkg-plist
@@ -1,6 +1,8 @@
bin/nautilus-sendto
lib/gaim/nautilus.la
lib/gaim/nautilus.so
+lib/nautilus-sendto/plugins/libnstbluetooth.la
+lib/nautilus-sendto/plugins/libnstbluetooth.so
lib/nautilus-sendto/plugins/libnstevolution.la
lib/nautilus-sendto/plugins/libnstevolution.so
lib/nautilus-sendto/plugins/libnstgaim.la
@@ -9,8 +11,9 @@ lib/nautilus-sendto/plugins/libnstsylpheed.la
lib/nautilus-sendto/plugins/libnstsylpheed.so
lib/nautilus/extensions-1.0/libnautilus-sendto.la
lib/nautilus/extensions-1.0/libnautilus-sendto.so
-share/gnome/nautilus-sendto/glade/nautilus-sendto-force.glade
share/gnome/nautilus-sendto/glade/nautilus-sendto.glade
+share/locale/ar/LC_MESSAGES/nautilus-sendto.mo
+share/locale/be/LC_MESSAGES/nautilus-sendto.mo
share/locale/bg/LC_MESSAGES/nautilus-sendto.mo
share/locale/ca/LC_MESSAGES/nautilus-sendto.mo
share/locale/cs/LC_MESSAGES/nautilus-sendto.mo
@@ -44,6 +47,7 @@ share/locale/pt_BR/LC_MESSAGES/nautilus-sendto.mo
share/locale/ru/LC_MESSAGES/nautilus-sendto.mo
share/locale/rw/LC_MESSAGES/nautilus-sendto.mo
share/locale/sk/LC_MESSAGES/nautilus-sendto.mo
+share/locale/sl/LC_MESSAGES/nautilus-sendto.mo
share/locale/sq/LC_MESSAGES/nautilus-sendto.mo
share/locale/sv/LC_MESSAGES/nautilus-sendto.mo
share/locale/th/LC_MESSAGES/nautilus-sendto.mo
@@ -57,6 +61,8 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo
@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/uk/LC_MESSAGES
@dirrmtry share/locale/uk
+@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
@@ -81,6 +87,8 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
@dirrm share/gnome/nautilus-sendto/glade
@dirrm share/gnome/nautilus-sendto
@dirrm lib/nautilus-sendto/plugins
diff --git a/deskutils/ontv/Makefile b/deskutils/ontv/Makefile
index b47cd00..de0dc08 100644
--- a/deskutils/ontv/Makefile
+++ b/deskutils/ontv/Makefile
@@ -3,30 +3,33 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/ontv/Makefile,v 1.3 2006/10/08 16:50:42 mezz Exp $
+# $MCom: ports/deskutils/ontv/Makefile,v 1.5 2007/02/18 19:18:34 mezz Exp $
#
PORTNAME= ontv
-PORTVERSION= 2.2.0
-PORTREVISION= 2
-CATEGORIES= deskutils
+PORTVERSION= 2.4.0
+CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
MAINTAINER= gnome@FreeBSD.org
-COMMENT= GNOME Applet frontend of XMLTV
+COMMENT= A GNOME Applet for monitoring current and upcoming TV programs
-LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementtree \
+ ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementtree \
+ ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify \
+ ${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte \
tv_grab_be:${PORTSDIR}/textproc/p5-xmltv
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_GNOME= pygnomedesktop gnomeprefix pygnomeextras
+USE_GNOME= gnomehack gnomeprefix pygnomedesktop pygnomeextras
USE_GMAKE= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= ontv.schemas
+INSTALLS_ICONS= yes
.include <bsd.port.mk>
diff --git a/deskutils/ontv/distinfo b/deskutils/ontv/distinfo
index a895756..b9e56a4 100644
--- a/deskutils/ontv/distinfo
+++ b/deskutils/ontv/distinfo
@@ -1,3 +1,3 @@
-MD5 (ontv-2.2.0.tar.bz2) = 10f72547a3026c2485a379a12301376c
-SHA256 (ontv-2.2.0.tar.bz2) = 4e7fb7fc70899b0cb16c7452a10ef2dd8f0d14c127137c08eed32283958b50cb
-SIZE (ontv-2.2.0.tar.bz2) = 406089
+MD5 (ontv-2.4.0.tar.bz2) = 9f59697b1785055a347bd8e6bba8b2d3
+SHA256 (ontv-2.4.0.tar.bz2) = 54160178096824ad66d365d4563434e9d60ba6794041d59df9500a5ff7456709
+SIZE (ontv-2.4.0.tar.bz2) = 411776
diff --git a/deskutils/ontv/files/patch-data_Makefile.in b/deskutils/ontv/files/patch-data_Makefile.in
deleted file mode 100644
index 79d3d00..0000000
--- a/deskutils/ontv/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/Makefile.in.orig Mon Jul 24 23:13:40 2006
-+++ data/Makefile.in Mon Jul 24 23:14:10 2006
-@@ -240,7 +240,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = images
--serverdir = $(libdir)/bonobo/servers
-+serverdir = @prefix@/libdata/bonobo/servers
- server_in_files = GNOME_OnTVApplet.server.in
- server_DATA = $(server_in_files:.server.in=.server)
- gladedir = $(datadir)/ontv
diff --git a/deskutils/ontv/files/patch-ontv___init__.in.py b/deskutils/ontv/files/patch-ontv___init__.in.py
index a572e90..a74da50 100644
--- a/deskutils/ontv/files/patch-ontv___init__.in.py
+++ b/deskutils/ontv/files/patch-ontv___init__.in.py
@@ -1,15 +1,15 @@
---- ontv/__init__.py.in.orig Mon Jul 24 23:05:49 2006
-+++ ontv/__init__.py.in Mon Jul 24 23:06:14 2006
+--- ontv/__init__.py.in.orig Sun Feb 18 00:51:02 2007
++++ ontv/__init__.py.in Sun Feb 18 00:51:12 2007
@@ -1,7 +1,7 @@
NAME = 'OnTV'
VERSION = '@VERSION@'
-SERVERS_DIR = '@prefix@/lib/bonobo/servers'
-DATA_DIR = '@prefix@/@DATADIRNAME@/ontv'
--PIXMAPS_DIR = '@prefix@/@DATADIRNAME@/pixmaps'
+-IMAGES_DIR = '@prefix@/@DATADIRNAME@/ontv/images'
-UI_DIR = '@prefix@/@DATADIRNAME@/gnome-2.0/ui'
-LOCALE_DIR = '@prefix@/@DATADIRNAME@/locale'
+SERVERS_DIR = '@prefix@/libdata/bonobo/servers'
+DATA_DIR = '@prefix@/share/gnome/ontv'
-+PIXMAPS_DIR = '@prefix@/share/gnome/pixmaps'
++IMAGES_DIR = '@prefix@/share/gnome/ontv/images'
+UI_DIR = '@prefix@/share/gnome/gnome-2.0/ui'
+LOCALE_DIR = '@prefix@/share/locale'
diff --git a/deskutils/ontv/pkg-descr b/deskutils/ontv/pkg-descr
index 40fe2d7..49a8d61 100644
--- a/deskutils/ontv/pkg-descr
+++ b/deskutils/ontv/pkg-descr
@@ -1 +1,4 @@
-GNOME Applet frontend of XMLTV
+OnTV is a GNOME Applet for monitoring current and upcoming TV programs. It
+uses XMLTV files to monitor them.
+
+WWW: http://johan.svedberg.com/projects/coding/ontv
diff --git a/deskutils/ontv/pkg-plist b/deskutils/ontv/pkg-plist
index 678e481..1eda48a7 100644
--- a/deskutils/ontv/pkg-plist
+++ b/deskutils/ontv/pkg-plist
@@ -10,9 +10,6 @@
%%PYTHON_SITELIBDIR%%/ontv/Configuration.py
%%PYTHON_SITELIBDIR%%/ontv/Configuration.pyc
%%PYTHON_SITELIBDIR%%/ontv/Configuration.pyo
-%%PYTHON_SITELIBDIR%%/ontv/DBus.py
-%%PYTHON_SITELIBDIR%%/ontv/DBus.pyc
-%%PYTHON_SITELIBDIR%%/ontv/DBus.pyo
%%PYTHON_SITELIBDIR%%/ontv/GUI.py
%%PYTHON_SITELIBDIR%%/ontv/GUI.pyc
%%PYTHON_SITELIBDIR%%/ontv/GUI.pyo
@@ -52,6 +49,12 @@
%%PYTHON_SITELIBDIR%%/ontv/TimeSpan.py
%%PYTHON_SITELIBDIR%%/ontv/TimeSpan.pyc
%%PYTHON_SITELIBDIR%%/ontv/TimeSpan.pyo
+%%PYTHON_SITELIBDIR%%/ontv/Utils.py
+%%PYTHON_SITELIBDIR%%/ontv/Utils.pyc
+%%PYTHON_SITELIBDIR%%/ontv/Utils.pyo
+%%PYTHON_SITELIBDIR%%/ontv/XMLTVAssistant.py
+%%PYTHON_SITELIBDIR%%/ontv/XMLTVAssistant.pyc
+%%PYTHON_SITELIBDIR%%/ontv/XMLTVAssistant.pyo
%%PYTHON_SITELIBDIR%%/ontv/XMLTVFile.py
%%PYTHON_SITELIBDIR%%/ontv/XMLTVFile.pyc
%%PYTHON_SITELIBDIR%%/ontv/XMLTVFile.pyo
@@ -70,11 +73,20 @@
libdata/bonobo/servers/GNOME_OnTVApplet.server
libexec/ontv
share/gnome/gnome-2.0/ui/GNOME_OnTVApplet.xml
-share/gnome/ontv/ontv-logo-downloading.png
+share/gnome/ontv/images/ontv-logo-downloading.png
share/gnome/ontv/ontv.glade
-share/gnome/pixmaps/ontv.png
+share/icons/hicolor/16x16/apps/ontv.png
+share/icons/hicolor/22x22/apps/ontv.png
+share/icons/hicolor/24x24/apps/ontv.png
+share/icons/hicolor/32x32/apps/ontv.png
+share/icons/hicolor/48x48/apps/ontv.png
+share/icons/hicolor/scalable/apps/ontv.svg
+share/locale/ar/LC_MESSAGES/ontv.mo
share/locale/bg/LC_MESSAGES/ontv.mo
+share/locale/ca/LC_MESSAGES/ontv.mo
+share/locale/cs/LC_MESSAGES/ontv.mo
share/locale/de/LC_MESSAGES/ontv.mo
+share/locale/dz/LC_MESSAGES/ontv.mo
share/locale/en_CA/LC_MESSAGES/ontv.mo
share/locale/en_GB/LC_MESSAGES/ontv.mo
share/locale/es/LC_MESSAGES/ontv.mo
@@ -86,10 +98,12 @@ share/locale/nl/LC_MESSAGES/ontv.mo
share/locale/pa/LC_MESSAGES/ontv.mo
share/locale/pl/LC_MESSAGES/ontv.mo
share/locale/pt_BR/LC_MESSAGES/ontv.mo
+share/locale/sk/LC_MESSAGES/ontv.mo
share/locale/sv/LC_MESSAGES/ontv.mo
share/locale/uk/LC_MESSAGES/ontv.mo
share/locale/vi/LC_MESSAGES/ontv.mo
share/locale/zh_CN/LC_MESSAGES/ontv.mo
+@dirrm share/gnome/ontv/images
@dirrm share/gnome/ontv
@dirrm %%PYTHON_SITELIBDIR%%/ontv/keybinder
@dirrm %%PYTHON_SITELIBDIR%%/ontv
@@ -97,7 +111,15 @@ share/locale/zh_CN/LC_MESSAGES/ontv.mo
@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/uk/LC_MESSAGES
@dirrmtry share/locale/uk
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/pl/LC_MESSAGES
@dirrmtry share/locale/pl
@dirrmtry share/locale/fi/LC_MESSAGES
@dirrmtry share/locale/fi
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/devel/Makefile b/devel/Makefile
index 0890e56..67385e4 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -582,6 +582,7 @@
SUBDIR += liboil
SUBDIR += libol
SUBDIR += libole2
+ SUBDIR += liboobs
SUBDIR += liboop
SUBDIR += libopendaap
SUBDIR += libopensync
@@ -2125,6 +2126,7 @@
SUBDIR += wizardkit
SUBDIR += wxGlade
SUBDIR += wxGlade-devel
+ SUBDIR += xdg-user-dirs-gtk
SUBDIR += xdg-utils
SUBDIR += xfc
SUBDIR += xfce4-dev-tools
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index ab394e9..3699b68 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/bug-buddy/Makefile,v 1.38 2006/09/20 06:35:57 marcus Exp $
+# $MCom: ports/devel/bug-buddy/Makefile,v 1.44 2007/03/13 12:27:23 ahze Exp $
#
PORTNAME= bug-buddy
-PORTVERSION= 2.16.1
+PORTVERSION= 2.18.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index 5980aa1..956f14e 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.16.1.tar.bz2) = c15641ebfd90a91f185179d67bde88e3
-SHA256 (gnome2/bug-buddy-2.16.1.tar.bz2) = fa20afc4ca7c2e0e03346bf608254e7c25eac4503ad05581caa971d54464daa8
-SIZE (gnome2/bug-buddy-2.16.1.tar.bz2) = 512914
+MD5 (gnome2/bug-buddy-2.18.0.tar.bz2) = 3b3d99f2450f300d73a201bc5c00498d
+SHA256 (gnome2/bug-buddy-2.18.0.tar.bz2) = aaa16927809b2cf96a5414461363ab325e3fb89bfa6d6822f0f015a2f853b3f2
+SIZE (gnome2/bug-buddy-2.18.0.tar.bz2) = 553486
diff --git a/devel/bug-buddy/files/patch-src_bug-buddy.menu.in b/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
index 5093e3e..0866ee3 100644
--- a/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
+++ b/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
@@ -1,11 +1,11 @@
---- src/bug-buddy.menu.in.orig Wed Sep 20 02:28:05 2006
-+++ src/bug-buddy.menu.in Wed Sep 20 02:28:12 2006
+--- src/bug-buddy.menu.in.orig Tue Feb 27 13:46:40 2007
++++ src/bug-buddy.menu.in Tue Feb 27 13:46:54 2007
@@ -6,7 +6,7 @@
<Name>Bug Buddy programs</Name>
<!-- Read only files in default .desktop file location -->
- <LegacyDir>@prefix@/@DATADIRNAME@/applications</LegacyDir>
+ <LegacyDir>@prefix@/@DATADIRNAME@/gnome/applications</LegacyDir>
+ <LegacyDir>@prefix@/@DATADIRNAME@/gnome/autostart</LegacyDir>
<!-- we want to process all desktop files; Unfortunately,
- files with NoDisplay=true won't be returned by the
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index f4a144f..1c8db1c 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -12,8 +12,6 @@ share/gnome/bug-buddy/bugzilla/ximian/config
share/gnome/bug-buddy/bugzilla/ximian/mostfreq
share/gnome/bug-buddy/bugzilla/ximian/products
share/gnome/bug-buddy/gdb-cmd
-share/gnome/bug-buddy/gnome.png
-share/gnome/bug-buddy/ximian.png
share/icons/hicolor/48x48/apps/bug-buddy.png
share/locale/am/LC_MESSAGES/bug-buddy.mo
share/locale/ar/LC_MESSAGES/bug-buddy.mo
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index 6c798ca..ff39114 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/gamin/Makefile,v 1.2 2007/02/02 18:57:01 mezz Exp $
#
PORTNAME= gamin
-PORTVERSION= 0.1.7
-PORTREVISION?= 2
+PORTVERSION= 0.1.8
CATEGORIES?= devel
MASTER_SITES= http://www.gnome.org/~veillard/gamin/sources/
diff --git a/devel/gamin/distinfo b/devel/gamin/distinfo
index 2cba0d5..12270a4 100644
--- a/devel/gamin/distinfo
+++ b/devel/gamin/distinfo
@@ -1,3 +1,3 @@
-MD5 (gamin-0.1.7.tar.gz) = 1a1991ffa749b7dc2cc0573d6a2867b8
-SHA256 (gamin-0.1.7.tar.gz) = 8272c64356e1310353f2411b2cabd211468edbf8ce312d58aeef55889e79361a
-SIZE (gamin-0.1.7.tar.gz) = 542061
+MD5 (gamin-0.1.8.tar.gz) = 985022c8b1b993e471d528fd0e14ffbe
+SHA256 (gamin-0.1.8.tar.gz) = be22f69b4797db510f4270ff0e228dd027e99e561ac5f5d38be595be7e82d203
+SIZE (gamin-0.1.8.tar.gz) = 564530
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index e19c0c3..e6f4e96 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gconf2/Makefile,v 1.79 2006/10/05 18:09:30 mezz Exp $
+# $MCom: ports/devel/gconf2/Makefile,v 1.81 2007/03/06 17:05:38 marcus Exp $
#
PORTNAME= gconf2
-PORTVERSION= 2.16.1
+PORTVERSION= 2.18.0.1
PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index ab70108..2c95436 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/GConf-2.16.1.tar.bz2) = 60d2da294195abb8cac81b6ecceb7e5e
-SHA256 (gnome2/GConf-2.16.1.tar.bz2) = accedbd57f497be040055761b1553108a919cdde00986230434b9fe3925a6200
-SIZE (gnome2/GConf-2.16.1.tar.bz2) = 1321109
+MD5 (gnome2/GConf-2.18.0.1.tar.bz2) = aa0e0a0729fb021bab72b4166fd392f9
+SHA256 (gnome2/GConf-2.18.0.1.tar.bz2) = 58a738f34078de9b3906460a297e751e80a0846e4f3bf33e1884216d0da42bf1
+SIZE (gnome2/GConf-2.18.0.1.tar.bz2) = 1347765
diff --git a/devel/gconf2/files/patch-gconf_gconftool.c b/devel/gconf2/files/patch-gconf_gconftool.c
index c47e5e4..f3c3d2f 100644
--- a/devel/gconf2/files/patch-gconf_gconftool.c
+++ b/devel/gconf2/files/patch-gconf_gconftool.c
@@ -1,20 +1,9 @@
---- gconf/gconftool.c.orig Fri May 5 12:36:01 2006
-+++ gconf/gconftool.c Fri May 5 12:39:29 2006
-@@ -3724,6 +3724,8 @@
- static int
- do_makefile_install(GConfEngine* conf, const gchar** args, gboolean unload)
- {
-+ int sync_result;
-+
- if (args == NULL)
- {
- g_printerr (_("Must specify some schema files to install\n"));
-@@ -3738,7 +3740,15 @@
- ++args;
+--- gconf/gconftool.c.orig Fri Mar 2 17:10:13 2007
++++ gconf/gconftool.c Tue Mar 6 12:01:04 2007
+@@ -3781,6 +3781,13 @@ do_makefile_install(GConfEngine* conf, c
}
-- return do_sync (conf);
-+ sync_result = do_sync (conf);
+ retval |= do_sync (conf);
+
+ /*
+ * Send all the gconfd-2 processes a SIGHUP so that they reload the
@@ -22,7 +11,6 @@
+ */
+ system("/usr/bin/killall -SIGHUP gconfd-2 >/dev/null 2>&1");
+
-+ return sync_result;
+ return retval;
}
- typedef enum {
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 944042f..deaec0b 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gconfmm26/Makefile,v 1.14 2006/08/21 15:35:55 ahze Exp $
+# $MCom: ports/devel/gconfmm26/Makefile,v 1.16 2007/03/10 05:27:50 marcus Exp $
#
PORTNAME= gconfmm
-PORTVERSION= 2.16.0
+PORTVERSION= 2.18.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gconfmm26/distinfo b/devel/gconfmm26/distinfo
index c74297b..8fe555c 100644
--- a/devel/gconfmm26/distinfo
+++ b/devel/gconfmm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconfmm-2.16.0.tar.bz2) = 2b3aa57276f6f63c4effc585ba205a3d
-SHA256 (gnome2/gconfmm-2.16.0.tar.bz2) = 514f1062d85b7b3843f461b095b64551f20e647386dab6a513982af52e0392f2
-SIZE (gnome2/gconfmm-2.16.0.tar.bz2) = 275789
+MD5 (gnome2/gconfmm-2.18.0.tar.bz2) = 0771dde14af1443f9ac142010eb3d403
+SHA256 (gnome2/gconfmm-2.18.0.tar.bz2) = 0f82e951069395c28b86205233e2a061505544811448f1bd75a3ee76b44d9316
+SIZE (gnome2/gconfmm-2.18.0.tar.bz2) = 292484
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 709288b..4d85150 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glade3/Makefile,v 1.21 2006/10/08 19:17:28 mezz Exp $
+# $MCom: ports/devel/glade3/Makefile,v 1.29 2007/03/13 17:16:00 mezz Exp $
#
PORTNAME= glade3
-PORTVERSION= 3.0.3
+PORTVERSION= 3.2.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,28 +20,40 @@ INSTALLS_ICONS= yes
USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= gnometarget gtk20 libxml2 gnomeprefix gnomehack
+USE_GNOME= gnometarget gtk20 libxml2 gnomeprefix gnomehack \
+ gnomedocutils desktopfileutils
WANT_GNOME= yes
USE_GETTEXT= yes
+INSTALLS_OMF= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-DOCSDIR= share/doc/gladeui
+DOCSDIR= ${PREFIX}/share/doc/gladeui
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-IGNORE= does not build on 4.X
-.endif
-
.if ${HAVE_GNOME:Mlibgnomeui}!=""
USE_GNOME+= libgnomeui
CONFIGURE_ARGS+=--enable-gnome
-PKGNAMESUFFIX:= -gnome
+PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gnome
.else
CONFIGURE_ARGS+=--disable-gnome
.endif
+.if ${HAVE_GNOME:Mpygtk2}!=""
+USE_PYTHON= yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_GNOME+= pygtk2
+PLIST_SUB+= PYTHON:=""
+.else
+CONFIGURE_ARGS+=--disable-python
+PLIST_SUB+= PYTHON:="@comment "
+.endif
+
+post-install:
+ ${MKDIR} ${PREFIX}/lib/glade3/bindings
+ @-update-desktop-database
+
.include <bsd.port.post.mk>
diff --git a/devel/glade3/distinfo b/devel/glade3/distinfo
index 795b32c..8839fa7 100644
--- a/devel/glade3/distinfo
+++ b/devel/glade3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glade3-3.0.3.tar.bz2) = 1e965bbce1febdb6260a42467c0fd957
-SHA256 (gnome2/glade3-3.0.3.tar.bz2) = e31394ac998abde7dc1eb0951635430892e35bb82913e70d6d28c2d6b7c880e8
-SIZE (gnome2/glade3-3.0.3.tar.bz2) = 868366
+MD5 (gnome2/glade3-3.2.0.tar.bz2) = bee0aeb66b29ac40b24d9413aace15cc
+SHA256 (gnome2/glade3-3.2.0.tar.bz2) = 4ca06cc1ab8670858b0295fc126aa39f059a0b90f0c399022770ee0b522eb35e
+SIZE (gnome2/glade3-3.2.0.tar.bz2) = 1344693
diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist
index a4a2a82..e820565 100644
--- a/devel/glade3/pkg-plist
+++ b/devel/glade3/pkg-plist
@@ -1,51 +1,54 @@
bin/glade-3
-include/libgladeui-1.0/libgladeui/atk.xpm
-include/libgladeui-1.0/libgladeui/fixed_bg.xpm
-include/libgladeui-1.0/libgladeui/glade-accumulators.h
-include/libgladeui-1.0/libgladeui/glade-app.h
-include/libgladeui-1.0/libgladeui/glade-base-editor.h
-include/libgladeui-1.0/libgladeui/glade-builtins.h
-include/libgladeui-1.0/libgladeui/glade-catalog.h
-include/libgladeui-1.0/libgladeui/glade-clipboard-view.h
-include/libgladeui-1.0/libgladeui/glade-clipboard.h
-include/libgladeui-1.0/libgladeui/glade-command.h
-include/libgladeui-1.0/libgladeui/glade-cursor.h
-include/libgladeui-1.0/libgladeui/glade-custom.h
-include/libgladeui-1.0/libgladeui/glade-debug.h
-include/libgladeui-1.0/libgladeui/glade-editor-property.h
-include/libgladeui-1.0/libgladeui/glade-editor.h
-include/libgladeui-1.0/libgladeui/glade-fixed.h
-include/libgladeui-1.0/libgladeui/glade-gtk.h
-include/libgladeui-1.0/libgladeui/glade-id-allocator.h
-include/libgladeui-1.0/libgladeui/glade-marshallers.h
-include/libgladeui-1.0/libgladeui/glade-palette-box.h
-include/libgladeui-1.0/libgladeui/glade-palette-expander.h
-include/libgladeui-1.0/libgladeui/glade-palette-item.h
-include/libgladeui-1.0/libgladeui/glade-palette.h
-include/libgladeui-1.0/libgladeui/glade-parameter.h
-include/libgladeui-1.0/libgladeui/glade-parser.h
-include/libgladeui-1.0/libgladeui/glade-placeholder.h
-include/libgladeui-1.0/libgladeui/glade-popup.h
-include/libgladeui-1.0/libgladeui/glade-project-view.h
-include/libgladeui-1.0/libgladeui/glade-project.h
-include/libgladeui-1.0/libgladeui/glade-property-class.h
-include/libgladeui-1.0/libgladeui/glade-property.h
-include/libgladeui-1.0/libgladeui/glade-signal-editor.h
-include/libgladeui-1.0/libgladeui/glade-signal.h
-include/libgladeui-1.0/libgladeui/glade-utils.h
-include/libgladeui-1.0/libgladeui/glade-widget-class.h
-include/libgladeui-1.0/libgladeui/glade-widget.h
-include/libgladeui-1.0/libgladeui/glade-xml-utils.h
-include/libgladeui-1.0/libgladeui/glade.h
+include/libgladeui-1.0/gladeui/atk.xpm
+include/libgladeui-1.0/gladeui/fixed_bg.xpm
+include/libgladeui-1.0/gladeui/glade-accumulators.h
+include/libgladeui-1.0/gladeui/glade-app.h
+include/libgladeui-1.0/gladeui/glade-base-editor.h
+include/libgladeui-1.0/gladeui/glade-binding.h
+include/libgladeui-1.0/gladeui/glade-builtins.h
+include/libgladeui-1.0/gladeui/glade-catalog.h
+include/libgladeui-1.0/gladeui/glade-clipboard-view.h
+include/libgladeui-1.0/gladeui/glade-clipboard.h
+include/libgladeui-1.0/gladeui/glade-command.h
+include/libgladeui-1.0/gladeui/glade-cursor.h
+include/libgladeui-1.0/gladeui/glade-custom.h
+include/libgladeui-1.0/gladeui/glade-debug.h
+include/libgladeui-1.0/gladeui/glade-design-layout.h
+include/libgladeui-1.0/gladeui/glade-design-view.h
+include/libgladeui-1.0/gladeui/glade-editor-property.h
+include/libgladeui-1.0/gladeui/glade-editor.h
+include/libgladeui-1.0/gladeui/glade-fixed.h
+include/libgladeui-1.0/gladeui/glade-id-allocator.h
+include/libgladeui-1.0/gladeui/glade-marshallers.h
+include/libgladeui-1.0/gladeui/glade-palette-box.h
+include/libgladeui-1.0/gladeui/glade-palette-expander.h
+include/libgladeui-1.0/gladeui/glade-palette-item.h
+include/libgladeui-1.0/gladeui/glade-palette.h
+include/libgladeui-1.0/gladeui/glade-parameter.h
+include/libgladeui-1.0/gladeui/glade-parser.h
+include/libgladeui-1.0/gladeui/glade-placeholder.h
+include/libgladeui-1.0/gladeui/glade-popup.h
+include/libgladeui-1.0/gladeui/glade-project-view.h
+include/libgladeui-1.0/gladeui/glade-project.h
+include/libgladeui-1.0/gladeui/glade-property-class.h
+include/libgladeui-1.0/gladeui/glade-property.h
+include/libgladeui-1.0/gladeui/glade-signal-editor.h
+include/libgladeui-1.0/gladeui/glade-signal.h
+include/libgladeui-1.0/gladeui/glade-utils.h
+include/libgladeui-1.0/gladeui/glade-widget-adaptor.h
+include/libgladeui-1.0/gladeui/glade-widget.h
+include/libgladeui-1.0/gladeui/glade-xml-utils.h
+include/libgladeui-1.0/gladeui/glade.h
+%%PYTHON:%%lib/glade3/bindings/libgladepython.la
+%%PYTHON:%%lib/glade3/bindings/libgladepython.so
%%GNOME:%%lib/glade3/modules/libgladegnome.la
%%GNOME:%%lib/glade3/modules/libgladegnome.so
lib/glade3/modules/libgladegtk.la
lib/glade3/modules/libgladegtk.so
lib/libgladeui-1.la
lib/libgladeui-1.so
-lib/libgladeui-1.so.4
-libdata/pkgconfig/glade-3.pc
-libdata/pkgconfig/libgladeui-1.0.pc
+lib/libgladeui-1.so.5
+libdata/pkgconfig/gladeui-1.0.pc
%%DOCSDIR%%/GladeApp.html
%%DOCSDIR%%/GladeClipboard.html
%%DOCSDIR%%/GladeClipboardView.html
@@ -97,6 +100,7 @@ share/gnome/glade3/pixmaps/16x16/accellabel.png
share/gnome/glade3/pixmaps/16x16/alignment.png
share/gnome/glade3/pixmaps/16x16/arrow.png
share/gnome/glade3/pixmaps/16x16/aspectframe.png
+share/gnome/glade3/pixmaps/16x16/assistant.png
%%GNOME:%%share/gnome/glade3/pixmaps/16x16/bonobodock.png
%%GNOME:%%share/gnome/glade3/pixmaps/16x16/bonobodockitem.png
share/gnome/glade3/pixmaps/16x16/button.png
@@ -161,6 +165,7 @@ share/gnome/glade3/pixmaps/16x16/imagemenuitem.png
share/gnome/glade3/pixmaps/16x16/inputdialog.png
share/gnome/glade3/pixmaps/16x16/label.png
share/gnome/glade3/pixmaps/16x16/layout.png
+share/gnome/glade3/pixmaps/16x16/linkbutton.png
share/gnome/glade3/pixmaps/16x16/list.png
share/gnome/glade3/pixmaps/16x16/listitem.png
share/gnome/glade3/pixmaps/16x16/menu.png
@@ -170,10 +175,14 @@ share/gnome/glade3/pixmaps/16x16/menutoolbutton.png
share/gnome/glade3/pixmaps/16x16/messagedialog.png
share/gnome/glade3/pixmaps/16x16/notebook.png
share/gnome/glade3/pixmaps/16x16/optionmenu.png
+share/gnome/glade3/pixmaps/16x16/pagesetupdialog.png
+share/gnome/glade3/pixmaps/16x16/printdialog.png
share/gnome/glade3/pixmaps/16x16/progressbar.png
share/gnome/glade3/pixmaps/16x16/radiobutton.png
share/gnome/glade3/pixmaps/16x16/radiomenuitem.png
share/gnome/glade3/pixmaps/16x16/radiotoolbutton.png
+share/gnome/glade3/pixmaps/16x16/recentchooser.png
+share/gnome/glade3/pixmaps/16x16/recentchooserdialog.png
share/gnome/glade3/pixmaps/16x16/ruler.png
share/gnome/glade3/pixmaps/16x16/scrolledwindow.png
share/gnome/glade3/pixmaps/16x16/separatormenuitem.png
@@ -202,6 +211,7 @@ share/gnome/glade3/pixmaps/22x22/accellabel.png
share/gnome/glade3/pixmaps/22x22/alignment.png
share/gnome/glade3/pixmaps/22x22/arrow.png
share/gnome/glade3/pixmaps/22x22/aspectframe.png
+share/gnome/glade3/pixmaps/22x22/assistant.png
%%GNOME:%%share/gnome/glade3/pixmaps/22x22/bonobodock.png
%%GNOME:%%share/gnome/glade3/pixmaps/22x22/bonobodockitem.png
share/gnome/glade3/pixmaps/22x22/button.png
@@ -266,6 +276,7 @@ share/gnome/glade3/pixmaps/22x22/imagemenuitem.png
share/gnome/glade3/pixmaps/22x22/inputdialog.png
share/gnome/glade3/pixmaps/22x22/label.png
share/gnome/glade3/pixmaps/22x22/layout.png
+share/gnome/glade3/pixmaps/22x22/linkbutton.png
share/gnome/glade3/pixmaps/22x22/list.png
share/gnome/glade3/pixmaps/22x22/listitem.png
share/gnome/glade3/pixmaps/22x22/menu.png
@@ -275,10 +286,14 @@ share/gnome/glade3/pixmaps/22x22/menutoolbutton.png
share/gnome/glade3/pixmaps/22x22/messagedialog.png
share/gnome/glade3/pixmaps/22x22/notebook.png
share/gnome/glade3/pixmaps/22x22/optionmenu.png
+share/gnome/glade3/pixmaps/22x22/pagesetupdialog.png
+share/gnome/glade3/pixmaps/22x22/printdialog.png
share/gnome/glade3/pixmaps/22x22/progressbar.png
share/gnome/glade3/pixmaps/22x22/radiobutton.png
share/gnome/glade3/pixmaps/22x22/radiomenuitem.png
share/gnome/glade3/pixmaps/22x22/radiotoolbutton.png
+share/gnome/glade3/pixmaps/22x22/recentchooser.png
+share/gnome/glade3/pixmaps/22x22/recentchooserdialog.png
share/gnome/glade3/pixmaps/22x22/ruler.png
share/gnome/glade3/pixmaps/22x22/scrolledwindow.png
share/gnome/glade3/pixmaps/22x22/separatormenuitem.png
@@ -305,20 +320,51 @@ share/gnome/glade3/pixmaps/22x22/window.png
share/gnome/glade3/pixmaps/devhelp.png
share/gnome/glade3/pixmaps/plus.png
share/gnome/glade3/pixmaps/selector.png
+share/gnome/help/glade/C/figures/main-window.png
+share/gnome/help/glade/C/glade.xml
+share/gnome/help/glade/C/legal.xml
+share/gnome/help/glade/bg/figures/main-window.png
+share/gnome/help/glade/bg/glade.xml
+share/gnome/help/glade/bg/legal.xml
+share/gnome/help/glade/en_GB/figures/main-window.png
+share/gnome/help/glade/en_GB/glade.xml
+share/gnome/help/glade/en_GB/legal.xml
+share/gnome/help/glade/sv/figures/main-window.png
+share/gnome/help/glade/sv/glade.xml
+share/gnome/help/glade/sv/legal.xml
+share/gnome/omf/glade/glade-C.omf
+share/gnome/omf/glade/glade-bg.omf
+share/gnome/omf/glade/glade-en_GB.omf
+share/gnome/omf/glade/glade-sv.omf
+share/icons/hicolor/16x16/apps/glade-3.png
+share/icons/hicolor/22x22/apps/glade-3.png
+share/icons/hicolor/24x24/apps/glade-3.png
+share/icons/hicolor/32x32/apps/glade-3.png
share/icons/hicolor/48x48/apps/glade-3.png
+share/icons/hicolor/scalable/apps/glade-3.svg
share/locale/ar/LC_MESSAGES/glade3.mo
share/locale/az/LC_MESSAGES/glade3.mo
+share/locale/bg/LC_MESSAGES/glade3.mo
+share/locale/ca/LC_MESSAGES/glade3.mo
share/locale/da/LC_MESSAGES/glade3.mo
+share/locale/de/LC_MESSAGES/glade3.mo
+share/locale/el/LC_MESSAGES/glade3.mo
share/locale/en_CA/LC_MESSAGES/glade3.mo
share/locale/en_GB/LC_MESSAGES/glade3.mo
share/locale/es/LC_MESSAGES/glade3.mo
share/locale/fr/LC_MESSAGES/glade3.mo
share/locale/gl/LC_MESSAGES/glade3.mo
+share/locale/hu/LC_MESSAGES/glade3.mo
+share/locale/it/LC_MESSAGES/glade3.mo
share/locale/ja/LC_MESSAGES/glade3.mo
share/locale/ko/LC_MESSAGES/glade3.mo
+share/locale/lt/LC_MESSAGES/glade3.mo
+share/locale/mk/LC_MESSAGES/glade3.mo
+share/locale/ml/LC_MESSAGES/glade3.mo
share/locale/ms/LC_MESSAGES/glade3.mo
share/locale/nb/LC_MESSAGES/glade3.mo
share/locale/nn/LC_MESSAGES/glade3.mo
+share/locale/pa/LC_MESSAGES/glade3.mo
share/locale/pl/LC_MESSAGES/glade3.mo
share/locale/pt/LC_MESSAGES/glade3.mo
share/locale/pt_BR/LC_MESSAGES/glade3.mo
@@ -326,12 +372,23 @@ share/locale/ru/LC_MESSAGES/glade3.mo
share/locale/sk/LC_MESSAGES/glade3.mo
share/locale/sv/LC_MESSAGES/glade3.mo
share/locale/ta/LC_MESSAGES/glade3.mo
+share/locale/th/LC_MESSAGES/glade3.mo
share/locale/tr/LC_MESSAGES/glade3.mo
share/locale/uk/LC_MESSAGES/glade3.mo
share/locale/vi/LC_MESSAGES/glade3.mo
share/locale/zh_CN/LC_MESSAGES/glade3.mo
share/locale/zh_HK/LC_MESSAGES/glade3.mo
share/locale/zh_TW/LC_MESSAGES/glade3.mo
+@dirrm share/gnome/omf/glade
+@dirrm share/gnome/help/glade/sv/figures
+@dirrm share/gnome/help/glade/sv
+@dirrm share/gnome/help/glade/en_GB/figures
+@dirrm share/gnome/help/glade/en_GB
+@dirrm share/gnome/help/glade/bg/figures
+@dirrm share/gnome/help/glade/bg
+@dirrm share/gnome/help/glade/C/figures
+@dirrm share/gnome/help/glade/C
+@dirrm share/gnome/help/glade
@dirrm share/gnome/glade3/pixmaps/22x22
@dirrm share/gnome/glade3/pixmaps/16x16
@dirrm share/gnome/glade3/pixmaps
@@ -339,8 +396,9 @@ share/locale/zh_TW/LC_MESSAGES/glade3.mo
@dirrm share/gnome/glade3
@dirrm %%DOCSDIR%%
@dirrm lib/glade3/modules
+@dirrm lib/glade3/bindings
@dirrm lib/glade3
-@dirrm include/libgladeui-1.0/libgladeui
+@dirrm include/libgladeui-1.0/gladeui
@dirrm include/libgladeui-1.0
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@@ -364,3 +422,7 @@ share/locale/zh_TW/LC_MESSAGES/glade3.mo
@dirrmtry share/locale/ko
@dirrmtry share/locale/gl/LC_MESSAGES
@dirrmtry share/locale/gl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 3b72be6..7d47367 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glibmm/Makefile,v 1.37 2006/09/29 20:47:23 ahze Exp $
+# $MCom: ports/devel/glibmm/Makefile,v 1.39 2006/12/30 18:56:48 marcus Exp $
#
PORTNAME= glibmm
-PORTVERSION= 2.12.6
+PORTVERSION= 2.13.3
PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 579e350..da5f2da 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.12.6.tar.bz2) = e078ea7f710233e47e18e4cafbb61be5
-SHA256 (gnome2/glibmm-2.12.6.tar.bz2) = e231115fd032d7fb6da3332b2901abfcdde100f24f221aa386a076a952734347
-SIZE (gnome2/glibmm-2.12.6.tar.bz2) = 2339291
+MD5 (gnome2/glibmm-2.13.3.tar.bz2) = c4606b5e3d960d64c34580ca5119aec3
+SHA256 (gnome2/glibmm-2.13.3.tar.bz2) = bb2a621b92f4f0c1b1d314174a596e001e63694d71d154a00e1dfa6bd770f14d
+SIZE (gnome2/glibmm-2.13.3.tar.bz2) = 3980993
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index 324f5d4..1792798 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -16,6 +16,7 @@ include/glibmm-%%API_VERSION%%/glibmm/i18n.h
include/glibmm-%%API_VERSION%%/glibmm/init.h
include/glibmm-%%API_VERSION%%/glibmm/interface.h
include/glibmm-%%API_VERSION%%/glibmm/iochannel.h
+include/glibmm-%%API_VERSION%%/glibmm/keyfile.h
include/glibmm-%%API_VERSION%%/glibmm/listhandle.h
include/glibmm-%%API_VERSION%%/glibmm/main.h
include/glibmm-%%API_VERSION%%/glibmm/markup.h
@@ -32,6 +33,7 @@ include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/fileutils_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/interface_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/iochannel_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/keyfile_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/markup_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/module_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/object_p.h
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index b455719..45dad1c 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -3,23 +3,25 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/gnome-build/Makefile,v 1.1 2007/02/12 05:30:37 mezz Exp $
#
PORTNAME= gnome-build
-PORTVERSION= 0.1.3
+PORTVERSION= 0.1.5
PORTEPOCH= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.1
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A GNOME Build Framework (GBF)
-LIB_DEPENDS= gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
+LIB_DEPENDS= gdl-gnome-1.0:${PORTSDIR}/x11-toolkits/gdl
+USE_XLIB= yes
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui gnomevfs2
USE_GETTEXT= yes
GNU_CONFIGURE= yes
@@ -30,12 +32,4 @@ CONFIGURE_ARGS= --enable-compile-warnings=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lgnuregex"
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500000
-EXTRA_PATCHES+= ${FILESDIR}/current-src_backends_libgbf_am_gbf-am-project.c
-.elif ${ARCH} != "i386"
-EXTRA_PATCHES+= ${FILESDIR}/stable-src_backends_libgbf_am_gbf-am-project.c
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/gnome-build/distinfo b/devel/gnome-build/distinfo
index a76a636..9633dd9 100644
--- a/devel/gnome-build/distinfo
+++ b/devel/gnome-build/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-build-0.1.3.tar.bz2) = 7a879bfa906036c8546cea88eb6fe793
-SHA256 (gnome-build-0.1.3.tar.bz2) = 817d99a70f661b44186eac34d3cf8620df35f70373f0f24e7d677cb30073bb05
-SIZE (gnome-build-0.1.3.tar.bz2) = 444539
+MD5 (gnome2/gnome-build-0.1.5.tar.bz2) = 871521c7a78a2a0e6b684685e7925e8f
+SHA256 (gnome2/gnome-build-0.1.5.tar.bz2) = 5c329395da51353d5259fc64b5be9831afa5bbcecc5c28c1f7986368a316f50b
+SIZE (gnome2/gnome-build-0.1.5.tar.bz2) = 460191
diff --git a/devel/gnome-build/files/current-src_backends_libgbf_am_gbf-am-project.c b/devel/gnome-build/files/current-src_backends_libgbf_am_gbf-am-project.c
deleted file mode 100644
index 10ae4be..0000000
--- a/devel/gnome-build/files/current-src_backends_libgbf_am_gbf-am-project.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/backends/libgbf_am/gbf-am-project.c.orig Fri May 2 06:12:51 2003
-+++ src/backends/libgbf_am/gbf-am-project.c Sat Jan 31 13:22:04 2004
-@@ -1750,7 +1750,7 @@
-
- switch (status) {
- case G_IO_STATUS_NORMAL:
-- DEBUG (g_message ("wrote %d bytes", bytes_written));
-+ DEBUG (g_message ("wrote %zu bytes", bytes_written));
-
- if (data->input.length < data->input.size) {
- /* don't remove the source */
diff --git a/devel/gnome-build/files/stable-src_backends_libgbf_am_gbf-am-project.c b/devel/gnome-build/files/stable-src_backends_libgbf_am_gbf-am-project.c
deleted file mode 100644
index 262756b..0000000
--- a/devel/gnome-build/files/stable-src_backends_libgbf_am_gbf-am-project.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/backends/libgbf_am/gbf-am-project.c.orig Fri May 2 06:12:51 2003
-+++ src/backends/libgbf_am/gbf-am-project.c Sat Jan 31 13:22:04 2004
-@@ -1750,7 +1750,7 @@
-
- switch (status) {
- case G_IO_STATUS_NORMAL:
-- DEBUG (g_message ("wrote %d bytes", bytes_written));
-+ DEBUG (g_message ("wrote %lu bytes", bytes_written));
-
- if (data->input.length < data->input.size) {
- /* don't remove the source */
diff --git a/devel/gnome-build/pkg-plist b/devel/gnome-build/pkg-plist
index 74aae2e..535aec6 100644
--- a/devel/gnome-build/pkg-plist
+++ b/devel/gnome-build/pkg-plist
@@ -20,8 +20,8 @@ lib/gnome-build-1.0/backends/libgbf-mkfile.so.0
lib/libgbf-1.la
lib/libgbf-1.so
lib/libgbf-1.so.0
-lib/libgbf-widgets-1.so
lib/libgbf-widgets-1.la
+lib/libgbf-widgets-1.so
lib/libgbf-widgets-1.so.0
libdata/pkgconfig/gnome-build-1.0.pc
share/gnome/gnome-build/GBF/AmFiles.pm
@@ -76,3 +76,31 @@ share/locale/zh_CN/LC_MESSAGES/gbf-1.mo
@dirrm lib/gnome-build-1.0
@dirrm include/gnome-build-1.0/gbf
@dirrm include/gnome-build-1.0
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 868416c..b43a31a 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfs/Makefile,v 1.160 2006/10/07 15:04:44 marcus Exp $
+# $MCom: ports/devel/gnome-vfs/Makefile,v 1.167 2007/03/13 13:02:20 ahze Exp $
#
PORTNAME= gnome-vfs
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0.1
PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index d2ccd4a..86b8faf 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.16.3.tar.bz2) = 586d6fe3740385c000a864d5e2cf8215
-SHA256 (gnome2/gnome-vfs-2.16.3.tar.bz2) = 657df4d40dd1c8cbc9a266b9f38fea36019ef8a917eafcd3c38c840b8e9c7777
-SIZE (gnome2/gnome-vfs-2.16.3.tar.bz2) = 1900424
+MD5 (gnome2/gnome-vfs-2.18.0.1.tar.bz2) = 0b7a6ab495c0d94c3db00a7b0321adbf
+SHA256 (gnome2/gnome-vfs-2.18.0.1.tar.bz2) = 9e881e9f9ea4fb8d1d55c804b55829ac3b349b0b8a5c11e66dee44898acc3227
+SIZE (gnome2/gnome-vfs-2.18.0.1.tar.bz2) = 1830575
diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure
index 75ee29e..df7bc5e 100644
--- a/devel/gnome-vfs/files/patch-configure
+++ b/devel/gnome-vfs/files/patch-configure
@@ -1,6 +1,15 @@
---- configure.orig Tue Nov 7 04:08:31 2006
-+++ configure Mon Nov 20 10:52:37 2006
-@@ -21984,6 +21984,8 @@
+--- configure.orig Mon Feb 12 14:15:37 2007
++++ configure Mon Feb 12 14:15:37 2007
+@@ -5708,7 +5708,7 @@ fi
+
+
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+- inttypes.h stdint.h unistd.h
++ inttypes.h stdint.h unistd.h sys/sysmacros.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+@@ -22101,6 +22101,8 @@ echo $ECHO_N "checking for LC_MESSAGES..
if test "${am_cv_val_LC_MESSAGES+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9,7 +18,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22030,6 +22032,7 @@
+@@ -22147,6 +22149,7 @@ am_cv_val_LC_MESSAGES=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -17,7 +26,7 @@
fi
echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
-@@ -23495,6 +23498,7 @@
+@@ -23612,6 +23615,7 @@ if test `eval echo '${'$as_ac_var'}'` =
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -25,16 +34,7 @@
have_ngettext=yes
else
echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -24892,7 +24896,7 @@
-
-
-
--for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h
-+for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h sys/sysmacros.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -33245,7 +33249,7 @@
+@@ -33364,7 +33368,7 @@ if test "${openssl_libs+set}" = set; the
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -43,7 +43,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33543,7 +33547,7 @@
+@@ -33662,7 +33666,7 @@ if test "${openssl_libs+set}" = set; the
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -52,23 +52,3 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39124,6 +39128,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/statfs.h>
- #include <sys/fstyp.h>
- _ACEOF
-@@ -39165,6 +39172,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/statfs.h>
- #include <sys/vmount.h>
- _ACEOF
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c
deleted file mode 100644
index 1636ca9..0000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-hal-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
index 5260a0f..f50e1cb 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
@@ -1,15 +1,5 @@
--- libgnomevfs/gnome-vfs-hal-mounts.c.orig Mon Aug 7 04:16:27 2006
+++ libgnomevfs/gnome-vfs-hal-mounts.c Sun Sep 17 17:39:48 2006
-@@ -32,7 +32,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/stat.h>
-+#ifdef HAVE_SYS_SYSMACROS_H
- #include <sys/sysmacros.h>
-+#endif
- #include <sys/types.h>
- #include <unistd.h>
- #include <limits.h>
@@ -627,20 +629,30 @@ _hal_volume_policy_check (GnomeVFSVolume
"/",
"/bin",
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h
deleted file mode 100644
index 218578c..0000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- libgnomevfs/xdgmime.h.orig Sat Oct 7 10:42:32 2006
-+++ libgnomevfs/xdgmime.h Sat Oct 7 11:01:57 2006
-@@ -52,11 +52,14 @@ typedef void (*XdgMimeDestroy) (void *u
- #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name)
- #define xdg_mime_is_valid_mime_type XDG_ENTRY(is_valid_mime_type)
- #define xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal)
-+#define _xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal_p)
- #define xdg_mime_media_type_equal XDG_ENTRY(media_type_equal)
- #define xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass)
-+#define _xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass_p)
- #define xdg_mime_get_mime_parents XDG_ENTRY(get_mime_parents)
- #define xdg_mime_list_mime_parents XDG_ENTRY(list_mime_parents)
- #define xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type)
-+#define _xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type_p)
- #define xdg_mime_get_max_buffer_extents XDG_ENTRY(get_max_buffer_extents)
- #define xdg_mime_shutdown XDG_ENTRY(shutdown)
- #define xdg_mime_dump XDG_ENTRY(dump)
diff --git a/devel/gnome-vfs/files/patch-modules_file-method.c b/devel/gnome-vfs/files/patch-modules_file-method.c
deleted file mode 100644
index dbb2372..0000000
--- a/devel/gnome-vfs/files/patch-modules_file-method.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- modules/file-method.c.orig Sun May 22 23:30:16 2005
-+++ modules/file-method.c Sun May 22 23:31:08 2005
-@@ -66,6 +66,9 @@
- #if HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #elif HAVE_SYS_MOUNT_H
-+#if HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/mount.h>
- #endif
-
diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in
index d1783a4..f920c57 100644
--- a/devel/gnome-vfs/pkg-deinstall.in
+++ b/devel/gnome-vfs/pkg-deinstall.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.10 2006/07/22 20:45:37 mezz Exp $
+# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.12 2006/12/18 12:34:11 ahze Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in
index 98e90d3..ff583b7 100644
--- a/devel/gnome-vfs/pkg-install.in
+++ b/devel/gnome-vfs/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.10 2006/07/22 20:45:37 mezz Exp $
+# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.12 2006/12/18 12:34:11 ahze Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 6e36ede..dca70b7 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -145,6 +145,7 @@ 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/ku/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
share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -233,6 +234,8 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrmtry share/locale/mg
@dirrmtry share/locale/li/LC_MESSAGES
@dirrmtry share/locale/li
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrmtry share/locale/ko/LC_MESSAGES
@dirrmtry share/locale/ko
@dirrmtry share/locale/gl/LC_MESSAGES
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index eb378da..147bff6 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.21 2006/08/21 15:51:25 ahze Exp $
+# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.23 2007/03/10 05:33:01 marcus Exp $
#
PORTNAME= gnome-vfsmm
-PORTVERSION= 2.16.1
+PORTVERSION= 2.18.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo
index 1c72895..7c4b659 100644
--- a/devel/gnome-vfsmm/distinfo
+++ b/devel/gnome-vfsmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfsmm-2.16.1.tar.bz2) = 246ddae8dd588d250be2c3a8b13503b4
-SHA256 (gnome2/gnome-vfsmm-2.16.1.tar.bz2) = cb75886a34198acb1ba0810de5dee4bc293b0e3f029225fb8363fbcd2b995828
-SIZE (gnome2/gnome-vfsmm-2.16.1.tar.bz2) = 334863
+MD5 (gnome2/gnome-vfsmm-2.18.0.tar.bz2) = 1c5c0ef2ffcf52e682375fa11facebbf
+SHA256 (gnome2/gnome-vfsmm-2.18.0.tar.bz2) = fd9a083db7d631666df2872e5d3b0a236e3116f417ee5fc116d64e0082f363a6
+SIZE (gnome2/gnome-vfsmm-2.18.0.tar.bz2) = 345525
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 774b415..b4ddbf6 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -3,21 +3,23 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/goffice/Makefile,v 1.9 2006/01/31 22:13:22 ahze Exp $
+# $MCom: ports/devel/goffice/Makefile,v 1.23 2007/03/11 20:02:56 mezz Exp $
#
PORTNAME= goffice
-PORTVERSION= 0.2.2
+PORTVERSION= 0.3.7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
MAINTAINER= gnome@FreeBSD.org
COMMENT= GLib/GTK+ set of document centric objects and utilities
+LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
+
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
libgsf_gnome ltverhack
USE_GETTEXT= yes
diff --git a/devel/goffice/distinfo b/devel/goffice/distinfo
index 8b21943..f2f44de 100644
--- a/devel/goffice/distinfo
+++ b/devel/goffice/distinfo
@@ -1,3 +1,3 @@
-MD5 (goffice-0.2.2.tar.bz2) = a2bffd6eeb7609ea19936c8f6efb46fc
-SHA256 (goffice-0.2.2.tar.bz2) = a0bf823ef0ec03fee2e6ae74592b53dc7eadacfc9bfbf6e89db89b3e3ee8fc7d
-SIZE (goffice-0.2.2.tar.bz2) = 1422593
+MD5 (goffice-0.3.7.tar.bz2) = dc1e356e05abb5370b8cf3c13cc07fd6
+SHA256 (goffice-0.3.7.tar.bz2) = 3c659931d4c76b3e3f22312023ccae204aab5dd371d211dac5989c1c08dd391b
+SIZE (goffice-0.3.7.tar.bz2) = 1670170
diff --git a/devel/goffice/files/patch-plugins_plot_radar_gog-radar.c b/devel/goffice/files/patch-plugins_plot_radar_gog-radar.c
deleted file mode 100644
index 78df54b..0000000
--- a/devel/goffice/files/patch-plugins_plot_radar_gog-radar.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- plugins/plot_radar/gog-radar.c.orig Sat Dec 16 23:54:55 2006
-+++ plugins/plot_radar/gog-radar.c Sun Dec 17 00:05:35 2006
-@@ -386,12 +386,6 @@ GSF_DYNAMIC_CLASS (GogPolarPlot, gog_pol
- typedef GogPlotView GogRTView;
- typedef GogPlotViewClass GogRTViewClass;
-
--static double
--fmin (double a, double b)
--{
-- return (a < b) ? a : b;
--}
--
- static void
- gog_rt_view_render (GogView *view, GogViewAllocation const *bbox)
- {
diff --git a/devel/goffice/pkg-plist b/devel/goffice/pkg-plist
index c425c73..fef09a7 100644
--- a/devel/goffice/pkg-plist
+++ b/devel/goffice/pkg-plist
@@ -1,126 +1,137 @@
-include/libgoffice-1/goffice/app/error-info.h
-include/libgoffice-1/goffice/app/file.h
-include/libgoffice-1/goffice/app/go-cmd-context-impl.h
-include/libgoffice-1/goffice/app/go-cmd-context.h
-include/libgoffice-1/goffice/app/go-doc-control-impl.h
-include/libgoffice-1/goffice/app/go-doc-control.h
-include/libgoffice-1/goffice/app/go-doc-impl.h
-include/libgoffice-1/goffice/app/go-doc.h
-include/libgoffice-1/goffice/app/go-plugin-loader-module.h
-include/libgoffice-1/goffice/app/go-plugin-loader.h
-include/libgoffice-1/goffice/app/go-plugin-service-impl.h
-include/libgoffice-1/goffice/app/go-plugin-service.h
-include/libgoffice-1/goffice/app/go-plugin.h
-include/libgoffice-1/goffice/app/goffice-app.h
-include/libgoffice-1/goffice/app/io-context-priv.h
-include/libgoffice-1/goffice/app/io-context.h
-include/libgoffice-1/goffice/app/module-plugin-defs.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-line.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-text.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-util.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/libfoocanvas.h
-include/libgoffice-1/goffice/cut-n-paste/pcre/pcre.h
-include/libgoffice-1/goffice/data/go-data-impl.h
-include/libgoffice-1/goffice/data/go-data-simple.h
-include/libgoffice-1/goffice/data/go-data.h
-include/libgoffice-1/goffice/data/goffice-data.h
-include/libgoffice-1/goffice/drawing/god-anchor.h
-include/libgoffice-1/goffice/drawing/god-default-attributes.h
-include/libgoffice-1/goffice/drawing/god-drawing-group.h
-include/libgoffice-1/goffice/drawing/god-drawing-renderer-gdk.h
-include/libgoffice-1/goffice/drawing/god-drawing-view.h
-include/libgoffice-1/goffice/drawing/god-drawing.h
-include/libgoffice-1/goffice/drawing/god-image-store.h
-include/libgoffice-1/goffice/drawing/god-image.h
-include/libgoffice-1/goffice/drawing/god-paragraph-attributes.h
-include/libgoffice-1/goffice/drawing/god-property-table.h
-include/libgoffice-1/goffice/drawing/god-shape.h
-include/libgoffice-1/goffice/drawing/god-text-model.h
-include/libgoffice-1/goffice/goffice-features.h
-include/libgoffice-1/goffice/goffice.h
-include/libgoffice-1/goffice/graph/goffice-graph.h
-include/libgoffice-1/goffice/graph/gog-axis-line-impl.h
-include/libgoffice-1/goffice/graph/gog-axis-line.h
-include/libgoffice-1/goffice/graph/gog-axis.h
-include/libgoffice-1/goffice/graph/gog-chart-impl.h
-include/libgoffice-1/goffice/graph/gog-chart.h
-include/libgoffice-1/goffice/graph/gog-control-foocanvas.h
-include/libgoffice-1/goffice/graph/gog-data-allocator.h
-include/libgoffice-1/goffice/graph/gog-data-set.h
-include/libgoffice-1/goffice/graph/gog-error-bar.h
-include/libgoffice-1/goffice/graph/gog-graph-impl.h
-include/libgoffice-1/goffice/graph/gog-graph.h
-include/libgoffice-1/goffice/graph/gog-grid-line.h
-include/libgoffice-1/goffice/graph/gog-grid.h
-include/libgoffice-1/goffice/graph/gog-guru.h
-include/libgoffice-1/goffice/graph/gog-label.h
-include/libgoffice-1/goffice/graph/gog-legend.h
-include/libgoffice-1/goffice/graph/gog-object-xml.h
-include/libgoffice-1/goffice/graph/gog-object.h
-include/libgoffice-1/goffice/graph/gog-outlined-object.h
-include/libgoffice-1/goffice/graph/gog-plot-engine.h
-include/libgoffice-1/goffice/graph/gog-plot-impl.h
-include/libgoffice-1/goffice/graph/gog-plot.h
-include/libgoffice-1/goffice/graph/gog-reg-curve.h
-include/libgoffice-1/goffice/graph/gog-renderer-gnome-print.h
-include/libgoffice-1/goffice/graph/gog-renderer-impl.h
-include/libgoffice-1/goffice/graph/gog-renderer-pixbuf.h
-include/libgoffice-1/goffice/graph/gog-renderer-svg.h
-include/libgoffice-1/goffice/graph/gog-renderer.h
-include/libgoffice-1/goffice/graph/gog-series-impl.h
-include/libgoffice-1/goffice/graph/gog-series-lines.h
-include/libgoffice-1/goffice/graph/gog-series.h
-include/libgoffice-1/goffice/graph/gog-style.h
-include/libgoffice-1/goffice/graph/gog-styled-object.h
-include/libgoffice-1/goffice/graph/gog-theme.h
-include/libgoffice-1/goffice/graph/gog-view.h
-include/libgoffice-1/goffice/gtk/go-action-combo-color.h
-include/libgoffice-1/goffice/gtk/go-action-combo-pixmaps.h
-include/libgoffice-1/goffice/gtk/go-action-combo-stack.h
-include/libgoffice-1/goffice/gtk/go-action-combo-text.h
-include/libgoffice-1/goffice/gtk/go-charmap-sel.h
-include/libgoffice-1/goffice/gtk/go-color-group.h
-include/libgoffice-1/goffice/gtk/go-color-palette.h
-include/libgoffice-1/goffice/gtk/go-combo-box.h
-include/libgoffice-1/goffice/gtk/go-combo-color.h
-include/libgoffice-1/goffice/gtk/go-combo-pixmaps.h
-include/libgoffice-1/goffice/gtk/go-combo-text.h
-include/libgoffice-1/goffice/gtk/go-font-sel.h
-include/libgoffice-1/goffice/gtk/go-format-sel.h
-include/libgoffice-1/goffice/gtk/go-graph-widget.h
-include/libgoffice-1/goffice/gtk/go-locale-sel.h
-include/libgoffice-1/goffice/gtk/go-optionmenu.h
-include/libgoffice-1/goffice/gtk/go-rotation-sel.h
-include/libgoffice-1/goffice/gtk/goffice-gtk.h
-include/libgoffice-1/goffice/ms-compat/go-ms-parser.h
-include/libgoffice-1/goffice/ms-compat/god-drawing-ms-client-handler.h
-include/libgoffice-1/goffice/ms-compat/god-drawing-ms.h
-include/libgoffice-1/goffice/ms-compat/god-image-ms.h
-include/libgoffice-1/goffice/utils/datetime.h
-include/libgoffice-1/goffice/utils/format-impl.h
-include/libgoffice-1/goffice/utils/go-color.h
-include/libgoffice-1/goffice/utils/go-file.h
-include/libgoffice-1/goffice/utils/go-font.h
-include/libgoffice-1/goffice/utils/go-format-match.h
-include/libgoffice-1/goffice/utils/go-format.h
-include/libgoffice-1/goffice/utils/go-geometry.h
-include/libgoffice-1/goffice/utils/go-glib-extras.h
-include/libgoffice-1/goffice/utils/go-gradient.h
-include/libgoffice-1/goffice/utils/go-libxml-extras.h
-include/libgoffice-1/goffice/utils/go-line.h
-include/libgoffice-1/goffice/utils/go-marker.h
-include/libgoffice-1/goffice/utils/go-math.h
-include/libgoffice-1/goffice/utils/go-pattern.h
-include/libgoffice-1/goffice/utils/go-rangefunc.h
-include/libgoffice-1/goffice/utils/go-regression.h
-include/libgoffice-1/goffice/utils/go-units.h
-include/libgoffice-1/goffice/utils/goffice-utils.h
-include/libgoffice-1/goffice/utils/regutf8.h
+include/libgoffice-0.3/goffice/app/error-info.h
+include/libgoffice-0.3/goffice/app/file.h
+include/libgoffice-0.3/goffice/app/go-cmd-context-impl.h
+include/libgoffice-0.3/goffice/app/go-cmd-context.h
+include/libgoffice-0.3/goffice/app/go-doc-control-impl.h
+include/libgoffice-0.3/goffice/app/go-doc-control.h
+include/libgoffice-0.3/goffice/app/go-doc-impl.h
+include/libgoffice-0.3/goffice/app/go-doc.h
+include/libgoffice-0.3/goffice/app/go-plugin-loader-module.h
+include/libgoffice-0.3/goffice/app/go-plugin-loader.h
+include/libgoffice-0.3/goffice/app/go-plugin-service-impl.h
+include/libgoffice-0.3/goffice/app/go-plugin-service.h
+include/libgoffice-0.3/goffice/app/go-plugin.h
+include/libgoffice-0.3/goffice/app/goffice-app.h
+include/libgoffice-0.3/goffice/app/io-context-priv.h
+include/libgoffice-0.3/goffice/app/io-context.h
+include/libgoffice-0.3/goffice/app/module-plugin-defs.h
+include/libgoffice-0.3/goffice/component/go-component-factory.h
+include/libgoffice-0.3/goffice/component/go-component.h
+include/libgoffice-0.3/goffice/component/goffice-component.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-line.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-text.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-util.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/libfoocanvas.h
+include/libgoffice-0.3/goffice/data/go-data-impl.h
+include/libgoffice-0.3/goffice/data/go-data-simple.h
+include/libgoffice-0.3/goffice/data/go-data.h
+include/libgoffice-0.3/goffice/data/goffice-data.h
+include/libgoffice-0.3/goffice/drawing/god-anchor.h
+include/libgoffice-0.3/goffice/drawing/god-default-attributes.h
+include/libgoffice-0.3/goffice/drawing/god-drawing-group.h
+include/libgoffice-0.3/goffice/drawing/god-drawing-renderer-gdk.h
+include/libgoffice-0.3/goffice/drawing/god-drawing-view.h
+include/libgoffice-0.3/goffice/drawing/god-drawing.h
+include/libgoffice-0.3/goffice/drawing/god-image-store.h
+include/libgoffice-0.3/goffice/drawing/god-image.h
+include/libgoffice-0.3/goffice/drawing/god-paragraph-attributes.h
+include/libgoffice-0.3/goffice/drawing/god-property-table.h
+include/libgoffice-0.3/goffice/drawing/god-shape.h
+include/libgoffice-0.3/goffice/drawing/god-text-model.h
+include/libgoffice-0.3/goffice/goffice-features.h
+include/libgoffice-0.3/goffice/goffice.h
+include/libgoffice-0.3/goffice/graph/goffice-graph.h
+include/libgoffice-0.3/goffice/graph/gog-axis-line-impl.h
+include/libgoffice-0.3/goffice/graph/gog-axis-line.h
+include/libgoffice-0.3/goffice/graph/gog-axis.h
+include/libgoffice-0.3/goffice/graph/gog-chart-impl.h
+include/libgoffice-0.3/goffice/graph/gog-chart.h
+include/libgoffice-0.3/goffice/graph/gog-control-foocanvas.h
+include/libgoffice-0.3/goffice/graph/gog-data-allocator.h
+include/libgoffice-0.3/goffice/graph/gog-data-set.h
+include/libgoffice-0.3/goffice/graph/gog-error-bar.h
+include/libgoffice-0.3/goffice/graph/gog-graph-impl.h
+include/libgoffice-0.3/goffice/graph/gog-graph.h
+include/libgoffice-0.3/goffice/graph/gog-grid-line.h
+include/libgoffice-0.3/goffice/graph/gog-grid.h
+include/libgoffice-0.3/goffice/graph/gog-guru.h
+include/libgoffice-0.3/goffice/graph/gog-label.h
+include/libgoffice-0.3/goffice/graph/gog-legend.h
+include/libgoffice-0.3/goffice/graph/gog-object-xml.h
+include/libgoffice-0.3/goffice/graph/gog-object.h
+include/libgoffice-0.3/goffice/graph/gog-outlined-object.h
+include/libgoffice-0.3/goffice/graph/gog-plot-engine.h
+include/libgoffice-0.3/goffice/graph/gog-plot-impl.h
+include/libgoffice-0.3/goffice/graph/gog-plot.h
+include/libgoffice-0.3/goffice/graph/gog-reg-curve.h
+include/libgoffice-0.3/goffice/graph/gog-renderer-cairo.h
+include/libgoffice-0.3/goffice/graph/gog-renderer-gnome-print.h
+include/libgoffice-0.3/goffice/graph/gog-renderer-impl.h
+include/libgoffice-0.3/goffice/graph/gog-renderer.h
+include/libgoffice-0.3/goffice/graph/gog-series-impl.h
+include/libgoffice-0.3/goffice/graph/gog-series-lines.h
+include/libgoffice-0.3/goffice/graph/gog-series.h
+include/libgoffice-0.3/goffice/graph/gog-smoothed-curve.h
+include/libgoffice-0.3/goffice/graph/gog-style.h
+include/libgoffice-0.3/goffice/graph/gog-styled-object.h
+include/libgoffice-0.3/goffice/graph/gog-theme.h
+include/libgoffice-0.3/goffice/graph/gog-trend-line.h
+include/libgoffice-0.3/goffice/graph/gog-view.h
+include/libgoffice-0.3/goffice/gtk/go-action-combo-color.h
+include/libgoffice-0.3/goffice/gtk/go-action-combo-pixmaps.h
+include/libgoffice-0.3/goffice/gtk/go-action-combo-stack.h
+include/libgoffice-0.3/goffice/gtk/go-action-combo-text.h
+include/libgoffice-0.3/goffice/gtk/go-charmap-sel.h
+include/libgoffice-0.3/goffice/gtk/go-color-group.h
+include/libgoffice-0.3/goffice/gtk/go-color-palette.h
+include/libgoffice-0.3/goffice/gtk/go-color-selector.h
+include/libgoffice-0.3/goffice/gtk/go-combo-box.h
+include/libgoffice-0.3/goffice/gtk/go-combo-color.h
+include/libgoffice-0.3/goffice/gtk/go-combo-pixmaps.h
+include/libgoffice-0.3/goffice/gtk/go-combo-text.h
+include/libgoffice-0.3/goffice/gtk/go-font-sel.h
+include/libgoffice-0.3/goffice/gtk/go-format-sel.h
+include/libgoffice-0.3/goffice/gtk/go-gradient-selector.h
+include/libgoffice-0.3/goffice/gtk/go-graph-widget.h
+include/libgoffice-0.3/goffice/gtk/go-line-selector.h
+include/libgoffice-0.3/goffice/gtk/go-locale-sel.h
+include/libgoffice-0.3/goffice/gtk/go-marker-selector.h
+include/libgoffice-0.3/goffice/gtk/go-optionmenu.h
+include/libgoffice-0.3/goffice/gtk/go-palette.h
+include/libgoffice-0.3/goffice/gtk/go-pattern-selector.h
+include/libgoffice-0.3/goffice/gtk/go-rotation-sel.h
+include/libgoffice-0.3/goffice/gtk/go-selector.h
+include/libgoffice-0.3/goffice/gtk/goffice-gtk.h
+include/libgoffice-0.3/goffice/ms-compat/go-ms-parser.h
+include/libgoffice-0.3/goffice/ms-compat/god-drawing-ms-client-handler.h
+include/libgoffice-0.3/goffice/ms-compat/god-drawing-ms.h
+include/libgoffice-0.3/goffice/ms-compat/god-image-ms.h
+include/libgoffice-0.3/goffice/utils/datetime.h
+include/libgoffice-0.3/goffice/utils/go-color.h
+include/libgoffice-0.3/goffice/utils/go-file.h
+include/libgoffice-0.3/goffice/utils/go-font.h
+include/libgoffice-0.3/goffice/utils/go-format.h
+include/libgoffice-0.3/goffice/utils/go-geometry.h
+include/libgoffice-0.3/goffice/utils/go-glib-extras.h
+include/libgoffice-0.3/goffice/utils/go-gradient.h
+include/libgoffice-0.3/goffice/utils/go-image.h
+include/libgoffice-0.3/goffice/utils/go-libxml-extras.h
+include/libgoffice-0.3/goffice/utils/go-line.h
+include/libgoffice-0.3/goffice/utils/go-locale.h
+include/libgoffice-0.3/goffice/utils/go-marker.h
+include/libgoffice-0.3/goffice/utils/go-math.h
+include/libgoffice-0.3/goffice/utils/go-pattern.h
+include/libgoffice-0.3/goffice/utils/go-rangefunc.h
+include/libgoffice-0.3/goffice/utils/go-regression.h
+include/libgoffice-0.3/goffice/utils/go-undo.h
+include/libgoffice-0.3/goffice/utils/go-units.h
+include/libgoffice-0.3/goffice/utils/goffice-utils.h
+include/libgoffice-0.3/goffice/utils/regutf8.h
lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.a
lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.la
lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.so
@@ -154,6 +165,8 @@ lib/goffice/%%VERSION%%/plugins/plot_surface/surface.a
lib/goffice/%%VERSION%%/plugins/plot_surface/surface.la
lib/goffice/%%VERSION%%/plugins/plot_surface/surface.so
lib/goffice/%%VERSION%%/plugins/plot_xy/gog-bubble-prefs.glade
+lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-color-prefs.glade
+lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-series-prefs.glade
lib/goffice/%%VERSION%%/plugins/plot_xy/plot-types.xml
lib/goffice/%%VERSION%%/plugins/plot_xy/plugin.xml
lib/goffice/%%VERSION%%/plugins/plot_xy/xy.a
@@ -169,172 +182,319 @@ lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.la
lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.so
lib/goffice/%%VERSION%%/plugins/reg_logfit/plugin.xml
lib/goffice/%%VERSION%%/plugins/reg_logfit/reg-types.xml
-lib/libgoffice-1.a
-lib/libgoffice-1.la
-lib/libgoffice-1.so
-lib/libgoffice-1.so.2
-libdata/pkgconfig/libgoffice-1.pc
+lib/goffice/%%VERSION%%/plugins/smoothing/gog-exp-smooth.glade
+lib/goffice/%%VERSION%%/plugins/smoothing/gog-moving-avg.glade
+lib/goffice/%%VERSION%%/plugins/smoothing/plugin.xml
+lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.a
+lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.la
+lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so
+lib/goffice/%%VERSION%%/plugins/smoothing/types.xml
+lib/libgoffice-0.a
+lib/libgoffice-0.la
+lib/libgoffice-0.so
+lib/libgoffice-0.so.3
+libdata/pkgconfig/libgoffice-0.3.pc
+%%DOCSDIR%%/GOData.html
+%%DOCSDIR%%/GODataMatrix.html
+%%DOCSDIR%%/GODataScalar.html
+%%DOCSDIR%%/GODataVector.html
+%%DOCSDIR%%/GogAxis.html
+%%DOCSDIR%%/GogAxisLine.html
+%%DOCSDIR%%/GogChart.html
+%%DOCSDIR%%/GogDataAllocator.html
+%%DOCSDIR%%/GogDataset.html
+%%DOCSDIR%%/GogErrorBar.html
+%%DOCSDIR%%/GogGraph.html
+%%DOCSDIR%%/GogGrid.html
+%%DOCSDIR%%/GogGridLine.html
+%%DOCSDIR%%/GogLabel.html
+%%DOCSDIR%%/GogLegend.html
+%%DOCSDIR%%/GogObject.html
+%%DOCSDIR%%/GogOutlinedObject.html
+%%DOCSDIR%%/GogPersist.html
+%%DOCSDIR%%/GogPlot.html
+%%DOCSDIR%%/GogRegCurve.html
+%%DOCSDIR%%/GogRegEqn.html
+%%DOCSDIR%%/GogRenderer.html
+%%DOCSDIR%%/GogSeries.html
+%%DOCSDIR%%/GogSeriesLines.html
+%%DOCSDIR%%/GogStyle.html
+%%DOCSDIR%%/GogStyledObject.html
+%%DOCSDIR%%/GogView.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/ch05.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/ch07.html
+%%DOCSDIR%%/ch08.html
+%%DOCSDIR%%/ch09.html
+%%DOCSDIR%%/ch10.html
+%%DOCSDIR%%/ch11.html
+%%DOCSDIR%%/goffice-GOComboBox.html
+%%DOCSDIR%%/goffice-GOComboColor.html
+%%DOCSDIR%%/goffice-GOComponent.html
+%%DOCSDIR%%/goffice-GODoc.html
+%%DOCSDIR%%/goffice-GODocControl.html
+%%DOCSDIR%%/goffice-GOPluginLoader.html
+%%DOCSDIR%%/goffice-GOPluginService.html
+%%DOCSDIR%%/goffice-GOService.html
+%%DOCSDIR%%/goffice-GoApp.html
+%%DOCSDIR%%/goffice-GoCharmapSel.html
+%%DOCSDIR%%/goffice-GoCmdContext.html
+%%DOCSDIR%%/goffice-GoColor.html
+%%DOCSDIR%%/goffice-GoComboPixmaps.html
+%%DOCSDIR%%/goffice-GoComboText.html
+%%DOCSDIR%%/goffice-GoComponentFactory.html
+%%DOCSDIR%%/goffice-GoFontSel.html
+%%DOCSDIR%%/goffice-GoFormatSel.html
+%%DOCSDIR%%/goffice-GoGeometry.html
+%%DOCSDIR%%/goffice-GoGlibExtras.html
+%%DOCSDIR%%/goffice-GoLibxmlExtras.html
+%%DOCSDIR%%/goffice-GoLocaleSel.html
+%%DOCSDIR%%/goffice-GoObject.html
+%%DOCSDIR%%/goffice-GoOptionMenu.html
+%%DOCSDIR%%/goffice-GoPluginLoaderModule.html
+%%DOCSDIR%%/goffice-GoRotationSel.html
+%%DOCSDIR%%/goffice-GoSearchReplace.html
+%%DOCSDIR%%/goffice-GogAxisMap.html
+%%DOCSDIR%%/goffice-GogChartMap.html
+%%DOCSDIR%%/goffice-GogControlFooCanvas.html
+%%DOCSDIR%%/goffice-GogEditor.html
+%%DOCSDIR%%/goffice-GogGuru.html
+%%DOCSDIR%%/goffice-GogPlotEngine.html
+%%DOCSDIR%%/goffice-GogTool.html
+%%DOCSDIR%%/goffice-Math.html
+%%DOCSDIR%%/goffice-Ranges.html
+%%DOCSDIR%%/goffice-RegUTF8.html
+%%DOCSDIR%%/goffice-Regressions.html
+%%DOCSDIR%%/goffice-Units.html
+%%DOCSDIR%%/goffice-go-format.html
+%%DOCSDIR%%/goffice-go-gradient.html
+%%DOCSDIR%%/goffice-go-line.html
+%%DOCSDIR%%/goffice-go-marker.html
+%%DOCSDIR%%/goffice-go-pattern.html
+%%DOCSDIR%%/goffice-go-plugin.html
+%%DOCSDIR%%/goffice-gog-theme.html
+%%DOCSDIR%%/goffice.devhelp
+%%DOCSDIR%%/goffice.devhelp2
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/pt01.html
+%%DOCSDIR%%/pt02.html
+%%DOCSDIR%%/pt03.html
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
share/gnome/goffice/%%VERSION%%/glade/go-font-sel.glade
share/gnome/goffice/%%VERSION%%/glade/go-format-sel.glade
+share/gnome/goffice/%%VERSION%%/glade/go-image-save-dialog-extra.glade
share/gnome/goffice/%%VERSION%%/glade/go-rotation-sel.glade
share/gnome/goffice/%%VERSION%%/glade/gog-axis-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-chart-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-error-bar-prefs.glade
+share/gnome/goffice/%%VERSION%%/glade/gog-graph-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-guru-type-selector.glade
share/gnome/goffice/%%VERSION%%/glade/gog-guru.glade
share/gnome/goffice/%%VERSION%%/glade/gog-object-prefs.glade
+share/gnome/goffice/%%VERSION%%/glade/gog-plot-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-reg-curve-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-style-prefs.glade
share/gnome/goffice/%%VERSION%%/patterns/svg-patterns.xml
-share/gnome/pixmaps/goffice/area.xpm
-share/gnome/pixmaps/goffice/bar-hboth.png
-share/gnome/pixmaps/goffice/bar-hminus.png
-share/gnome/pixmaps/goffice/bar-hplus.png
-share/gnome/pixmaps/goffice/bar-none.png
-share/gnome/pixmaps/goffice/bar-vboth.png
-share/gnome/pixmaps/goffice/bar-vminus.png
-share/gnome/pixmaps/goffice/bar-vplus.png
-share/gnome/pixmaps/goffice/bar.xpm
-share/gnome/pixmaps/goffice/boxplot.xpm
-share/gnome/pixmaps/goffice/bubble.xpm
-share/gnome/pixmaps/goffice/chart_area_1_1.png
-share/gnome/pixmaps/goffice/chart_area_1_2.png
-share/gnome/pixmaps/goffice/chart_area_1_3.png
-share/gnome/pixmaps/goffice/chart_bar_1_1.png
-share/gnome/pixmaps/goffice/chart_bar_1_2.png
-share/gnome/pixmaps/goffice/chart_bar_1_3.png
-share/gnome/pixmaps/goffice/chart_bar_2_1.png
-share/gnome/pixmaps/goffice/chart_bar_2_2.png
-share/gnome/pixmaps/goffice/chart_bar_2_3.png
-share/gnome/pixmaps/goffice/chart_boxplot_1_1.png
-share/gnome/pixmaps/goffice/chart_bubble_1_1.png
-share/gnome/pixmaps/goffice/chart_column_1_1.png
-share/gnome/pixmaps/goffice/chart_column_1_2.png
-share/gnome/pixmaps/goffice/chart_column_1_3.png
-share/gnome/pixmaps/goffice/chart_column_2_1.png
-share/gnome/pixmaps/goffice/chart_column_2_2.png
-share/gnome/pixmaps/goffice/chart_column_2_3.png
-share/gnome/pixmaps/goffice/chart_column_3_1.png
-share/gnome/pixmaps/goffice/chart_cone_1_1.png
-share/gnome/pixmaps/goffice/chart_cone_1_2.png
-share/gnome/pixmaps/goffice/chart_cone_1_3.png
-share/gnome/pixmaps/goffice/chart_cone_2_1.png
-share/gnome/pixmaps/goffice/chart_cone_2_2.png
-share/gnome/pixmaps/goffice/chart_cone_2_3.png
-share/gnome/pixmaps/goffice/chart_cone_3_1.png
-share/gnome/pixmaps/goffice/chart_contour_1_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_2.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_3.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_2.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_3.png
-share/gnome/pixmaps/goffice/chart_cylinder_3_1.png
-share/gnome/pixmaps/goffice/chart_dropbar_1_1.png
-share/gnome/pixmaps/goffice/chart_dropbar_1_2.png
-share/gnome/pixmaps/goffice/chart_line_1_1.png
-share/gnome/pixmaps/goffice/chart_line_1_2.png
-share/gnome/pixmaps/goffice/chart_line_1_3.png
-share/gnome/pixmaps/goffice/chart_line_2_1.png
-share/gnome/pixmaps/goffice/chart_line_2_2.png
-share/gnome/pixmaps/goffice/chart_line_2_3.png
-share/gnome/pixmaps/goffice/chart_line_3_1.png
-share/gnome/pixmaps/goffice/chart_minmax_1_1.png
-share/gnome/pixmaps/goffice/chart_minmax_1_2.png
-share/gnome/pixmaps/goffice/chart_minmax_2_1.png
-share/gnome/pixmaps/goffice/chart_minmax_2_2.png
-share/gnome/pixmaps/goffice/chart_pie_1_1.png
-share/gnome/pixmaps/goffice/chart_pie_1_2.png
-share/gnome/pixmaps/goffice/chart_pie_1_3.png
-share/gnome/pixmaps/goffice/chart_pie_2_1.png
-share/gnome/pixmaps/goffice/chart_pie_2_2.png
-share/gnome/pixmaps/goffice/chart_pie_2_3.png
-share/gnome/pixmaps/goffice/chart_polar_1_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_2.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_3.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_2.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_3.png
-share/gnome/pixmaps/goffice/chart_pyramid_3_1.png
-share/gnome/pixmaps/goffice/chart_radar_1_1.png
-share/gnome/pixmaps/goffice/chart_radar_1_2.png
-share/gnome/pixmaps/goffice/chart_radar_1_3.png
-share/gnome/pixmaps/goffice/chart_ring_1_1.png
-share/gnome/pixmaps/goffice/chart_ring_1_2.png
-share/gnome/pixmaps/goffice/chart_scatter_1_1.png
-share/gnome/pixmaps/goffice/chart_scatter_2_1.png
-share/gnome/pixmaps/goffice/chart_scatter_2_2.png
-share/gnome/pixmaps/goffice/chart_scatter_3_1.png
-share/gnome/pixmaps/goffice/chart_scatter_3_2.png
-share/gnome/pixmaps/goffice/chart_scatter_3_3.png
-share/gnome/pixmaps/goffice/chart_stock_1_1.png
-share/gnome/pixmaps/goffice/chart_stock_1_2.png
-share/gnome/pixmaps/goffice/chart_stock_2_1.png
-share/gnome/pixmaps/goffice/chart_stock_2_2.png
-share/gnome/pixmaps/goffice/column.xpm
-share/gnome/pixmaps/goffice/doughnut.xpm
-share/gnome/pixmaps/goffice/dropbar.xpm
-share/gnome/pixmaps/goffice/linegraph.xpm
-share/gnome/pixmaps/goffice/minmax.xpm
-share/gnome/pixmaps/goffice/pie.xpm
-share/gnome/pixmaps/goffice/polar.png
-share/gnome/pixmaps/goffice/radar.xpm
-share/gnome/pixmaps/goffice/scatter.xpm
-share/gnome/pixmaps/goffice/stock.xpm
-share/gnome/pixmaps/goffice/surface.xpm
-share/locale/am/LC_MESSAGES/goffice.mo
-share/locale/az/LC_MESSAGES/goffice.mo
-share/locale/bg/LC_MESSAGES/goffice.mo
-share/locale/ca/LC_MESSAGES/goffice.mo
-share/locale/cs/LC_MESSAGES/goffice.mo
-share/locale/da/LC_MESSAGES/goffice.mo
-share/locale/de/LC_MESSAGES/goffice.mo
-share/locale/el/LC_MESSAGES/goffice.mo
-share/locale/en_CA/LC_MESSAGES/goffice.mo
-share/locale/en_GB/LC_MESSAGES/goffice.mo
-share/locale/es/LC_MESSAGES/goffice.mo
-share/locale/et/LC_MESSAGES/goffice.mo
-share/locale/fi/LC_MESSAGES/goffice.mo
-share/locale/fr/LC_MESSAGES/goffice.mo
-share/locale/ga/LC_MESSAGES/goffice.mo
-share/locale/gl/LC_MESSAGES/goffice.mo
-share/locale/he/LC_MESSAGES/goffice.mo
-share/locale/hr/LC_MESSAGES/goffice.mo
-share/locale/hu/LC_MESSAGES/goffice.mo
-share/locale/it/LC_MESSAGES/goffice.mo
-share/locale/ja/LC_MESSAGES/goffice.mo
-share/locale/ko/LC_MESSAGES/goffice.mo
-share/locale/lv/LC_MESSAGES/goffice.mo
-share/locale/ml/LC_MESSAGES/goffice.mo
-share/locale/mr/LC_MESSAGES/goffice.mo
-share/locale/ms/LC_MESSAGES/goffice.mo
-share/locale/nb/LC_MESSAGES/goffice.mo
-share/locale/nl/LC_MESSAGES/goffice.mo
-share/locale/nn/LC_MESSAGES/goffice.mo
-share/locale/no/LC_MESSAGES/goffice.mo
-share/locale/pl/LC_MESSAGES/goffice.mo
-share/locale/pt/LC_MESSAGES/goffice.mo
-share/locale/pt_BR/LC_MESSAGES/goffice.mo
-share/locale/ro/LC_MESSAGES/goffice.mo
-share/locale/ru/LC_MESSAGES/goffice.mo
-share/locale/sk/LC_MESSAGES/goffice.mo
-share/locale/sr/LC_MESSAGES/goffice.mo
-share/locale/sr@Latn/LC_MESSAGES/goffice.mo
-share/locale/sv/LC_MESSAGES/goffice.mo
-share/locale/tr/LC_MESSAGES/goffice.mo
-share/locale/uk/LC_MESSAGES/goffice.mo
-share/locale/vi/LC_MESSAGES/goffice.mo
-share/locale/zh_CN/LC_MESSAGES/goffice.mo
-share/locale/zh_TW/LC_MESSAGES/goffice.mo
+share/gnome/pixmaps/goffice/%%VERSION%%/area.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-hboth.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-hminus.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-hplus.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-none.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-vboth.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-vminus.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-vplus.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/boxplot.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/bubble.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/color.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/column.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/doughnut.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/dropbar.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/hist.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/linegraph.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/minmax.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/pie.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/polar.png
+share/gnome/pixmaps/goffice/%%VERSION%%/radar.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/scatter.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/stock.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/surface.xpm
+share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ca/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/et/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/he/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/hr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/lv/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrm share/gnome/pixmaps/goffice/%%VERSION%%
@dirrm share/gnome/pixmaps/goffice
@dirrm share/gnome/goffice/%%VERSION%%/patterns
@dirrm share/gnome/goffice/%%VERSION%%/glade
@dirrm share/gnome/goffice/%%VERSION%%
@dirrm share/gnome/goffice
+@dirrm %%DOCSDIR%%
+@dirrm lib/goffice/%%VERSION%%/plugins/smoothing
@dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit
@dirrm lib/goffice/%%VERSION%%/plugins/reg_linear
@dirrm lib/goffice/%%VERSION%%/plugins/plot_xy
@@ -346,15 +506,15 @@ share/locale/zh_TW/LC_MESSAGES/goffice.mo
@dirrm lib/goffice/%%VERSION%%/plugins
@dirrm lib/goffice/%%VERSION%%
@dirrm lib/goffice
-@dirrm include/libgoffice-1/goffice/utils
-@dirrm include/libgoffice-1/goffice/ms-compat
-@dirrm include/libgoffice-1/goffice/gtk
-@dirrm include/libgoffice-1/goffice/graph
-@dirrm include/libgoffice-1/goffice/drawing
-@dirrm include/libgoffice-1/goffice/data
-@dirrm include/libgoffice-1/goffice/cut-n-paste/pcre
-@dirrm include/libgoffice-1/goffice/cut-n-paste/foocanvas
-@dirrm include/libgoffice-1/goffice/cut-n-paste
-@dirrm include/libgoffice-1/goffice/app
-@dirrm include/libgoffice-1/goffice
-@dirrm include/libgoffice-1
+@dirrm include/libgoffice-0.3/goffice/utils
+@dirrm include/libgoffice-0.3/goffice/ms-compat
+@dirrm include/libgoffice-0.3/goffice/gtk
+@dirrm include/libgoffice-0.3/goffice/graph
+@dirrm include/libgoffice-0.3/goffice/drawing
+@dirrm include/libgoffice-0.3/goffice/data
+@dirrm include/libgoffice-0.3/goffice/cut-n-paste/foocanvas
+@dirrm include/libgoffice-0.3/goffice/cut-n-paste
+@dirrm include/libgoffice-0.3/goffice/component
+@dirrm include/libgoffice-0.3/goffice/app
+@dirrm include/libgoffice-0.3/goffice
+@dirrm include/libgoffice-0.3
diff --git a/devel/goffice04/Makefile b/devel/goffice04/Makefile
index 774b415..b4ddbf6 100644
--- a/devel/goffice04/Makefile
+++ b/devel/goffice04/Makefile
@@ -3,21 +3,23 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/goffice/Makefile,v 1.9 2006/01/31 22:13:22 ahze Exp $
+# $MCom: ports/devel/goffice/Makefile,v 1.23 2007/03/11 20:02:56 mezz Exp $
#
PORTNAME= goffice
-PORTVERSION= 0.2.2
+PORTVERSION= 0.3.7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
MAINTAINER= gnome@FreeBSD.org
COMMENT= GLib/GTK+ set of document centric objects and utilities
+LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
+
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
libgsf_gnome ltverhack
USE_GETTEXT= yes
diff --git a/devel/goffice04/distinfo b/devel/goffice04/distinfo
index 8b21943..f2f44de 100644
--- a/devel/goffice04/distinfo
+++ b/devel/goffice04/distinfo
@@ -1,3 +1,3 @@
-MD5 (goffice-0.2.2.tar.bz2) = a2bffd6eeb7609ea19936c8f6efb46fc
-SHA256 (goffice-0.2.2.tar.bz2) = a0bf823ef0ec03fee2e6ae74592b53dc7eadacfc9bfbf6e89db89b3e3ee8fc7d
-SIZE (goffice-0.2.2.tar.bz2) = 1422593
+MD5 (goffice-0.3.7.tar.bz2) = dc1e356e05abb5370b8cf3c13cc07fd6
+SHA256 (goffice-0.3.7.tar.bz2) = 3c659931d4c76b3e3f22312023ccae204aab5dd371d211dac5989c1c08dd391b
+SIZE (goffice-0.3.7.tar.bz2) = 1670170
diff --git a/devel/goffice04/files/patch-plugins_plot_radar_gog-radar.c b/devel/goffice04/files/patch-plugins_plot_radar_gog-radar.c
deleted file mode 100644
index 78df54b..0000000
--- a/devel/goffice04/files/patch-plugins_plot_radar_gog-radar.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- plugins/plot_radar/gog-radar.c.orig Sat Dec 16 23:54:55 2006
-+++ plugins/plot_radar/gog-radar.c Sun Dec 17 00:05:35 2006
-@@ -386,12 +386,6 @@ GSF_DYNAMIC_CLASS (GogPolarPlot, gog_pol
- typedef GogPlotView GogRTView;
- typedef GogPlotViewClass GogRTViewClass;
-
--static double
--fmin (double a, double b)
--{
-- return (a < b) ? a : b;
--}
--
- static void
- gog_rt_view_render (GogView *view, GogViewAllocation const *bbox)
- {
diff --git a/devel/goffice04/pkg-plist b/devel/goffice04/pkg-plist
index c425c73..fef09a7 100644
--- a/devel/goffice04/pkg-plist
+++ b/devel/goffice04/pkg-plist
@@ -1,126 +1,137 @@
-include/libgoffice-1/goffice/app/error-info.h
-include/libgoffice-1/goffice/app/file.h
-include/libgoffice-1/goffice/app/go-cmd-context-impl.h
-include/libgoffice-1/goffice/app/go-cmd-context.h
-include/libgoffice-1/goffice/app/go-doc-control-impl.h
-include/libgoffice-1/goffice/app/go-doc-control.h
-include/libgoffice-1/goffice/app/go-doc-impl.h
-include/libgoffice-1/goffice/app/go-doc.h
-include/libgoffice-1/goffice/app/go-plugin-loader-module.h
-include/libgoffice-1/goffice/app/go-plugin-loader.h
-include/libgoffice-1/goffice/app/go-plugin-service-impl.h
-include/libgoffice-1/goffice/app/go-plugin-service.h
-include/libgoffice-1/goffice/app/go-plugin.h
-include/libgoffice-1/goffice/app/goffice-app.h
-include/libgoffice-1/goffice/app/io-context-priv.h
-include/libgoffice-1/goffice/app/io-context.h
-include/libgoffice-1/goffice/app/module-plugin-defs.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-line.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-text.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-util.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/libfoocanvas.h
-include/libgoffice-1/goffice/cut-n-paste/pcre/pcre.h
-include/libgoffice-1/goffice/data/go-data-impl.h
-include/libgoffice-1/goffice/data/go-data-simple.h
-include/libgoffice-1/goffice/data/go-data.h
-include/libgoffice-1/goffice/data/goffice-data.h
-include/libgoffice-1/goffice/drawing/god-anchor.h
-include/libgoffice-1/goffice/drawing/god-default-attributes.h
-include/libgoffice-1/goffice/drawing/god-drawing-group.h
-include/libgoffice-1/goffice/drawing/god-drawing-renderer-gdk.h
-include/libgoffice-1/goffice/drawing/god-drawing-view.h
-include/libgoffice-1/goffice/drawing/god-drawing.h
-include/libgoffice-1/goffice/drawing/god-image-store.h
-include/libgoffice-1/goffice/drawing/god-image.h
-include/libgoffice-1/goffice/drawing/god-paragraph-attributes.h
-include/libgoffice-1/goffice/drawing/god-property-table.h
-include/libgoffice-1/goffice/drawing/god-shape.h
-include/libgoffice-1/goffice/drawing/god-text-model.h
-include/libgoffice-1/goffice/goffice-features.h
-include/libgoffice-1/goffice/goffice.h
-include/libgoffice-1/goffice/graph/goffice-graph.h
-include/libgoffice-1/goffice/graph/gog-axis-line-impl.h
-include/libgoffice-1/goffice/graph/gog-axis-line.h
-include/libgoffice-1/goffice/graph/gog-axis.h
-include/libgoffice-1/goffice/graph/gog-chart-impl.h
-include/libgoffice-1/goffice/graph/gog-chart.h
-include/libgoffice-1/goffice/graph/gog-control-foocanvas.h
-include/libgoffice-1/goffice/graph/gog-data-allocator.h
-include/libgoffice-1/goffice/graph/gog-data-set.h
-include/libgoffice-1/goffice/graph/gog-error-bar.h
-include/libgoffice-1/goffice/graph/gog-graph-impl.h
-include/libgoffice-1/goffice/graph/gog-graph.h
-include/libgoffice-1/goffice/graph/gog-grid-line.h
-include/libgoffice-1/goffice/graph/gog-grid.h
-include/libgoffice-1/goffice/graph/gog-guru.h
-include/libgoffice-1/goffice/graph/gog-label.h
-include/libgoffice-1/goffice/graph/gog-legend.h
-include/libgoffice-1/goffice/graph/gog-object-xml.h
-include/libgoffice-1/goffice/graph/gog-object.h
-include/libgoffice-1/goffice/graph/gog-outlined-object.h
-include/libgoffice-1/goffice/graph/gog-plot-engine.h
-include/libgoffice-1/goffice/graph/gog-plot-impl.h
-include/libgoffice-1/goffice/graph/gog-plot.h
-include/libgoffice-1/goffice/graph/gog-reg-curve.h
-include/libgoffice-1/goffice/graph/gog-renderer-gnome-print.h
-include/libgoffice-1/goffice/graph/gog-renderer-impl.h
-include/libgoffice-1/goffice/graph/gog-renderer-pixbuf.h
-include/libgoffice-1/goffice/graph/gog-renderer-svg.h
-include/libgoffice-1/goffice/graph/gog-renderer.h
-include/libgoffice-1/goffice/graph/gog-series-impl.h
-include/libgoffice-1/goffice/graph/gog-series-lines.h
-include/libgoffice-1/goffice/graph/gog-series.h
-include/libgoffice-1/goffice/graph/gog-style.h
-include/libgoffice-1/goffice/graph/gog-styled-object.h
-include/libgoffice-1/goffice/graph/gog-theme.h
-include/libgoffice-1/goffice/graph/gog-view.h
-include/libgoffice-1/goffice/gtk/go-action-combo-color.h
-include/libgoffice-1/goffice/gtk/go-action-combo-pixmaps.h
-include/libgoffice-1/goffice/gtk/go-action-combo-stack.h
-include/libgoffice-1/goffice/gtk/go-action-combo-text.h
-include/libgoffice-1/goffice/gtk/go-charmap-sel.h
-include/libgoffice-1/goffice/gtk/go-color-group.h
-include/libgoffice-1/goffice/gtk/go-color-palette.h
-include/libgoffice-1/goffice/gtk/go-combo-box.h
-include/libgoffice-1/goffice/gtk/go-combo-color.h
-include/libgoffice-1/goffice/gtk/go-combo-pixmaps.h
-include/libgoffice-1/goffice/gtk/go-combo-text.h
-include/libgoffice-1/goffice/gtk/go-font-sel.h
-include/libgoffice-1/goffice/gtk/go-format-sel.h
-include/libgoffice-1/goffice/gtk/go-graph-widget.h
-include/libgoffice-1/goffice/gtk/go-locale-sel.h
-include/libgoffice-1/goffice/gtk/go-optionmenu.h
-include/libgoffice-1/goffice/gtk/go-rotation-sel.h
-include/libgoffice-1/goffice/gtk/goffice-gtk.h
-include/libgoffice-1/goffice/ms-compat/go-ms-parser.h
-include/libgoffice-1/goffice/ms-compat/god-drawing-ms-client-handler.h
-include/libgoffice-1/goffice/ms-compat/god-drawing-ms.h
-include/libgoffice-1/goffice/ms-compat/god-image-ms.h
-include/libgoffice-1/goffice/utils/datetime.h
-include/libgoffice-1/goffice/utils/format-impl.h
-include/libgoffice-1/goffice/utils/go-color.h
-include/libgoffice-1/goffice/utils/go-file.h
-include/libgoffice-1/goffice/utils/go-font.h
-include/libgoffice-1/goffice/utils/go-format-match.h
-include/libgoffice-1/goffice/utils/go-format.h
-include/libgoffice-1/goffice/utils/go-geometry.h
-include/libgoffice-1/goffice/utils/go-glib-extras.h
-include/libgoffice-1/goffice/utils/go-gradient.h
-include/libgoffice-1/goffice/utils/go-libxml-extras.h
-include/libgoffice-1/goffice/utils/go-line.h
-include/libgoffice-1/goffice/utils/go-marker.h
-include/libgoffice-1/goffice/utils/go-math.h
-include/libgoffice-1/goffice/utils/go-pattern.h
-include/libgoffice-1/goffice/utils/go-rangefunc.h
-include/libgoffice-1/goffice/utils/go-regression.h
-include/libgoffice-1/goffice/utils/go-units.h
-include/libgoffice-1/goffice/utils/goffice-utils.h
-include/libgoffice-1/goffice/utils/regutf8.h
+include/libgoffice-0.3/goffice/app/error-info.h
+include/libgoffice-0.3/goffice/app/file.h
+include/libgoffice-0.3/goffice/app/go-cmd-context-impl.h
+include/libgoffice-0.3/goffice/app/go-cmd-context.h
+include/libgoffice-0.3/goffice/app/go-doc-control-impl.h
+include/libgoffice-0.3/goffice/app/go-doc-control.h
+include/libgoffice-0.3/goffice/app/go-doc-impl.h
+include/libgoffice-0.3/goffice/app/go-doc.h
+include/libgoffice-0.3/goffice/app/go-plugin-loader-module.h
+include/libgoffice-0.3/goffice/app/go-plugin-loader.h
+include/libgoffice-0.3/goffice/app/go-plugin-service-impl.h
+include/libgoffice-0.3/goffice/app/go-plugin-service.h
+include/libgoffice-0.3/goffice/app/go-plugin.h
+include/libgoffice-0.3/goffice/app/goffice-app.h
+include/libgoffice-0.3/goffice/app/io-context-priv.h
+include/libgoffice-0.3/goffice/app/io-context.h
+include/libgoffice-0.3/goffice/app/module-plugin-defs.h
+include/libgoffice-0.3/goffice/component/go-component-factory.h
+include/libgoffice-0.3/goffice/component/go-component.h
+include/libgoffice-0.3/goffice/component/goffice-component.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-line.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-text.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-util.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/libfoocanvas.h
+include/libgoffice-0.3/goffice/data/go-data-impl.h
+include/libgoffice-0.3/goffice/data/go-data-simple.h
+include/libgoffice-0.3/goffice/data/go-data.h
+include/libgoffice-0.3/goffice/data/goffice-data.h
+include/libgoffice-0.3/goffice/drawing/god-anchor.h
+include/libgoffice-0.3/goffice/drawing/god-default-attributes.h
+include/libgoffice-0.3/goffice/drawing/god-drawing-group.h
+include/libgoffice-0.3/goffice/drawing/god-drawing-renderer-gdk.h
+include/libgoffice-0.3/goffice/drawing/god-drawing-view.h
+include/libgoffice-0.3/goffice/drawing/god-drawing.h
+include/libgoffice-0.3/goffice/drawing/god-image-store.h
+include/libgoffice-0.3/goffice/drawing/god-image.h
+include/libgoffice-0.3/goffice/drawing/god-paragraph-attributes.h
+include/libgoffice-0.3/goffice/drawing/god-property-table.h
+include/libgoffice-0.3/goffice/drawing/god-shape.h
+include/libgoffice-0.3/goffice/drawing/god-text-model.h
+include/libgoffice-0.3/goffice/goffice-features.h
+include/libgoffice-0.3/goffice/goffice.h
+include/libgoffice-0.3/goffice/graph/goffice-graph.h
+include/libgoffice-0.3/goffice/graph/gog-axis-line-impl.h
+include/libgoffice-0.3/goffice/graph/gog-axis-line.h
+include/libgoffice-0.3/goffice/graph/gog-axis.h
+include/libgoffice-0.3/goffice/graph/gog-chart-impl.h
+include/libgoffice-0.3/goffice/graph/gog-chart.h
+include/libgoffice-0.3/goffice/graph/gog-control-foocanvas.h
+include/libgoffice-0.3/goffice/graph/gog-data-allocator.h
+include/libgoffice-0.3/goffice/graph/gog-data-set.h
+include/libgoffice-0.3/goffice/graph/gog-error-bar.h
+include/libgoffice-0.3/goffice/graph/gog-graph-impl.h
+include/libgoffice-0.3/goffice/graph/gog-graph.h
+include/libgoffice-0.3/goffice/graph/gog-grid-line.h
+include/libgoffice-0.3/goffice/graph/gog-grid.h
+include/libgoffice-0.3/goffice/graph/gog-guru.h
+include/libgoffice-0.3/goffice/graph/gog-label.h
+include/libgoffice-0.3/goffice/graph/gog-legend.h
+include/libgoffice-0.3/goffice/graph/gog-object-xml.h
+include/libgoffice-0.3/goffice/graph/gog-object.h
+include/libgoffice-0.3/goffice/graph/gog-outlined-object.h
+include/libgoffice-0.3/goffice/graph/gog-plot-engine.h
+include/libgoffice-0.3/goffice/graph/gog-plot-impl.h
+include/libgoffice-0.3/goffice/graph/gog-plot.h
+include/libgoffice-0.3/goffice/graph/gog-reg-curve.h
+include/libgoffice-0.3/goffice/graph/gog-renderer-cairo.h
+include/libgoffice-0.3/goffice/graph/gog-renderer-gnome-print.h
+include/libgoffice-0.3/goffice/graph/gog-renderer-impl.h
+include/libgoffice-0.3/goffice/graph/gog-renderer.h
+include/libgoffice-0.3/goffice/graph/gog-series-impl.h
+include/libgoffice-0.3/goffice/graph/gog-series-lines.h
+include/libgoffice-0.3/goffice/graph/gog-series.h
+include/libgoffice-0.3/goffice/graph/gog-smoothed-curve.h
+include/libgoffice-0.3/goffice/graph/gog-style.h
+include/libgoffice-0.3/goffice/graph/gog-styled-object.h
+include/libgoffice-0.3/goffice/graph/gog-theme.h
+include/libgoffice-0.3/goffice/graph/gog-trend-line.h
+include/libgoffice-0.3/goffice/graph/gog-view.h
+include/libgoffice-0.3/goffice/gtk/go-action-combo-color.h
+include/libgoffice-0.3/goffice/gtk/go-action-combo-pixmaps.h
+include/libgoffice-0.3/goffice/gtk/go-action-combo-stack.h
+include/libgoffice-0.3/goffice/gtk/go-action-combo-text.h
+include/libgoffice-0.3/goffice/gtk/go-charmap-sel.h
+include/libgoffice-0.3/goffice/gtk/go-color-group.h
+include/libgoffice-0.3/goffice/gtk/go-color-palette.h
+include/libgoffice-0.3/goffice/gtk/go-color-selector.h
+include/libgoffice-0.3/goffice/gtk/go-combo-box.h
+include/libgoffice-0.3/goffice/gtk/go-combo-color.h
+include/libgoffice-0.3/goffice/gtk/go-combo-pixmaps.h
+include/libgoffice-0.3/goffice/gtk/go-combo-text.h
+include/libgoffice-0.3/goffice/gtk/go-font-sel.h
+include/libgoffice-0.3/goffice/gtk/go-format-sel.h
+include/libgoffice-0.3/goffice/gtk/go-gradient-selector.h
+include/libgoffice-0.3/goffice/gtk/go-graph-widget.h
+include/libgoffice-0.3/goffice/gtk/go-line-selector.h
+include/libgoffice-0.3/goffice/gtk/go-locale-sel.h
+include/libgoffice-0.3/goffice/gtk/go-marker-selector.h
+include/libgoffice-0.3/goffice/gtk/go-optionmenu.h
+include/libgoffice-0.3/goffice/gtk/go-palette.h
+include/libgoffice-0.3/goffice/gtk/go-pattern-selector.h
+include/libgoffice-0.3/goffice/gtk/go-rotation-sel.h
+include/libgoffice-0.3/goffice/gtk/go-selector.h
+include/libgoffice-0.3/goffice/gtk/goffice-gtk.h
+include/libgoffice-0.3/goffice/ms-compat/go-ms-parser.h
+include/libgoffice-0.3/goffice/ms-compat/god-drawing-ms-client-handler.h
+include/libgoffice-0.3/goffice/ms-compat/god-drawing-ms.h
+include/libgoffice-0.3/goffice/ms-compat/god-image-ms.h
+include/libgoffice-0.3/goffice/utils/datetime.h
+include/libgoffice-0.3/goffice/utils/go-color.h
+include/libgoffice-0.3/goffice/utils/go-file.h
+include/libgoffice-0.3/goffice/utils/go-font.h
+include/libgoffice-0.3/goffice/utils/go-format.h
+include/libgoffice-0.3/goffice/utils/go-geometry.h
+include/libgoffice-0.3/goffice/utils/go-glib-extras.h
+include/libgoffice-0.3/goffice/utils/go-gradient.h
+include/libgoffice-0.3/goffice/utils/go-image.h
+include/libgoffice-0.3/goffice/utils/go-libxml-extras.h
+include/libgoffice-0.3/goffice/utils/go-line.h
+include/libgoffice-0.3/goffice/utils/go-locale.h
+include/libgoffice-0.3/goffice/utils/go-marker.h
+include/libgoffice-0.3/goffice/utils/go-math.h
+include/libgoffice-0.3/goffice/utils/go-pattern.h
+include/libgoffice-0.3/goffice/utils/go-rangefunc.h
+include/libgoffice-0.3/goffice/utils/go-regression.h
+include/libgoffice-0.3/goffice/utils/go-undo.h
+include/libgoffice-0.3/goffice/utils/go-units.h
+include/libgoffice-0.3/goffice/utils/goffice-utils.h
+include/libgoffice-0.3/goffice/utils/regutf8.h
lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.a
lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.la
lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.so
@@ -154,6 +165,8 @@ lib/goffice/%%VERSION%%/plugins/plot_surface/surface.a
lib/goffice/%%VERSION%%/plugins/plot_surface/surface.la
lib/goffice/%%VERSION%%/plugins/plot_surface/surface.so
lib/goffice/%%VERSION%%/plugins/plot_xy/gog-bubble-prefs.glade
+lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-color-prefs.glade
+lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-series-prefs.glade
lib/goffice/%%VERSION%%/plugins/plot_xy/plot-types.xml
lib/goffice/%%VERSION%%/plugins/plot_xy/plugin.xml
lib/goffice/%%VERSION%%/plugins/plot_xy/xy.a
@@ -169,172 +182,319 @@ lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.la
lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.so
lib/goffice/%%VERSION%%/plugins/reg_logfit/plugin.xml
lib/goffice/%%VERSION%%/plugins/reg_logfit/reg-types.xml
-lib/libgoffice-1.a
-lib/libgoffice-1.la
-lib/libgoffice-1.so
-lib/libgoffice-1.so.2
-libdata/pkgconfig/libgoffice-1.pc
+lib/goffice/%%VERSION%%/plugins/smoothing/gog-exp-smooth.glade
+lib/goffice/%%VERSION%%/plugins/smoothing/gog-moving-avg.glade
+lib/goffice/%%VERSION%%/plugins/smoothing/plugin.xml
+lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.a
+lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.la
+lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so
+lib/goffice/%%VERSION%%/plugins/smoothing/types.xml
+lib/libgoffice-0.a
+lib/libgoffice-0.la
+lib/libgoffice-0.so
+lib/libgoffice-0.so.3
+libdata/pkgconfig/libgoffice-0.3.pc
+%%DOCSDIR%%/GOData.html
+%%DOCSDIR%%/GODataMatrix.html
+%%DOCSDIR%%/GODataScalar.html
+%%DOCSDIR%%/GODataVector.html
+%%DOCSDIR%%/GogAxis.html
+%%DOCSDIR%%/GogAxisLine.html
+%%DOCSDIR%%/GogChart.html
+%%DOCSDIR%%/GogDataAllocator.html
+%%DOCSDIR%%/GogDataset.html
+%%DOCSDIR%%/GogErrorBar.html
+%%DOCSDIR%%/GogGraph.html
+%%DOCSDIR%%/GogGrid.html
+%%DOCSDIR%%/GogGridLine.html
+%%DOCSDIR%%/GogLabel.html
+%%DOCSDIR%%/GogLegend.html
+%%DOCSDIR%%/GogObject.html
+%%DOCSDIR%%/GogOutlinedObject.html
+%%DOCSDIR%%/GogPersist.html
+%%DOCSDIR%%/GogPlot.html
+%%DOCSDIR%%/GogRegCurve.html
+%%DOCSDIR%%/GogRegEqn.html
+%%DOCSDIR%%/GogRenderer.html
+%%DOCSDIR%%/GogSeries.html
+%%DOCSDIR%%/GogSeriesLines.html
+%%DOCSDIR%%/GogStyle.html
+%%DOCSDIR%%/GogStyledObject.html
+%%DOCSDIR%%/GogView.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/ch05.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/ch07.html
+%%DOCSDIR%%/ch08.html
+%%DOCSDIR%%/ch09.html
+%%DOCSDIR%%/ch10.html
+%%DOCSDIR%%/ch11.html
+%%DOCSDIR%%/goffice-GOComboBox.html
+%%DOCSDIR%%/goffice-GOComboColor.html
+%%DOCSDIR%%/goffice-GOComponent.html
+%%DOCSDIR%%/goffice-GODoc.html
+%%DOCSDIR%%/goffice-GODocControl.html
+%%DOCSDIR%%/goffice-GOPluginLoader.html
+%%DOCSDIR%%/goffice-GOPluginService.html
+%%DOCSDIR%%/goffice-GOService.html
+%%DOCSDIR%%/goffice-GoApp.html
+%%DOCSDIR%%/goffice-GoCharmapSel.html
+%%DOCSDIR%%/goffice-GoCmdContext.html
+%%DOCSDIR%%/goffice-GoColor.html
+%%DOCSDIR%%/goffice-GoComboPixmaps.html
+%%DOCSDIR%%/goffice-GoComboText.html
+%%DOCSDIR%%/goffice-GoComponentFactory.html
+%%DOCSDIR%%/goffice-GoFontSel.html
+%%DOCSDIR%%/goffice-GoFormatSel.html
+%%DOCSDIR%%/goffice-GoGeometry.html
+%%DOCSDIR%%/goffice-GoGlibExtras.html
+%%DOCSDIR%%/goffice-GoLibxmlExtras.html
+%%DOCSDIR%%/goffice-GoLocaleSel.html
+%%DOCSDIR%%/goffice-GoObject.html
+%%DOCSDIR%%/goffice-GoOptionMenu.html
+%%DOCSDIR%%/goffice-GoPluginLoaderModule.html
+%%DOCSDIR%%/goffice-GoRotationSel.html
+%%DOCSDIR%%/goffice-GoSearchReplace.html
+%%DOCSDIR%%/goffice-GogAxisMap.html
+%%DOCSDIR%%/goffice-GogChartMap.html
+%%DOCSDIR%%/goffice-GogControlFooCanvas.html
+%%DOCSDIR%%/goffice-GogEditor.html
+%%DOCSDIR%%/goffice-GogGuru.html
+%%DOCSDIR%%/goffice-GogPlotEngine.html
+%%DOCSDIR%%/goffice-GogTool.html
+%%DOCSDIR%%/goffice-Math.html
+%%DOCSDIR%%/goffice-Ranges.html
+%%DOCSDIR%%/goffice-RegUTF8.html
+%%DOCSDIR%%/goffice-Regressions.html
+%%DOCSDIR%%/goffice-Units.html
+%%DOCSDIR%%/goffice-go-format.html
+%%DOCSDIR%%/goffice-go-gradient.html
+%%DOCSDIR%%/goffice-go-line.html
+%%DOCSDIR%%/goffice-go-marker.html
+%%DOCSDIR%%/goffice-go-pattern.html
+%%DOCSDIR%%/goffice-go-plugin.html
+%%DOCSDIR%%/goffice-gog-theme.html
+%%DOCSDIR%%/goffice.devhelp
+%%DOCSDIR%%/goffice.devhelp2
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/pt01.html
+%%DOCSDIR%%/pt02.html
+%%DOCSDIR%%/pt03.html
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
share/gnome/goffice/%%VERSION%%/glade/go-font-sel.glade
share/gnome/goffice/%%VERSION%%/glade/go-format-sel.glade
+share/gnome/goffice/%%VERSION%%/glade/go-image-save-dialog-extra.glade
share/gnome/goffice/%%VERSION%%/glade/go-rotation-sel.glade
share/gnome/goffice/%%VERSION%%/glade/gog-axis-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-chart-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-error-bar-prefs.glade
+share/gnome/goffice/%%VERSION%%/glade/gog-graph-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-guru-type-selector.glade
share/gnome/goffice/%%VERSION%%/glade/gog-guru.glade
share/gnome/goffice/%%VERSION%%/glade/gog-object-prefs.glade
+share/gnome/goffice/%%VERSION%%/glade/gog-plot-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-reg-curve-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-style-prefs.glade
share/gnome/goffice/%%VERSION%%/patterns/svg-patterns.xml
-share/gnome/pixmaps/goffice/area.xpm
-share/gnome/pixmaps/goffice/bar-hboth.png
-share/gnome/pixmaps/goffice/bar-hminus.png
-share/gnome/pixmaps/goffice/bar-hplus.png
-share/gnome/pixmaps/goffice/bar-none.png
-share/gnome/pixmaps/goffice/bar-vboth.png
-share/gnome/pixmaps/goffice/bar-vminus.png
-share/gnome/pixmaps/goffice/bar-vplus.png
-share/gnome/pixmaps/goffice/bar.xpm
-share/gnome/pixmaps/goffice/boxplot.xpm
-share/gnome/pixmaps/goffice/bubble.xpm
-share/gnome/pixmaps/goffice/chart_area_1_1.png
-share/gnome/pixmaps/goffice/chart_area_1_2.png
-share/gnome/pixmaps/goffice/chart_area_1_3.png
-share/gnome/pixmaps/goffice/chart_bar_1_1.png
-share/gnome/pixmaps/goffice/chart_bar_1_2.png
-share/gnome/pixmaps/goffice/chart_bar_1_3.png
-share/gnome/pixmaps/goffice/chart_bar_2_1.png
-share/gnome/pixmaps/goffice/chart_bar_2_2.png
-share/gnome/pixmaps/goffice/chart_bar_2_3.png
-share/gnome/pixmaps/goffice/chart_boxplot_1_1.png
-share/gnome/pixmaps/goffice/chart_bubble_1_1.png
-share/gnome/pixmaps/goffice/chart_column_1_1.png
-share/gnome/pixmaps/goffice/chart_column_1_2.png
-share/gnome/pixmaps/goffice/chart_column_1_3.png
-share/gnome/pixmaps/goffice/chart_column_2_1.png
-share/gnome/pixmaps/goffice/chart_column_2_2.png
-share/gnome/pixmaps/goffice/chart_column_2_3.png
-share/gnome/pixmaps/goffice/chart_column_3_1.png
-share/gnome/pixmaps/goffice/chart_cone_1_1.png
-share/gnome/pixmaps/goffice/chart_cone_1_2.png
-share/gnome/pixmaps/goffice/chart_cone_1_3.png
-share/gnome/pixmaps/goffice/chart_cone_2_1.png
-share/gnome/pixmaps/goffice/chart_cone_2_2.png
-share/gnome/pixmaps/goffice/chart_cone_2_3.png
-share/gnome/pixmaps/goffice/chart_cone_3_1.png
-share/gnome/pixmaps/goffice/chart_contour_1_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_2.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_3.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_2.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_3.png
-share/gnome/pixmaps/goffice/chart_cylinder_3_1.png
-share/gnome/pixmaps/goffice/chart_dropbar_1_1.png
-share/gnome/pixmaps/goffice/chart_dropbar_1_2.png
-share/gnome/pixmaps/goffice/chart_line_1_1.png
-share/gnome/pixmaps/goffice/chart_line_1_2.png
-share/gnome/pixmaps/goffice/chart_line_1_3.png
-share/gnome/pixmaps/goffice/chart_line_2_1.png
-share/gnome/pixmaps/goffice/chart_line_2_2.png
-share/gnome/pixmaps/goffice/chart_line_2_3.png
-share/gnome/pixmaps/goffice/chart_line_3_1.png
-share/gnome/pixmaps/goffice/chart_minmax_1_1.png
-share/gnome/pixmaps/goffice/chart_minmax_1_2.png
-share/gnome/pixmaps/goffice/chart_minmax_2_1.png
-share/gnome/pixmaps/goffice/chart_minmax_2_2.png
-share/gnome/pixmaps/goffice/chart_pie_1_1.png
-share/gnome/pixmaps/goffice/chart_pie_1_2.png
-share/gnome/pixmaps/goffice/chart_pie_1_3.png
-share/gnome/pixmaps/goffice/chart_pie_2_1.png
-share/gnome/pixmaps/goffice/chart_pie_2_2.png
-share/gnome/pixmaps/goffice/chart_pie_2_3.png
-share/gnome/pixmaps/goffice/chart_polar_1_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_2.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_3.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_2.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_3.png
-share/gnome/pixmaps/goffice/chart_pyramid_3_1.png
-share/gnome/pixmaps/goffice/chart_radar_1_1.png
-share/gnome/pixmaps/goffice/chart_radar_1_2.png
-share/gnome/pixmaps/goffice/chart_radar_1_3.png
-share/gnome/pixmaps/goffice/chart_ring_1_1.png
-share/gnome/pixmaps/goffice/chart_ring_1_2.png
-share/gnome/pixmaps/goffice/chart_scatter_1_1.png
-share/gnome/pixmaps/goffice/chart_scatter_2_1.png
-share/gnome/pixmaps/goffice/chart_scatter_2_2.png
-share/gnome/pixmaps/goffice/chart_scatter_3_1.png
-share/gnome/pixmaps/goffice/chart_scatter_3_2.png
-share/gnome/pixmaps/goffice/chart_scatter_3_3.png
-share/gnome/pixmaps/goffice/chart_stock_1_1.png
-share/gnome/pixmaps/goffice/chart_stock_1_2.png
-share/gnome/pixmaps/goffice/chart_stock_2_1.png
-share/gnome/pixmaps/goffice/chart_stock_2_2.png
-share/gnome/pixmaps/goffice/column.xpm
-share/gnome/pixmaps/goffice/doughnut.xpm
-share/gnome/pixmaps/goffice/dropbar.xpm
-share/gnome/pixmaps/goffice/linegraph.xpm
-share/gnome/pixmaps/goffice/minmax.xpm
-share/gnome/pixmaps/goffice/pie.xpm
-share/gnome/pixmaps/goffice/polar.png
-share/gnome/pixmaps/goffice/radar.xpm
-share/gnome/pixmaps/goffice/scatter.xpm
-share/gnome/pixmaps/goffice/stock.xpm
-share/gnome/pixmaps/goffice/surface.xpm
-share/locale/am/LC_MESSAGES/goffice.mo
-share/locale/az/LC_MESSAGES/goffice.mo
-share/locale/bg/LC_MESSAGES/goffice.mo
-share/locale/ca/LC_MESSAGES/goffice.mo
-share/locale/cs/LC_MESSAGES/goffice.mo
-share/locale/da/LC_MESSAGES/goffice.mo
-share/locale/de/LC_MESSAGES/goffice.mo
-share/locale/el/LC_MESSAGES/goffice.mo
-share/locale/en_CA/LC_MESSAGES/goffice.mo
-share/locale/en_GB/LC_MESSAGES/goffice.mo
-share/locale/es/LC_MESSAGES/goffice.mo
-share/locale/et/LC_MESSAGES/goffice.mo
-share/locale/fi/LC_MESSAGES/goffice.mo
-share/locale/fr/LC_MESSAGES/goffice.mo
-share/locale/ga/LC_MESSAGES/goffice.mo
-share/locale/gl/LC_MESSAGES/goffice.mo
-share/locale/he/LC_MESSAGES/goffice.mo
-share/locale/hr/LC_MESSAGES/goffice.mo
-share/locale/hu/LC_MESSAGES/goffice.mo
-share/locale/it/LC_MESSAGES/goffice.mo
-share/locale/ja/LC_MESSAGES/goffice.mo
-share/locale/ko/LC_MESSAGES/goffice.mo
-share/locale/lv/LC_MESSAGES/goffice.mo
-share/locale/ml/LC_MESSAGES/goffice.mo
-share/locale/mr/LC_MESSAGES/goffice.mo
-share/locale/ms/LC_MESSAGES/goffice.mo
-share/locale/nb/LC_MESSAGES/goffice.mo
-share/locale/nl/LC_MESSAGES/goffice.mo
-share/locale/nn/LC_MESSAGES/goffice.mo
-share/locale/no/LC_MESSAGES/goffice.mo
-share/locale/pl/LC_MESSAGES/goffice.mo
-share/locale/pt/LC_MESSAGES/goffice.mo
-share/locale/pt_BR/LC_MESSAGES/goffice.mo
-share/locale/ro/LC_MESSAGES/goffice.mo
-share/locale/ru/LC_MESSAGES/goffice.mo
-share/locale/sk/LC_MESSAGES/goffice.mo
-share/locale/sr/LC_MESSAGES/goffice.mo
-share/locale/sr@Latn/LC_MESSAGES/goffice.mo
-share/locale/sv/LC_MESSAGES/goffice.mo
-share/locale/tr/LC_MESSAGES/goffice.mo
-share/locale/uk/LC_MESSAGES/goffice.mo
-share/locale/vi/LC_MESSAGES/goffice.mo
-share/locale/zh_CN/LC_MESSAGES/goffice.mo
-share/locale/zh_TW/LC_MESSAGES/goffice.mo
+share/gnome/pixmaps/goffice/%%VERSION%%/area.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-hboth.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-hminus.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-hplus.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-none.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-vboth.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-vminus.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-vplus.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/boxplot.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/bubble.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/color.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/column.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/doughnut.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/dropbar.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/hist.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/linegraph.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/minmax.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/pie.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/polar.png
+share/gnome/pixmaps/goffice/%%VERSION%%/radar.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/scatter.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/stock.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/surface.xpm
+share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ca/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/et/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/he/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/hr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/lv/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrm share/gnome/pixmaps/goffice/%%VERSION%%
@dirrm share/gnome/pixmaps/goffice
@dirrm share/gnome/goffice/%%VERSION%%/patterns
@dirrm share/gnome/goffice/%%VERSION%%/glade
@dirrm share/gnome/goffice/%%VERSION%%
@dirrm share/gnome/goffice
+@dirrm %%DOCSDIR%%
+@dirrm lib/goffice/%%VERSION%%/plugins/smoothing
@dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit
@dirrm lib/goffice/%%VERSION%%/plugins/reg_linear
@dirrm lib/goffice/%%VERSION%%/plugins/plot_xy
@@ -346,15 +506,15 @@ share/locale/zh_TW/LC_MESSAGES/goffice.mo
@dirrm lib/goffice/%%VERSION%%/plugins
@dirrm lib/goffice/%%VERSION%%
@dirrm lib/goffice
-@dirrm include/libgoffice-1/goffice/utils
-@dirrm include/libgoffice-1/goffice/ms-compat
-@dirrm include/libgoffice-1/goffice/gtk
-@dirrm include/libgoffice-1/goffice/graph
-@dirrm include/libgoffice-1/goffice/drawing
-@dirrm include/libgoffice-1/goffice/data
-@dirrm include/libgoffice-1/goffice/cut-n-paste/pcre
-@dirrm include/libgoffice-1/goffice/cut-n-paste/foocanvas
-@dirrm include/libgoffice-1/goffice/cut-n-paste
-@dirrm include/libgoffice-1/goffice/app
-@dirrm include/libgoffice-1/goffice
-@dirrm include/libgoffice-1
+@dirrm include/libgoffice-0.3/goffice/utils
+@dirrm include/libgoffice-0.3/goffice/ms-compat
+@dirrm include/libgoffice-0.3/goffice/gtk
+@dirrm include/libgoffice-0.3/goffice/graph
+@dirrm include/libgoffice-0.3/goffice/drawing
+@dirrm include/libgoffice-0.3/goffice/data
+@dirrm include/libgoffice-0.3/goffice/cut-n-paste/foocanvas
+@dirrm include/libgoffice-0.3/goffice/cut-n-paste
+@dirrm include/libgoffice-0.3/goffice/component
+@dirrm include/libgoffice-0.3/goffice/app
+@dirrm include/libgoffice-0.3/goffice
+@dirrm include/libgoffice-0.3
diff --git a/devel/goffice1/Makefile b/devel/goffice1/Makefile
index 774b415..b4ddbf6 100644
--- a/devel/goffice1/Makefile
+++ b/devel/goffice1/Makefile
@@ -3,21 +3,23 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/goffice/Makefile,v 1.9 2006/01/31 22:13:22 ahze Exp $
+# $MCom: ports/devel/goffice/Makefile,v 1.23 2007/03/11 20:02:56 mezz Exp $
#
PORTNAME= goffice
-PORTVERSION= 0.2.2
+PORTVERSION= 0.3.7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
MAINTAINER= gnome@FreeBSD.org
COMMENT= GLib/GTK+ set of document centric objects and utilities
+LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
+
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
libgsf_gnome ltverhack
USE_GETTEXT= yes
diff --git a/devel/goffice1/distinfo b/devel/goffice1/distinfo
index 8b21943..f2f44de 100644
--- a/devel/goffice1/distinfo
+++ b/devel/goffice1/distinfo
@@ -1,3 +1,3 @@
-MD5 (goffice-0.2.2.tar.bz2) = a2bffd6eeb7609ea19936c8f6efb46fc
-SHA256 (goffice-0.2.2.tar.bz2) = a0bf823ef0ec03fee2e6ae74592b53dc7eadacfc9bfbf6e89db89b3e3ee8fc7d
-SIZE (goffice-0.2.2.tar.bz2) = 1422593
+MD5 (goffice-0.3.7.tar.bz2) = dc1e356e05abb5370b8cf3c13cc07fd6
+SHA256 (goffice-0.3.7.tar.bz2) = 3c659931d4c76b3e3f22312023ccae204aab5dd371d211dac5989c1c08dd391b
+SIZE (goffice-0.3.7.tar.bz2) = 1670170
diff --git a/devel/goffice1/files/patch-plugins_plot_radar_gog-radar.c b/devel/goffice1/files/patch-plugins_plot_radar_gog-radar.c
deleted file mode 100644
index 78df54b..0000000
--- a/devel/goffice1/files/patch-plugins_plot_radar_gog-radar.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- plugins/plot_radar/gog-radar.c.orig Sat Dec 16 23:54:55 2006
-+++ plugins/plot_radar/gog-radar.c Sun Dec 17 00:05:35 2006
-@@ -386,12 +386,6 @@ GSF_DYNAMIC_CLASS (GogPolarPlot, gog_pol
- typedef GogPlotView GogRTView;
- typedef GogPlotViewClass GogRTViewClass;
-
--static double
--fmin (double a, double b)
--{
-- return (a < b) ? a : b;
--}
--
- static void
- gog_rt_view_render (GogView *view, GogViewAllocation const *bbox)
- {
diff --git a/devel/goffice1/pkg-plist b/devel/goffice1/pkg-plist
index c425c73..fef09a7 100644
--- a/devel/goffice1/pkg-plist
+++ b/devel/goffice1/pkg-plist
@@ -1,126 +1,137 @@
-include/libgoffice-1/goffice/app/error-info.h
-include/libgoffice-1/goffice/app/file.h
-include/libgoffice-1/goffice/app/go-cmd-context-impl.h
-include/libgoffice-1/goffice/app/go-cmd-context.h
-include/libgoffice-1/goffice/app/go-doc-control-impl.h
-include/libgoffice-1/goffice/app/go-doc-control.h
-include/libgoffice-1/goffice/app/go-doc-impl.h
-include/libgoffice-1/goffice/app/go-doc.h
-include/libgoffice-1/goffice/app/go-plugin-loader-module.h
-include/libgoffice-1/goffice/app/go-plugin-loader.h
-include/libgoffice-1/goffice/app/go-plugin-service-impl.h
-include/libgoffice-1/goffice/app/go-plugin-service.h
-include/libgoffice-1/goffice/app/go-plugin.h
-include/libgoffice-1/goffice/app/goffice-app.h
-include/libgoffice-1/goffice/app/io-context-priv.h
-include/libgoffice-1/goffice/app/io-context.h
-include/libgoffice-1/goffice/app/module-plugin-defs.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-line.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-text.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-util.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/libfoocanvas.h
-include/libgoffice-1/goffice/cut-n-paste/pcre/pcre.h
-include/libgoffice-1/goffice/data/go-data-impl.h
-include/libgoffice-1/goffice/data/go-data-simple.h
-include/libgoffice-1/goffice/data/go-data.h
-include/libgoffice-1/goffice/data/goffice-data.h
-include/libgoffice-1/goffice/drawing/god-anchor.h
-include/libgoffice-1/goffice/drawing/god-default-attributes.h
-include/libgoffice-1/goffice/drawing/god-drawing-group.h
-include/libgoffice-1/goffice/drawing/god-drawing-renderer-gdk.h
-include/libgoffice-1/goffice/drawing/god-drawing-view.h
-include/libgoffice-1/goffice/drawing/god-drawing.h
-include/libgoffice-1/goffice/drawing/god-image-store.h
-include/libgoffice-1/goffice/drawing/god-image.h
-include/libgoffice-1/goffice/drawing/god-paragraph-attributes.h
-include/libgoffice-1/goffice/drawing/god-property-table.h
-include/libgoffice-1/goffice/drawing/god-shape.h
-include/libgoffice-1/goffice/drawing/god-text-model.h
-include/libgoffice-1/goffice/goffice-features.h
-include/libgoffice-1/goffice/goffice.h
-include/libgoffice-1/goffice/graph/goffice-graph.h
-include/libgoffice-1/goffice/graph/gog-axis-line-impl.h
-include/libgoffice-1/goffice/graph/gog-axis-line.h
-include/libgoffice-1/goffice/graph/gog-axis.h
-include/libgoffice-1/goffice/graph/gog-chart-impl.h
-include/libgoffice-1/goffice/graph/gog-chart.h
-include/libgoffice-1/goffice/graph/gog-control-foocanvas.h
-include/libgoffice-1/goffice/graph/gog-data-allocator.h
-include/libgoffice-1/goffice/graph/gog-data-set.h
-include/libgoffice-1/goffice/graph/gog-error-bar.h
-include/libgoffice-1/goffice/graph/gog-graph-impl.h
-include/libgoffice-1/goffice/graph/gog-graph.h
-include/libgoffice-1/goffice/graph/gog-grid-line.h
-include/libgoffice-1/goffice/graph/gog-grid.h
-include/libgoffice-1/goffice/graph/gog-guru.h
-include/libgoffice-1/goffice/graph/gog-label.h
-include/libgoffice-1/goffice/graph/gog-legend.h
-include/libgoffice-1/goffice/graph/gog-object-xml.h
-include/libgoffice-1/goffice/graph/gog-object.h
-include/libgoffice-1/goffice/graph/gog-outlined-object.h
-include/libgoffice-1/goffice/graph/gog-plot-engine.h
-include/libgoffice-1/goffice/graph/gog-plot-impl.h
-include/libgoffice-1/goffice/graph/gog-plot.h
-include/libgoffice-1/goffice/graph/gog-reg-curve.h
-include/libgoffice-1/goffice/graph/gog-renderer-gnome-print.h
-include/libgoffice-1/goffice/graph/gog-renderer-impl.h
-include/libgoffice-1/goffice/graph/gog-renderer-pixbuf.h
-include/libgoffice-1/goffice/graph/gog-renderer-svg.h
-include/libgoffice-1/goffice/graph/gog-renderer.h
-include/libgoffice-1/goffice/graph/gog-series-impl.h
-include/libgoffice-1/goffice/graph/gog-series-lines.h
-include/libgoffice-1/goffice/graph/gog-series.h
-include/libgoffice-1/goffice/graph/gog-style.h
-include/libgoffice-1/goffice/graph/gog-styled-object.h
-include/libgoffice-1/goffice/graph/gog-theme.h
-include/libgoffice-1/goffice/graph/gog-view.h
-include/libgoffice-1/goffice/gtk/go-action-combo-color.h
-include/libgoffice-1/goffice/gtk/go-action-combo-pixmaps.h
-include/libgoffice-1/goffice/gtk/go-action-combo-stack.h
-include/libgoffice-1/goffice/gtk/go-action-combo-text.h
-include/libgoffice-1/goffice/gtk/go-charmap-sel.h
-include/libgoffice-1/goffice/gtk/go-color-group.h
-include/libgoffice-1/goffice/gtk/go-color-palette.h
-include/libgoffice-1/goffice/gtk/go-combo-box.h
-include/libgoffice-1/goffice/gtk/go-combo-color.h
-include/libgoffice-1/goffice/gtk/go-combo-pixmaps.h
-include/libgoffice-1/goffice/gtk/go-combo-text.h
-include/libgoffice-1/goffice/gtk/go-font-sel.h
-include/libgoffice-1/goffice/gtk/go-format-sel.h
-include/libgoffice-1/goffice/gtk/go-graph-widget.h
-include/libgoffice-1/goffice/gtk/go-locale-sel.h
-include/libgoffice-1/goffice/gtk/go-optionmenu.h
-include/libgoffice-1/goffice/gtk/go-rotation-sel.h
-include/libgoffice-1/goffice/gtk/goffice-gtk.h
-include/libgoffice-1/goffice/ms-compat/go-ms-parser.h
-include/libgoffice-1/goffice/ms-compat/god-drawing-ms-client-handler.h
-include/libgoffice-1/goffice/ms-compat/god-drawing-ms.h
-include/libgoffice-1/goffice/ms-compat/god-image-ms.h
-include/libgoffice-1/goffice/utils/datetime.h
-include/libgoffice-1/goffice/utils/format-impl.h
-include/libgoffice-1/goffice/utils/go-color.h
-include/libgoffice-1/goffice/utils/go-file.h
-include/libgoffice-1/goffice/utils/go-font.h
-include/libgoffice-1/goffice/utils/go-format-match.h
-include/libgoffice-1/goffice/utils/go-format.h
-include/libgoffice-1/goffice/utils/go-geometry.h
-include/libgoffice-1/goffice/utils/go-glib-extras.h
-include/libgoffice-1/goffice/utils/go-gradient.h
-include/libgoffice-1/goffice/utils/go-libxml-extras.h
-include/libgoffice-1/goffice/utils/go-line.h
-include/libgoffice-1/goffice/utils/go-marker.h
-include/libgoffice-1/goffice/utils/go-math.h
-include/libgoffice-1/goffice/utils/go-pattern.h
-include/libgoffice-1/goffice/utils/go-rangefunc.h
-include/libgoffice-1/goffice/utils/go-regression.h
-include/libgoffice-1/goffice/utils/go-units.h
-include/libgoffice-1/goffice/utils/goffice-utils.h
-include/libgoffice-1/goffice/utils/regutf8.h
+include/libgoffice-0.3/goffice/app/error-info.h
+include/libgoffice-0.3/goffice/app/file.h
+include/libgoffice-0.3/goffice/app/go-cmd-context-impl.h
+include/libgoffice-0.3/goffice/app/go-cmd-context.h
+include/libgoffice-0.3/goffice/app/go-doc-control-impl.h
+include/libgoffice-0.3/goffice/app/go-doc-control.h
+include/libgoffice-0.3/goffice/app/go-doc-impl.h
+include/libgoffice-0.3/goffice/app/go-doc.h
+include/libgoffice-0.3/goffice/app/go-plugin-loader-module.h
+include/libgoffice-0.3/goffice/app/go-plugin-loader.h
+include/libgoffice-0.3/goffice/app/go-plugin-service-impl.h
+include/libgoffice-0.3/goffice/app/go-plugin-service.h
+include/libgoffice-0.3/goffice/app/go-plugin.h
+include/libgoffice-0.3/goffice/app/goffice-app.h
+include/libgoffice-0.3/goffice/app/io-context-priv.h
+include/libgoffice-0.3/goffice/app/io-context.h
+include/libgoffice-0.3/goffice/app/module-plugin-defs.h
+include/libgoffice-0.3/goffice/component/go-component-factory.h
+include/libgoffice-0.3/goffice/component/go-component.h
+include/libgoffice-0.3/goffice/component/goffice-component.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-line.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-text.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-util.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/foo-canvas.h
+include/libgoffice-0.3/goffice/cut-n-paste/foocanvas/libfoocanvas.h
+include/libgoffice-0.3/goffice/data/go-data-impl.h
+include/libgoffice-0.3/goffice/data/go-data-simple.h
+include/libgoffice-0.3/goffice/data/go-data.h
+include/libgoffice-0.3/goffice/data/goffice-data.h
+include/libgoffice-0.3/goffice/drawing/god-anchor.h
+include/libgoffice-0.3/goffice/drawing/god-default-attributes.h
+include/libgoffice-0.3/goffice/drawing/god-drawing-group.h
+include/libgoffice-0.3/goffice/drawing/god-drawing-renderer-gdk.h
+include/libgoffice-0.3/goffice/drawing/god-drawing-view.h
+include/libgoffice-0.3/goffice/drawing/god-drawing.h
+include/libgoffice-0.3/goffice/drawing/god-image-store.h
+include/libgoffice-0.3/goffice/drawing/god-image.h
+include/libgoffice-0.3/goffice/drawing/god-paragraph-attributes.h
+include/libgoffice-0.3/goffice/drawing/god-property-table.h
+include/libgoffice-0.3/goffice/drawing/god-shape.h
+include/libgoffice-0.3/goffice/drawing/god-text-model.h
+include/libgoffice-0.3/goffice/goffice-features.h
+include/libgoffice-0.3/goffice/goffice.h
+include/libgoffice-0.3/goffice/graph/goffice-graph.h
+include/libgoffice-0.3/goffice/graph/gog-axis-line-impl.h
+include/libgoffice-0.3/goffice/graph/gog-axis-line.h
+include/libgoffice-0.3/goffice/graph/gog-axis.h
+include/libgoffice-0.3/goffice/graph/gog-chart-impl.h
+include/libgoffice-0.3/goffice/graph/gog-chart.h
+include/libgoffice-0.3/goffice/graph/gog-control-foocanvas.h
+include/libgoffice-0.3/goffice/graph/gog-data-allocator.h
+include/libgoffice-0.3/goffice/graph/gog-data-set.h
+include/libgoffice-0.3/goffice/graph/gog-error-bar.h
+include/libgoffice-0.3/goffice/graph/gog-graph-impl.h
+include/libgoffice-0.3/goffice/graph/gog-graph.h
+include/libgoffice-0.3/goffice/graph/gog-grid-line.h
+include/libgoffice-0.3/goffice/graph/gog-grid.h
+include/libgoffice-0.3/goffice/graph/gog-guru.h
+include/libgoffice-0.3/goffice/graph/gog-label.h
+include/libgoffice-0.3/goffice/graph/gog-legend.h
+include/libgoffice-0.3/goffice/graph/gog-object-xml.h
+include/libgoffice-0.3/goffice/graph/gog-object.h
+include/libgoffice-0.3/goffice/graph/gog-outlined-object.h
+include/libgoffice-0.3/goffice/graph/gog-plot-engine.h
+include/libgoffice-0.3/goffice/graph/gog-plot-impl.h
+include/libgoffice-0.3/goffice/graph/gog-plot.h
+include/libgoffice-0.3/goffice/graph/gog-reg-curve.h
+include/libgoffice-0.3/goffice/graph/gog-renderer-cairo.h
+include/libgoffice-0.3/goffice/graph/gog-renderer-gnome-print.h
+include/libgoffice-0.3/goffice/graph/gog-renderer-impl.h
+include/libgoffice-0.3/goffice/graph/gog-renderer.h
+include/libgoffice-0.3/goffice/graph/gog-series-impl.h
+include/libgoffice-0.3/goffice/graph/gog-series-lines.h
+include/libgoffice-0.3/goffice/graph/gog-series.h
+include/libgoffice-0.3/goffice/graph/gog-smoothed-curve.h
+include/libgoffice-0.3/goffice/graph/gog-style.h
+include/libgoffice-0.3/goffice/graph/gog-styled-object.h
+include/libgoffice-0.3/goffice/graph/gog-theme.h
+include/libgoffice-0.3/goffice/graph/gog-trend-line.h
+include/libgoffice-0.3/goffice/graph/gog-view.h
+include/libgoffice-0.3/goffice/gtk/go-action-combo-color.h
+include/libgoffice-0.3/goffice/gtk/go-action-combo-pixmaps.h
+include/libgoffice-0.3/goffice/gtk/go-action-combo-stack.h
+include/libgoffice-0.3/goffice/gtk/go-action-combo-text.h
+include/libgoffice-0.3/goffice/gtk/go-charmap-sel.h
+include/libgoffice-0.3/goffice/gtk/go-color-group.h
+include/libgoffice-0.3/goffice/gtk/go-color-palette.h
+include/libgoffice-0.3/goffice/gtk/go-color-selector.h
+include/libgoffice-0.3/goffice/gtk/go-combo-box.h
+include/libgoffice-0.3/goffice/gtk/go-combo-color.h
+include/libgoffice-0.3/goffice/gtk/go-combo-pixmaps.h
+include/libgoffice-0.3/goffice/gtk/go-combo-text.h
+include/libgoffice-0.3/goffice/gtk/go-font-sel.h
+include/libgoffice-0.3/goffice/gtk/go-format-sel.h
+include/libgoffice-0.3/goffice/gtk/go-gradient-selector.h
+include/libgoffice-0.3/goffice/gtk/go-graph-widget.h
+include/libgoffice-0.3/goffice/gtk/go-line-selector.h
+include/libgoffice-0.3/goffice/gtk/go-locale-sel.h
+include/libgoffice-0.3/goffice/gtk/go-marker-selector.h
+include/libgoffice-0.3/goffice/gtk/go-optionmenu.h
+include/libgoffice-0.3/goffice/gtk/go-palette.h
+include/libgoffice-0.3/goffice/gtk/go-pattern-selector.h
+include/libgoffice-0.3/goffice/gtk/go-rotation-sel.h
+include/libgoffice-0.3/goffice/gtk/go-selector.h
+include/libgoffice-0.3/goffice/gtk/goffice-gtk.h
+include/libgoffice-0.3/goffice/ms-compat/go-ms-parser.h
+include/libgoffice-0.3/goffice/ms-compat/god-drawing-ms-client-handler.h
+include/libgoffice-0.3/goffice/ms-compat/god-drawing-ms.h
+include/libgoffice-0.3/goffice/ms-compat/god-image-ms.h
+include/libgoffice-0.3/goffice/utils/datetime.h
+include/libgoffice-0.3/goffice/utils/go-color.h
+include/libgoffice-0.3/goffice/utils/go-file.h
+include/libgoffice-0.3/goffice/utils/go-font.h
+include/libgoffice-0.3/goffice/utils/go-format.h
+include/libgoffice-0.3/goffice/utils/go-geometry.h
+include/libgoffice-0.3/goffice/utils/go-glib-extras.h
+include/libgoffice-0.3/goffice/utils/go-gradient.h
+include/libgoffice-0.3/goffice/utils/go-image.h
+include/libgoffice-0.3/goffice/utils/go-libxml-extras.h
+include/libgoffice-0.3/goffice/utils/go-line.h
+include/libgoffice-0.3/goffice/utils/go-locale.h
+include/libgoffice-0.3/goffice/utils/go-marker.h
+include/libgoffice-0.3/goffice/utils/go-math.h
+include/libgoffice-0.3/goffice/utils/go-pattern.h
+include/libgoffice-0.3/goffice/utils/go-rangefunc.h
+include/libgoffice-0.3/goffice/utils/go-regression.h
+include/libgoffice-0.3/goffice/utils/go-undo.h
+include/libgoffice-0.3/goffice/utils/go-units.h
+include/libgoffice-0.3/goffice/utils/goffice-utils.h
+include/libgoffice-0.3/goffice/utils/regutf8.h
lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.a
lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.la
lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.so
@@ -154,6 +165,8 @@ lib/goffice/%%VERSION%%/plugins/plot_surface/surface.a
lib/goffice/%%VERSION%%/plugins/plot_surface/surface.la
lib/goffice/%%VERSION%%/plugins/plot_surface/surface.so
lib/goffice/%%VERSION%%/plugins/plot_xy/gog-bubble-prefs.glade
+lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-color-prefs.glade
+lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-series-prefs.glade
lib/goffice/%%VERSION%%/plugins/plot_xy/plot-types.xml
lib/goffice/%%VERSION%%/plugins/plot_xy/plugin.xml
lib/goffice/%%VERSION%%/plugins/plot_xy/xy.a
@@ -169,172 +182,319 @@ lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.la
lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.so
lib/goffice/%%VERSION%%/plugins/reg_logfit/plugin.xml
lib/goffice/%%VERSION%%/plugins/reg_logfit/reg-types.xml
-lib/libgoffice-1.a
-lib/libgoffice-1.la
-lib/libgoffice-1.so
-lib/libgoffice-1.so.2
-libdata/pkgconfig/libgoffice-1.pc
+lib/goffice/%%VERSION%%/plugins/smoothing/gog-exp-smooth.glade
+lib/goffice/%%VERSION%%/plugins/smoothing/gog-moving-avg.glade
+lib/goffice/%%VERSION%%/plugins/smoothing/plugin.xml
+lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.a
+lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.la
+lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so
+lib/goffice/%%VERSION%%/plugins/smoothing/types.xml
+lib/libgoffice-0.a
+lib/libgoffice-0.la
+lib/libgoffice-0.so
+lib/libgoffice-0.so.3
+libdata/pkgconfig/libgoffice-0.3.pc
+%%DOCSDIR%%/GOData.html
+%%DOCSDIR%%/GODataMatrix.html
+%%DOCSDIR%%/GODataScalar.html
+%%DOCSDIR%%/GODataVector.html
+%%DOCSDIR%%/GogAxis.html
+%%DOCSDIR%%/GogAxisLine.html
+%%DOCSDIR%%/GogChart.html
+%%DOCSDIR%%/GogDataAllocator.html
+%%DOCSDIR%%/GogDataset.html
+%%DOCSDIR%%/GogErrorBar.html
+%%DOCSDIR%%/GogGraph.html
+%%DOCSDIR%%/GogGrid.html
+%%DOCSDIR%%/GogGridLine.html
+%%DOCSDIR%%/GogLabel.html
+%%DOCSDIR%%/GogLegend.html
+%%DOCSDIR%%/GogObject.html
+%%DOCSDIR%%/GogOutlinedObject.html
+%%DOCSDIR%%/GogPersist.html
+%%DOCSDIR%%/GogPlot.html
+%%DOCSDIR%%/GogRegCurve.html
+%%DOCSDIR%%/GogRegEqn.html
+%%DOCSDIR%%/GogRenderer.html
+%%DOCSDIR%%/GogSeries.html
+%%DOCSDIR%%/GogSeriesLines.html
+%%DOCSDIR%%/GogStyle.html
+%%DOCSDIR%%/GogStyledObject.html
+%%DOCSDIR%%/GogView.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/ch05.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/ch07.html
+%%DOCSDIR%%/ch08.html
+%%DOCSDIR%%/ch09.html
+%%DOCSDIR%%/ch10.html
+%%DOCSDIR%%/ch11.html
+%%DOCSDIR%%/goffice-GOComboBox.html
+%%DOCSDIR%%/goffice-GOComboColor.html
+%%DOCSDIR%%/goffice-GOComponent.html
+%%DOCSDIR%%/goffice-GODoc.html
+%%DOCSDIR%%/goffice-GODocControl.html
+%%DOCSDIR%%/goffice-GOPluginLoader.html
+%%DOCSDIR%%/goffice-GOPluginService.html
+%%DOCSDIR%%/goffice-GOService.html
+%%DOCSDIR%%/goffice-GoApp.html
+%%DOCSDIR%%/goffice-GoCharmapSel.html
+%%DOCSDIR%%/goffice-GoCmdContext.html
+%%DOCSDIR%%/goffice-GoColor.html
+%%DOCSDIR%%/goffice-GoComboPixmaps.html
+%%DOCSDIR%%/goffice-GoComboText.html
+%%DOCSDIR%%/goffice-GoComponentFactory.html
+%%DOCSDIR%%/goffice-GoFontSel.html
+%%DOCSDIR%%/goffice-GoFormatSel.html
+%%DOCSDIR%%/goffice-GoGeometry.html
+%%DOCSDIR%%/goffice-GoGlibExtras.html
+%%DOCSDIR%%/goffice-GoLibxmlExtras.html
+%%DOCSDIR%%/goffice-GoLocaleSel.html
+%%DOCSDIR%%/goffice-GoObject.html
+%%DOCSDIR%%/goffice-GoOptionMenu.html
+%%DOCSDIR%%/goffice-GoPluginLoaderModule.html
+%%DOCSDIR%%/goffice-GoRotationSel.html
+%%DOCSDIR%%/goffice-GoSearchReplace.html
+%%DOCSDIR%%/goffice-GogAxisMap.html
+%%DOCSDIR%%/goffice-GogChartMap.html
+%%DOCSDIR%%/goffice-GogControlFooCanvas.html
+%%DOCSDIR%%/goffice-GogEditor.html
+%%DOCSDIR%%/goffice-GogGuru.html
+%%DOCSDIR%%/goffice-GogPlotEngine.html
+%%DOCSDIR%%/goffice-GogTool.html
+%%DOCSDIR%%/goffice-Math.html
+%%DOCSDIR%%/goffice-Ranges.html
+%%DOCSDIR%%/goffice-RegUTF8.html
+%%DOCSDIR%%/goffice-Regressions.html
+%%DOCSDIR%%/goffice-Units.html
+%%DOCSDIR%%/goffice-go-format.html
+%%DOCSDIR%%/goffice-go-gradient.html
+%%DOCSDIR%%/goffice-go-line.html
+%%DOCSDIR%%/goffice-go-marker.html
+%%DOCSDIR%%/goffice-go-pattern.html
+%%DOCSDIR%%/goffice-go-plugin.html
+%%DOCSDIR%%/goffice-gog-theme.html
+%%DOCSDIR%%/goffice.devhelp
+%%DOCSDIR%%/goffice.devhelp2
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/pt01.html
+%%DOCSDIR%%/pt02.html
+%%DOCSDIR%%/pt03.html
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
share/gnome/goffice/%%VERSION%%/glade/go-font-sel.glade
share/gnome/goffice/%%VERSION%%/glade/go-format-sel.glade
+share/gnome/goffice/%%VERSION%%/glade/go-image-save-dialog-extra.glade
share/gnome/goffice/%%VERSION%%/glade/go-rotation-sel.glade
share/gnome/goffice/%%VERSION%%/glade/gog-axis-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-chart-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-error-bar-prefs.glade
+share/gnome/goffice/%%VERSION%%/glade/gog-graph-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-guru-type-selector.glade
share/gnome/goffice/%%VERSION%%/glade/gog-guru.glade
share/gnome/goffice/%%VERSION%%/glade/gog-object-prefs.glade
+share/gnome/goffice/%%VERSION%%/glade/gog-plot-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-reg-curve-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
share/gnome/goffice/%%VERSION%%/glade/gog-style-prefs.glade
share/gnome/goffice/%%VERSION%%/patterns/svg-patterns.xml
-share/gnome/pixmaps/goffice/area.xpm
-share/gnome/pixmaps/goffice/bar-hboth.png
-share/gnome/pixmaps/goffice/bar-hminus.png
-share/gnome/pixmaps/goffice/bar-hplus.png
-share/gnome/pixmaps/goffice/bar-none.png
-share/gnome/pixmaps/goffice/bar-vboth.png
-share/gnome/pixmaps/goffice/bar-vminus.png
-share/gnome/pixmaps/goffice/bar-vplus.png
-share/gnome/pixmaps/goffice/bar.xpm
-share/gnome/pixmaps/goffice/boxplot.xpm
-share/gnome/pixmaps/goffice/bubble.xpm
-share/gnome/pixmaps/goffice/chart_area_1_1.png
-share/gnome/pixmaps/goffice/chart_area_1_2.png
-share/gnome/pixmaps/goffice/chart_area_1_3.png
-share/gnome/pixmaps/goffice/chart_bar_1_1.png
-share/gnome/pixmaps/goffice/chart_bar_1_2.png
-share/gnome/pixmaps/goffice/chart_bar_1_3.png
-share/gnome/pixmaps/goffice/chart_bar_2_1.png
-share/gnome/pixmaps/goffice/chart_bar_2_2.png
-share/gnome/pixmaps/goffice/chart_bar_2_3.png
-share/gnome/pixmaps/goffice/chart_boxplot_1_1.png
-share/gnome/pixmaps/goffice/chart_bubble_1_1.png
-share/gnome/pixmaps/goffice/chart_column_1_1.png
-share/gnome/pixmaps/goffice/chart_column_1_2.png
-share/gnome/pixmaps/goffice/chart_column_1_3.png
-share/gnome/pixmaps/goffice/chart_column_2_1.png
-share/gnome/pixmaps/goffice/chart_column_2_2.png
-share/gnome/pixmaps/goffice/chart_column_2_3.png
-share/gnome/pixmaps/goffice/chart_column_3_1.png
-share/gnome/pixmaps/goffice/chart_cone_1_1.png
-share/gnome/pixmaps/goffice/chart_cone_1_2.png
-share/gnome/pixmaps/goffice/chart_cone_1_3.png
-share/gnome/pixmaps/goffice/chart_cone_2_1.png
-share/gnome/pixmaps/goffice/chart_cone_2_2.png
-share/gnome/pixmaps/goffice/chart_cone_2_3.png
-share/gnome/pixmaps/goffice/chart_cone_3_1.png
-share/gnome/pixmaps/goffice/chart_contour_1_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_2.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_3.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_2.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_3.png
-share/gnome/pixmaps/goffice/chart_cylinder_3_1.png
-share/gnome/pixmaps/goffice/chart_dropbar_1_1.png
-share/gnome/pixmaps/goffice/chart_dropbar_1_2.png
-share/gnome/pixmaps/goffice/chart_line_1_1.png
-share/gnome/pixmaps/goffice/chart_line_1_2.png
-share/gnome/pixmaps/goffice/chart_line_1_3.png
-share/gnome/pixmaps/goffice/chart_line_2_1.png
-share/gnome/pixmaps/goffice/chart_line_2_2.png
-share/gnome/pixmaps/goffice/chart_line_2_3.png
-share/gnome/pixmaps/goffice/chart_line_3_1.png
-share/gnome/pixmaps/goffice/chart_minmax_1_1.png
-share/gnome/pixmaps/goffice/chart_minmax_1_2.png
-share/gnome/pixmaps/goffice/chart_minmax_2_1.png
-share/gnome/pixmaps/goffice/chart_minmax_2_2.png
-share/gnome/pixmaps/goffice/chart_pie_1_1.png
-share/gnome/pixmaps/goffice/chart_pie_1_2.png
-share/gnome/pixmaps/goffice/chart_pie_1_3.png
-share/gnome/pixmaps/goffice/chart_pie_2_1.png
-share/gnome/pixmaps/goffice/chart_pie_2_2.png
-share/gnome/pixmaps/goffice/chart_pie_2_3.png
-share/gnome/pixmaps/goffice/chart_polar_1_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_2.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_3.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_2.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_3.png
-share/gnome/pixmaps/goffice/chart_pyramid_3_1.png
-share/gnome/pixmaps/goffice/chart_radar_1_1.png
-share/gnome/pixmaps/goffice/chart_radar_1_2.png
-share/gnome/pixmaps/goffice/chart_radar_1_3.png
-share/gnome/pixmaps/goffice/chart_ring_1_1.png
-share/gnome/pixmaps/goffice/chart_ring_1_2.png
-share/gnome/pixmaps/goffice/chart_scatter_1_1.png
-share/gnome/pixmaps/goffice/chart_scatter_2_1.png
-share/gnome/pixmaps/goffice/chart_scatter_2_2.png
-share/gnome/pixmaps/goffice/chart_scatter_3_1.png
-share/gnome/pixmaps/goffice/chart_scatter_3_2.png
-share/gnome/pixmaps/goffice/chart_scatter_3_3.png
-share/gnome/pixmaps/goffice/chart_stock_1_1.png
-share/gnome/pixmaps/goffice/chart_stock_1_2.png
-share/gnome/pixmaps/goffice/chart_stock_2_1.png
-share/gnome/pixmaps/goffice/chart_stock_2_2.png
-share/gnome/pixmaps/goffice/column.xpm
-share/gnome/pixmaps/goffice/doughnut.xpm
-share/gnome/pixmaps/goffice/dropbar.xpm
-share/gnome/pixmaps/goffice/linegraph.xpm
-share/gnome/pixmaps/goffice/minmax.xpm
-share/gnome/pixmaps/goffice/pie.xpm
-share/gnome/pixmaps/goffice/polar.png
-share/gnome/pixmaps/goffice/radar.xpm
-share/gnome/pixmaps/goffice/scatter.xpm
-share/gnome/pixmaps/goffice/stock.xpm
-share/gnome/pixmaps/goffice/surface.xpm
-share/locale/am/LC_MESSAGES/goffice.mo
-share/locale/az/LC_MESSAGES/goffice.mo
-share/locale/bg/LC_MESSAGES/goffice.mo
-share/locale/ca/LC_MESSAGES/goffice.mo
-share/locale/cs/LC_MESSAGES/goffice.mo
-share/locale/da/LC_MESSAGES/goffice.mo
-share/locale/de/LC_MESSAGES/goffice.mo
-share/locale/el/LC_MESSAGES/goffice.mo
-share/locale/en_CA/LC_MESSAGES/goffice.mo
-share/locale/en_GB/LC_MESSAGES/goffice.mo
-share/locale/es/LC_MESSAGES/goffice.mo
-share/locale/et/LC_MESSAGES/goffice.mo
-share/locale/fi/LC_MESSAGES/goffice.mo
-share/locale/fr/LC_MESSAGES/goffice.mo
-share/locale/ga/LC_MESSAGES/goffice.mo
-share/locale/gl/LC_MESSAGES/goffice.mo
-share/locale/he/LC_MESSAGES/goffice.mo
-share/locale/hr/LC_MESSAGES/goffice.mo
-share/locale/hu/LC_MESSAGES/goffice.mo
-share/locale/it/LC_MESSAGES/goffice.mo
-share/locale/ja/LC_MESSAGES/goffice.mo
-share/locale/ko/LC_MESSAGES/goffice.mo
-share/locale/lv/LC_MESSAGES/goffice.mo
-share/locale/ml/LC_MESSAGES/goffice.mo
-share/locale/mr/LC_MESSAGES/goffice.mo
-share/locale/ms/LC_MESSAGES/goffice.mo
-share/locale/nb/LC_MESSAGES/goffice.mo
-share/locale/nl/LC_MESSAGES/goffice.mo
-share/locale/nn/LC_MESSAGES/goffice.mo
-share/locale/no/LC_MESSAGES/goffice.mo
-share/locale/pl/LC_MESSAGES/goffice.mo
-share/locale/pt/LC_MESSAGES/goffice.mo
-share/locale/pt_BR/LC_MESSAGES/goffice.mo
-share/locale/ro/LC_MESSAGES/goffice.mo
-share/locale/ru/LC_MESSAGES/goffice.mo
-share/locale/sk/LC_MESSAGES/goffice.mo
-share/locale/sr/LC_MESSAGES/goffice.mo
-share/locale/sr@Latn/LC_MESSAGES/goffice.mo
-share/locale/sv/LC_MESSAGES/goffice.mo
-share/locale/tr/LC_MESSAGES/goffice.mo
-share/locale/uk/LC_MESSAGES/goffice.mo
-share/locale/vi/LC_MESSAGES/goffice.mo
-share/locale/zh_CN/LC_MESSAGES/goffice.mo
-share/locale/zh_TW/LC_MESSAGES/goffice.mo
+share/gnome/pixmaps/goffice/%%VERSION%%/area.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-hboth.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-hminus.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-hplus.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-none.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-vboth.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-vminus.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar-vplus.png
+share/gnome/pixmaps/goffice/%%VERSION%%/bar.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/boxplot.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/bubble.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png
+share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png
+share/gnome/pixmaps/goffice/%%VERSION%%/color.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/column.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/doughnut.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/dropbar.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/hist.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/linegraph.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/minmax.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/pie.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/polar.png
+share/gnome/pixmaps/goffice/%%VERSION%%/radar.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/scatter.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/stock.xpm
+share/gnome/pixmaps/goffice/%%VERSION%%/surface.xpm
+share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ca/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/et/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/he/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/hr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/lv/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrm share/gnome/pixmaps/goffice/%%VERSION%%
@dirrm share/gnome/pixmaps/goffice
@dirrm share/gnome/goffice/%%VERSION%%/patterns
@dirrm share/gnome/goffice/%%VERSION%%/glade
@dirrm share/gnome/goffice/%%VERSION%%
@dirrm share/gnome/goffice
+@dirrm %%DOCSDIR%%
+@dirrm lib/goffice/%%VERSION%%/plugins/smoothing
@dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit
@dirrm lib/goffice/%%VERSION%%/plugins/reg_linear
@dirrm lib/goffice/%%VERSION%%/plugins/plot_xy
@@ -346,15 +506,15 @@ share/locale/zh_TW/LC_MESSAGES/goffice.mo
@dirrm lib/goffice/%%VERSION%%/plugins
@dirrm lib/goffice/%%VERSION%%
@dirrm lib/goffice
-@dirrm include/libgoffice-1/goffice/utils
-@dirrm include/libgoffice-1/goffice/ms-compat
-@dirrm include/libgoffice-1/goffice/gtk
-@dirrm include/libgoffice-1/goffice/graph
-@dirrm include/libgoffice-1/goffice/drawing
-@dirrm include/libgoffice-1/goffice/data
-@dirrm include/libgoffice-1/goffice/cut-n-paste/pcre
-@dirrm include/libgoffice-1/goffice/cut-n-paste/foocanvas
-@dirrm include/libgoffice-1/goffice/cut-n-paste
-@dirrm include/libgoffice-1/goffice/app
-@dirrm include/libgoffice-1/goffice
-@dirrm include/libgoffice-1
+@dirrm include/libgoffice-0.3/goffice/utils
+@dirrm include/libgoffice-0.3/goffice/ms-compat
+@dirrm include/libgoffice-0.3/goffice/gtk
+@dirrm include/libgoffice-0.3/goffice/graph
+@dirrm include/libgoffice-0.3/goffice/drawing
+@dirrm include/libgoffice-0.3/goffice/data
+@dirrm include/libgoffice-0.3/goffice/cut-n-paste/foocanvas
+@dirrm include/libgoffice-0.3/goffice/cut-n-paste
+@dirrm include/libgoffice-0.3/goffice/component
+@dirrm include/libgoffice-0.3/goffice/app
+@dirrm include/libgoffice-0.3/goffice
+@dirrm include/libgoffice-0.3
diff --git a/devel/libYGP/Makefile b/devel/libYGP/Makefile
index da7ac9a..8bbe625 100644
--- a/devel/libYGP/Makefile
+++ b/devel/libYGP/Makefile
@@ -27,9 +27,9 @@ CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --with-gmp
.if ${PORTNAME:M*XGP}
LIB_DEPENDS+= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
- gtkhtml-3.8.15:${PORTSDIR}/www/gtkhtml3 \
YGP-${PORTVERSION}.0:${PORTSDIR}/devel/libYGP
PLIST_SUB+= YGP="@comment " XGP=""
+USE_GGNOME+= gtkhtml3
CFG_PATCH+= s/mozembed/mozembedNO/g;
XGP_PATCH+= s/(^@AM.*)?GtkMozViewer(.lo|.c|.Plo@am__quote@)//;
MKIN_PATCH+= s/^(SUBDIRS = ).*$$/\1XGP/;
@@ -47,6 +47,8 @@ post-patch:
${XARGS} -0 ${REINPLACE_CMD} -e 's/ygp-cfg/xgp-cfg/g'
@${CP} ${WRKSRC}/ygp-cfg.h ${WRKSRC}/xgp-cfg.h
@${CP} ${WRKSRC}/ygp-cfg.h.in ${WRKSRC}/xgp-cfg.h.in
+ @${REINPLACE_CMD} -e 's|libgtkhtml-3.8|libgtkhtml-3.14|g' \
+ ${WRKSRC}/configure
.endif
post-install:
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 90e73ac..de67f05 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libbonobo/Makefile,v 1.52 2006/09/10 00:51:08 mezz Exp $
+# $MCom: ports/devel/libbonobo/Makefile,v 1.58 2007/03/12 17:59:36 marcus Exp $
#
PORTNAME= libbonobo
-PORTVERSION= 2.16.0
-PORTREVISION?= 1
+PORTVERSION= 2.18.0
+PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -31,7 +31,8 @@ GNU_CONFIGURE= yes
USE_PERL5= yes
USE_GNOME= gnomehack intlhack libxml2 orbit2 referencehack
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
- --disable-gtk-doc
+ --disable-gtk-doc \
+ --mandir=${PREFIX}/man
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
MAKE_ENV= gnomelocaledir=${PREFIX}/share/locale
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 9fb497d..9e0d3cf 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libbonobo-2.16.0.tar.bz2) = 30cdcf2b5316888f10fea6362b38499c
-SHA256 (gnome2/libbonobo-2.16.0.tar.bz2) = d8124bedaec7e67dd3fbf12a4a6bcb4d76235128b2784a59219174671a8f63e4
-SIZE (gnome2/libbonobo-2.16.0.tar.bz2) = 1406355
+MD5 (gnome2/libbonobo-2.18.0.tar.bz2) = 8f0676e63420abf622f799cdd24ed9cc
+SHA256 (gnome2/libbonobo-2.18.0.tar.bz2) = 55b37d7863683d6947bdff6da7caec9ddd8a8001aac3e97a7b9d5e91898685aa
+SIZE (gnome2/libbonobo-2.18.0.tar.bz2) = 1441461
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index 676939f..d1939c1 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -108,6 +108,7 @@ share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo
share/locale/cy/LC_MESSAGES/libbonobo-2.0.mo
share/locale/da/LC_MESSAGES/libbonobo-2.0.mo
share/locale/de/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/dz/LC_MESSAGES/libbonobo-2.0.mo
share/locale/el/LC_MESSAGES/libbonobo-2.0.mo
share/locale/en_CA/LC_MESSAGES/libbonobo-2.0.mo
share/locale/en_GB/LC_MESSAGES/libbonobo-2.0.mo
@@ -135,6 +136,7 @@ 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
+share/locale/mg/LC_MESSAGES/libbonobo-2.0.mo
share/locale/mk/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ml/LC_MESSAGES/libbonobo-2.0.mo
share/locale/mn/LC_MESSAGES/libbonobo-2.0.mo
@@ -210,6 +212,8 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
@dirrmtry share/locale/nn
@dirrmtry share/locale/ne/LC_MESSAGES
@dirrmtry share/locale/ne
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/li/LC_MESSAGES
@dirrmtry share/locale/li
@dirrmtry share/locale/ku/LC_MESSAGES
@@ -222,6 +226,8 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
@dirrmtry share/locale/fi
@dirrmtry share/locale/el/LC_MESSAGES
@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
new file mode 100644
index 0000000..d9a86e6
--- /dev/null
+++ b/devel/liboobs/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for: liboobs
+# Date created: 2006-06-06
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/liboobs/Makefile,v 1.18 2007/03/12 12:34:37 ahze Exp $
+
+PORTNAME= liboobs
+PORTVERSION= 2.18.0
+CATEGORIES= devel gnome
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Wrapping library to the System Tools Backends
+
+BUILD_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/system-tools-backends.conf:${PORTSDIR}/sysutils/system-tools-backends
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+RUN_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/system-tools-backends.conf:${PORTSDIR}/sysutils/system-tools-backends
+
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_GNOME= gnomehack glib20
+USE_LDCONFIG= yes
+CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
+
+.include <bsd.port.mk>
diff --git a/devel/liboobs/distinfo b/devel/liboobs/distinfo
new file mode 100644
index 0000000..f99cb9b
--- /dev/null
+++ b/devel/liboobs/distinfo
@@ -0,0 +1,3 @@
+MD5 (liboobs-2.18.0.tar.bz2) = aa60664dbb2f4886d92f5dc8d3e4099a
+SHA256 (liboobs-2.18.0.tar.bz2) = 28f496c5326eb953b976fba095b184aae1d2871fa77bd580073717524552fd44
+SIZE (liboobs-2.18.0.tar.bz2) = 315275
diff --git a/devel/liboobs/files/patch-src_oobs-group.c b/devel/liboobs/files/patch-src_oobs-group.c
new file mode 100644
index 0000000..d863f03
--- /dev/null
+++ b/devel/liboobs/files/patch-src_oobs-group.c
@@ -0,0 +1,25 @@
+--- src/oobs-group.c.orig Fri Sep 15 18:41:04 2006
++++ src/oobs-group.c Tue Oct 31 23:12:40 2006
+@@ -18,7 +18,12 @@
+ * Authors: Carlos Garnacho Parro <carlosg@gnome.org>
+ */
+
++#if defined(HAVE_CONFIG_H)
++#include <config.h>
++#endif
++
+ #include <glib-object.h>
++#include <unistd.h>
+ #include "oobs-session.h"
+ #include "oobs-group.h"
+ #include "oobs-user.h"
+@@ -27,7 +32,9 @@
+ #include "oobs-groupsconfig-private.h"
+ #include "oobs-defines.h"
+ #include "utils.h"
++#ifdef HAVE_CRYPT_H
+ #include <crypt.h>
++#endif
+
+ #define OOBS_GROUP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), OOBS_TYPE_GROUP, OobsGroupPrivate))
+
diff --git a/devel/liboobs/files/patch-src_oobs-user.c b/devel/liboobs/files/patch-src_oobs-user.c
new file mode 100644
index 0000000..d7037a2
--- /dev/null
+++ b/devel/liboobs/files/patch-src_oobs-user.c
@@ -0,0 +1,23 @@
+--- src/oobs-user.c.orig Fri Sep 15 19:16:41 2006
++++ src/oobs-user.c Tue Oct 31 23:12:29 2006
+@@ -18,6 +18,10 @@
+ * Authors: Carlos Garnacho Parro <carlosg@gnome.org>
+ */
+
++#if defined(HAVE_CONFIG_H)
++#include <config.h>
++#endif
++
+ #include <glib-object.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -30,7 +34,9 @@
+ #include "oobs-group.h"
+ #include "oobs-defines.h"
+ #include "utils.h"
++#ifdef HAVE_CRYPT_H
+ #include <crypt.h>
++#endif
+
+ #define OOBS_USER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), OOBS_TYPE_USER, OobsUserPrivate))
+
diff --git a/devel/liboobs/pkg-descr b/devel/liboobs/pkg-descr
new file mode 100644
index 0000000..ff76653
--- /dev/null
+++ b/devel/liboobs/pkg-descr
@@ -0,0 +1 @@
+Wrapping library to the System Tools Backends
diff --git a/devel/liboobs/pkg-plist b/devel/liboobs/pkg-plist
new file mode 100644
index 0000000..35fe3da
--- /dev/null
+++ b/devel/liboobs/pkg-plist
@@ -0,0 +1,81 @@
+include/liboobs-1.0/oobs/oobs-group.h
+include/liboobs-1.0/oobs/oobs-groupsconfig.h
+include/liboobs-1.0/oobs/oobs-hostsconfig.h
+include/liboobs-1.0/oobs/oobs-iface-ethernet.h
+include/liboobs-1.0/oobs/oobs-iface-irlan.h
+include/liboobs-1.0/oobs/oobs-iface-isdn.h
+include/liboobs-1.0/oobs/oobs-iface-modem.h
+include/liboobs-1.0/oobs/oobs-iface-plip.h
+include/liboobs-1.0/oobs/oobs-iface-wireless.h
+include/liboobs-1.0/oobs/oobs-iface.h
+include/liboobs-1.0/oobs/oobs-ifacesconfig.h
+include/liboobs-1.0/oobs/oobs-list.h
+include/liboobs-1.0/oobs/oobs-nfsconfig.h
+include/liboobs-1.0/oobs/oobs-ntpconfig.h
+include/liboobs-1.0/oobs/oobs-ntpserver.h
+include/liboobs-1.0/oobs/oobs-object.h
+include/liboobs-1.0/oobs/oobs-result.h
+include/liboobs-1.0/oobs/oobs-service.h
+include/liboobs-1.0/oobs/oobs-servicesconfig.h
+include/liboobs-1.0/oobs/oobs-session.h
+include/liboobs-1.0/oobs/oobs-share-nfs.h
+include/liboobs-1.0/oobs/oobs-share-smb.h
+include/liboobs-1.0/oobs/oobs-share.h
+include/liboobs-1.0/oobs/oobs-smbconfig.h
+include/liboobs-1.0/oobs/oobs-statichost.h
+include/liboobs-1.0/oobs/oobs-timeconfig.h
+include/liboobs-1.0/oobs/oobs-user.h
+include/liboobs-1.0/oobs/oobs-usersconfig.h
+include/liboobs-1.0/oobs/oobs.h
+lib/liboobs-1.a
+lib/liboobs-1.la
+lib/liboobs-1.so
+lib/liboobs-1.so.3
+libdata/pkgconfig/liboobs-1.pc
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/ch05.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/ch07.html
+%%DOCSDIR%%/ch08.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/liboobs-OobsGroup.html
+%%DOCSDIR%%/liboobs-OobsGroupsConfig.html
+%%DOCSDIR%%/liboobs-OobsHostsConfig.html
+%%DOCSDIR%%/liboobs-OobsIface.html
+%%DOCSDIR%%/liboobs-OobsIfaceEthernet.html
+%%DOCSDIR%%/liboobs-OobsIfaceIRLan.html
+%%DOCSDIR%%/liboobs-OobsIfaceISDN.html
+%%DOCSDIR%%/liboobs-OobsIfaceModem.html
+%%DOCSDIR%%/liboobs-OobsIfacePlip.html
+%%DOCSDIR%%/liboobs-OobsIfaceWireless.html
+%%DOCSDIR%%/liboobs-OobsIfacesConfig.html
+%%DOCSDIR%%/liboobs-OobsList.html
+%%DOCSDIR%%/liboobs-OobsNFSConfig.html
+%%DOCSDIR%%/liboobs-OobsNTPConfig.html
+%%DOCSDIR%%/liboobs-OobsNTPServer.html
+%%DOCSDIR%%/liboobs-OobsObject.html
+%%DOCSDIR%%/liboobs-OobsSMBConfig.html
+%%DOCSDIR%%/liboobs-OobsService.html
+%%DOCSDIR%%/liboobs-OobsServicesConfig.html
+%%DOCSDIR%%/liboobs-OobsSession.html
+%%DOCSDIR%%/liboobs-OobsShare.html
+%%DOCSDIR%%/liboobs-OobsShareNFS.html
+%%DOCSDIR%%/liboobs-OobsShareSMB.html
+%%DOCSDIR%%/liboobs-OobsStaticHost.html
+%%DOCSDIR%%/liboobs-OobsTimeConfig.html
+%%DOCSDIR%%/liboobs-OobsUser.html
+%%DOCSDIR%%/liboobs-OobsUsersConfig.html
+%%DOCSDIR%%/liboobs.devhelp
+%%DOCSDIR%%/liboobs.devhelp2
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+@dirrm %%DOCSDIR%%
+@dirrm include/liboobs-1.0/oobs
+@dirrm include/liboobs-1.0
diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index c62b179..3dd972f 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -3,10 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/devel/py-dbus/Makefile,v 1.8 2007/03/01 05:52:46 marcus Exp $
PORTNAME= dbus
-PORTVERSION= 0.71
+PORTVERSION= 0.80.2
+PORTREVISION= 1
CATEGORIES= devel gnome python
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -15,17 +16,23 @@ DISTNAME= ${PORTNAME}-python-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Python bindings for the D-BUS messaging system
-BUILD_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex \
- ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+USE_GNOME= gnomehack gnometarget
USE_PYTHON= yes
USE_GMAKE= yes
-USE_PYDISTUTILS=yes
+USE_AUTOTOOLS= libtool:15
+
+DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
+EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
post-install:
- @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/dbus
- @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/dbus
+.if defined(NOPORTDOCS)
+ @${RM} -rf ${PREFIX}/share/doc/dbus-python
+.else
+ @${MV} ${PREFIX}/share/doc/dbus-python ${DOCSDIR} && \
+ ${MKDIR} ${EXAMPLESDIR} && \
+ ${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
+.endif
.include <bsd.port.mk>
diff --git a/devel/py-dbus/distinfo b/devel/py-dbus/distinfo
index 3a92835..d7de00f 100644
--- a/devel/py-dbus/distinfo
+++ b/devel/py-dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-python-0.71.tar.gz) = ee893bc87b784a8c2285f5041b5e7033
-SHA256 (dbus-python-0.71.tar.gz) = 4af7a60f65cb02dabbcdf0cb6ca6f659932eb13c2533f6e1dbdab6e3700a2c57
-SIZE (dbus-python-0.71.tar.gz) = 137613
+MD5 (dbus-python-0.80.2.tar.gz) = 2807bc85215c995bd595e01edd9d2077
+SHA256 (dbus-python-0.80.2.tar.gz) = 501485c24c4b3e92c5db44081633cebf39689dbfdf676c25b1cb6e061438ebe4
+SIZE (dbus-python-0.80.2.tar.gz) = 453499
diff --git a/devel/py-dbus/pkg-plist b/devel/py-dbus/pkg-plist
index 76158ca..7ebebc4 100644
--- a/devel/py-dbus/pkg-plist
+++ b/devel/py-dbus/pkg-plist
@@ -1,14 +1,36 @@
+include/dbus-1.0/dbus/dbus-python.h
+libdata/pkgconfig/dbus-python.pc
+%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.txt
+%%PORTDOCS%%%%DOCSDIR%%/HACKING.txt
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/tutorial.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/example-async-client.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/example-client.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/example-service.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/example-signal-emitter.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/example-signal-recipient.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/list-system-services.py
+%%PYTHON_SITELIBDIR%%/_dbus_bindings.la
+%%PYTHON_SITELIBDIR%%/_dbus_bindings.so
+%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.la
+%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.so
%%PYTHON_SITELIBDIR%%/dbus/__init__.py
%%PYTHON_SITELIBDIR%%/dbus/__init__.pyc
%%PYTHON_SITELIBDIR%%/dbus/__init__.pyo
%%PYTHON_SITELIBDIR%%/dbus/_dbus.py
%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyc
%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyo
-%%PYTHON_SITELIBDIR%%/dbus/_util.py
-%%PYTHON_SITELIBDIR%%/dbus/_util.pyc
-%%PYTHON_SITELIBDIR%%/dbus/_util.pyo
-%%PYTHON_SITELIBDIR%%/dbus/dbus_bindings.so
-%%PYTHON_SITELIBDIR%%/dbus/dbus_glib_bindings.so
+%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.py
+%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyc
+%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyo
+%%PYTHON_SITELIBDIR%%/dbus/_version.py
+%%PYTHON_SITELIBDIR%%/dbus/_version.pyc
+%%PYTHON_SITELIBDIR%%/dbus/_version.pyo
+%%PYTHON_SITELIBDIR%%/dbus/dbus_bindings.py
+%%PYTHON_SITELIBDIR%%/dbus/dbus_bindings.pyc
+%%PYTHON_SITELIBDIR%%/dbus/dbus_bindings.pyo
%%PYTHON_SITELIBDIR%%/dbus/decorators.py
%%PYTHON_SITELIBDIR%%/dbus/decorators.pyc
%%PYTHON_SITELIBDIR%%/dbus/decorators.pyo
@@ -18,12 +40,15 @@
%%PYTHON_SITELIBDIR%%/dbus/glib.py
%%PYTHON_SITELIBDIR%%/dbus/glib.pyc
%%PYTHON_SITELIBDIR%%/dbus/glib.pyo
-%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.py
-%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.pyc
-%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.pyo
-%%PYTHON_SITELIBDIR%%/dbus/matchrules.py
-%%PYTHON_SITELIBDIR%%/dbus/matchrules.pyc
-%%PYTHON_SITELIBDIR%%/dbus/matchrules.pyo
+%%PYTHON_SITELIBDIR%%/dbus/lowlevel.py
+%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyc
+%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyo
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.py
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.py
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.pyc
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.pyo
%%PYTHON_SITELIBDIR%%/dbus/proxies.py
%%PYTHON_SITELIBDIR%%/dbus/proxies.pyc
%%PYTHON_SITELIBDIR%%/dbus/proxies.pyo
@@ -33,4 +58,10 @@
%%PYTHON_SITELIBDIR%%/dbus/types.py
%%PYTHON_SITELIBDIR%%/dbus/types.pyc
%%PYTHON_SITELIBDIR%%/dbus/types.pyo
+%%PYTHON_SITELIBDIR%%/dbus_bindings.py
+%%PYTHON_SITELIBDIR%%/dbus_bindings.pyc
+%%PYTHON_SITELIBDIR%%/dbus_bindings.pyo
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/dbus/mainloop
@dirrm %%PYTHON_SITELIBDIR%%/dbus
diff --git a/devel/py-gamin/Makefile b/devel/py-gamin/Makefile
index 2d71d38..38dc560 100644
--- a/devel/py-gamin/Makefile
+++ b/devel/py-gamin/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= devel python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-gamin/pkg-plist b/devel/py-gamin/pkg-plist
index 0c44fbb..2803028 100644
--- a/devel/py-gamin/pkg-plist
+++ b/devel/py-gamin/pkg-plist
@@ -1,6 +1,4 @@
-lib/%%PYTHON_VERSION%%/site-packages/gamin.py
-lib/%%PYTHON_VERSION%%/site-packages/gamin.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gamin.pyo
-lib/%%PYTHON_VERSION%%/site-packages/_gamin.a
-lib/%%PYTHON_VERSION%%/site-packages/_gamin.la
-lib/%%PYTHON_VERSION%%/site-packages/_gamin.so
+%%PYTHON_SITELIBDIR%%/_gamin.a
+%%PYTHON_SITELIBDIR%%/_gamin.la
+%%PYTHON_SITELIBDIR%%/_gamin.so
+%%PYTHON_SITELIBDIR%%/gamin.py
diff --git a/devel/xdg-user-dirs-gtk/Makefile b/devel/xdg-user-dirs-gtk/Makefile
new file mode 100644
index 0000000..1406199
--- /dev/null
+++ b/devel/xdg-user-dirs-gtk/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xdg-user-dirs-gtk
+# Date created: 2007-03-05
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/xdg-user-dirs-gtk/Makefile,v 1.3 2007/03/06 15:07:47 ahze Exp $
+
+PORTNAME= xdg-user-dirs-gtk
+PORTVERSION= 0.3
+CATEGORIES= devel gnome
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Companion to xdg-user-dirs that integrates into GTK/GNOME apps
+
+USE_BZIP2= yes
+USE_GNOME= gtk20
+GNU_CONFIGURE= yes
+USE_GMAKE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.mk>
diff --git a/devel/xdg-user-dirs-gtk/distinfo b/devel/xdg-user-dirs-gtk/distinfo
new file mode 100644
index 0000000..7b01111
--- /dev/null
+++ b/devel/xdg-user-dirs-gtk/distinfo
@@ -0,0 +1,3 @@
+MD5 (xdg-user-dirs-gtk-0.3.tar.bz2) = e1d91a55ca1b2a22ca6a9ffd770e9297
+SHA256 (xdg-user-dirs-gtk-0.3.tar.bz2) = 01652a2f0fbf0b1a9bce1874687a1962b8b8314260580ce335d5680358768725
+SIZE (xdg-user-dirs-gtk-0.3.tar.bz2) = 126815
diff --git a/devel/xdg-user-dirs-gtk/pkg-descr b/devel/xdg-user-dirs-gtk/pkg-descr
new file mode 100644
index 0000000..4cd6ae1
--- /dev/null
+++ b/devel/xdg-user-dirs-gtk/pkg-descr
@@ -0,0 +1,2 @@
+Companion to xdg-user-dirs that integrates it into the GNOME desktop and Gtk+
+applications
diff --git a/devel/xdg-user-dirs-gtk/pkg-plist b/devel/xdg-user-dirs-gtk/pkg-plist
new file mode 100644
index 0000000..2b12be8
--- /dev/null
+++ b/devel/xdg-user-dirs-gtk/pkg-plist
@@ -0,0 +1,5 @@
+bin/xdg-user-dirs-gtk-update
+etc/xdg/autostart/user-dirs-update-gtk.desktop
+share/locale/de/LC_MESSAGES/xdg-user-dirs-gtk.mo
+@dirrmtry etc/xdg/autostart
+@dirrmtry etc/xdg
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 467dbbd..2d9fd23 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/gedit-plugins/Makefile,v 1.18 2006/09/09 02:54:39 ahze Exp $
+# $MCom: ports/editors/gedit-plugins/Makefile,v 1.21 2007/02/20 21:09:47 marcus Exp $
#
PORTNAME= gedit-plugins
-PORTVERSION= 2.16.0
-PORTREVISION= 1
+PORTVERSION= 2.17.2
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -46,6 +45,8 @@ WITH_GNOME= yes
USE_PYTHON= yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
USE_GNOME+= pygnomedesktop
+BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
+RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
CONFIGURE_ARGS+=--enable-python
PLIST_SUB+= PYTHON=""
.else
diff --git a/editors/gedit-plugins/distinfo b/editors/gedit-plugins/distinfo
index e446985..c845dee 100644
--- a/editors/gedit-plugins/distinfo
+++ b/editors/gedit-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-plugins-2.16.0.tar.bz2) = db67c3c53f81809460232639f3bfef64
-SHA256 (gnome2/gedit-plugins-2.16.0.tar.bz2) = be92336004be2bff03b3e03311d74b65bb32a63f83494a226d738a628fb09733
-SIZE (gnome2/gedit-plugins-2.16.0.tar.bz2) = 573389
+MD5 (gnome2/gedit-plugins-2.17.2.tar.bz2) = b8c0f762e1cc306c807a4937c88050f7
+SHA256 (gnome2/gedit-plugins-2.17.2.tar.bz2) = 324c7286d00e23675c1cf218c7d1dfb0729931789caa45c4a7df5a52f2f20e55
+SIZE (gnome2/gedit-plugins-2.17.2.tar.bz2) = 559728
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
index 09fda26..1657e72 100644
--- a/editors/gedit-plugins/pkg-plist
+++ b/editors/gedit-plugins/pkg-plist
@@ -22,11 +22,26 @@ lib/gedit-2/plugins/libcharmap.la
lib/gedit-2/plugins/libcharmap.so
lib/gedit-2/plugins/libshowtabbar.la
lib/gedit-2/plugins/libshowtabbar.so
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/__init__.py
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/__init__.pyc
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/__init__.pyo
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/dialogs.py
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/dialogs.pyc
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/dialogs.pyo
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/sessionsaver.glade
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/store.py
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/store.pyc
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/store.pyo
lib/gedit-2/plugins/showtabbar.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/smartspaces.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/smartspaces.py
%%PYTHON%%lib/gedit-2/plugins/smartspaces.pyc
%%PYTHON%%lib/gedit-2/plugins/smartspaces.pyo
+%%PYTHON%%lib/gedit-2/plugins/terminal.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/terminal.py
+%%PYTHON%%lib/gedit-2/plugins/terminal.pyc
+%%PYTHON%%lib/gedit-2/plugins/terminal.pyo
share/locale/ar/LC_MESSAGES/gedit-plugins.mo
share/locale/az/LC_MESSAGES/gedit-plugins.mo
share/locale/be/LC_MESSAGES/gedit-plugins.mo
@@ -35,6 +50,7 @@ share/locale/ca/LC_MESSAGES/gedit-plugins.mo
share/locale/cs/LC_MESSAGES/gedit-plugins.mo
share/locale/da/LC_MESSAGES/gedit-plugins.mo
share/locale/de/LC_MESSAGES/gedit-plugins.mo
+share/locale/dz/LC_MESSAGES/gedit-plugins.mo
share/locale/el/LC_MESSAGES/gedit-plugins.mo
share/locale/en_CA/LC_MESSAGES/gedit-plugins.mo
share/locale/en_GB/LC_MESSAGES/gedit-plugins.mo
@@ -87,6 +103,7 @@ share/locale/wa/LC_MESSAGES/gedit-plugins.mo
share/locale/zh_CN/LC_MESSAGES/gedit-plugins.mo
share/locale/zh_HK/LC_MESSAGES/gedit-plugins.mo
share/locale/zh_TW/LC_MESSAGES/gedit-plugins.mo
+%%PYTHON%%@dirrm lib/gedit-2/plugins/sessionsaver
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -123,6 +140,8 @@ share/locale/zh_TW/LC_MESSAGES/gedit-plugins.mo
@dirrmtry share/locale/fi
@dirrmtry share/locale/el/LC_MESSAGES
@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 4a8113a..cdd7947 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/editors/gedit/Makefile,v 1.7 2006/10/30 18:26:49 marcus Exp $
+# $MCom: ports/editors/gedit/Makefile,v 1.58 2007/03/11 17:00:31 marcus Exp $
#
PORTNAME= gedit
-PORTVERSION= 2.16.2
+PORTVERSION= 2.18.0
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,7 +16,9 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A small but powerful text editor for GNOME 2 Desktop Environment
-LIB_DEPENDS= pspell.16:${PORTSDIR}/textproc/aspell
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 264c388..e1f1edc 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-2.16.2.tar.bz2) = 9ed4fb2891d07c022b487723d1c72161
-SHA256 (gnome2/gedit-2.16.2.tar.bz2) = 8c5c3d5319d060b0db15c30c48503fde85341fa0f1aa848e99c1f0b825c20b4e
-SIZE (gnome2/gedit-2.16.2.tar.bz2) = 2851971
+MD5 (gnome2/gedit-2.18.0.tar.bz2) = faf35c2a934aff2a37a58f56c9f11e15
+SHA256 (gnome2/gedit-2.18.0.tar.bz2) = a163ed74b4446d5d0177494b92f678300bb3f12eb5fe9f876d541bc94f838e09
+SIZE (gnome2/gedit-2.18.0.tar.bz2) = 3145247
diff --git a/editors/gedit/files/patch-plugins_externaltools_data_Makefile.in b/editors/gedit/files/patch-plugins_externaltools_data_Makefile.in
new file mode 100644
index 0000000..aa069fd
--- /dev/null
+++ b/editors/gedit/files/patch-plugins_externaltools_data_Makefile.in
@@ -0,0 +1,11 @@
+--- plugins/externaltools/data/Makefile.in.orig Thu Jan 11 00:53:33 2007
++++ plugins/externaltools/data/Makefile.in Thu Jan 11 00:53:41 2007
+@@ -471,7 +471,7 @@
+ # (.desktop), which happens to be translated using intltool.
+ $(tools_SCRIPTS): %: %.tool.in %.desktop $(TOOL_MERGE)
+ perl $(TOOL_MERGE) -o $@ $< $(word 2,$^)
+- chmod --reference=$< $@
++ chmod 0755 $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index 24fe603..64efd45 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -23,6 +23,7 @@ include/gedit-%%VERSION%%/gedit/gedit-tab.h
include/gedit-%%VERSION%%/gedit/gedit-utils.h
include/gedit-%%VERSION%%/gedit/gedit-view.h
include/gedit-%%VERSION%%/gedit/gedit-window.h
+lib/gedit-2/gedit-bugreport.sh
lib/gedit-2/plugins/changecase.gedit-plugin
lib/gedit-2/plugins/docinfo.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/externaltools.gedit-plugin
@@ -38,6 +39,9 @@ lib/gedit-2/plugins/docinfo.gedit-plugin
%%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/library.py
+%%PYTHON%%lib/gedit-2/plugins/externaltools/library.pyc
+%%PYTHON%%lib/gedit-2/plugins/externaltools/library.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
@@ -55,6 +59,8 @@ lib/gedit-2/plugins/libfilebrowser.la
lib/gedit-2/plugins/libfilebrowser.so
lib/gedit-2/plugins/libindent.la
lib/gedit-2/plugins/libindent.so
+lib/gedit-2/plugins/libmodelines.la
+lib/gedit-2/plugins/libmodelines.so
lib/gedit-2/plugins/libsample.la
lib/gedit-2/plugins/libsample.so
lib/gedit-2/plugins/libsort.la
@@ -65,11 +71,14 @@ 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
+lib/gedit-2/plugins/modelines.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/pythonconsole.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.py
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.pyc
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.pyo
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.py
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyc
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyo
lib/gedit-2/plugins/sample.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/snippets.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.py
@@ -105,12 +114,6 @@ lib/gedit-2/plugins/sample.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/snippets/snippets.glade
lib/gedit-2/plugins/sort.gedit-plugin
lib/gedit-2/plugins/spell.gedit-plugin
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.py
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.pyc
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.pyo
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.py
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyc
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyo
lib/gedit-2/plugins/taglist.gedit-plugin
lib/gedit-2/plugins/time.gedit-plugin
libdata/pkgconfig/gedit-%%VERSION%%.pc
@@ -160,11 +163,11 @@ share/gnome/gedit-2/glade/spell-checker.glade2
share/gnome/gedit-2/glade/time.glade2
share/gnome/gedit-2/icons/gedit-plugin.png
share/gnome/gedit-2/logo/gedit-logo.png
-%%PYTHON%%share/gnome/gedit-2/plugins/externaltools/stock-tools.xml
share/gnome/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml
%%PYTHON%%share/gnome/gedit-2/plugins/snippets/c++.xml
%%PYTHON%%share/gnome/gedit-2/plugins/snippets/c.xml
%%PYTHON%%share/gnome/gedit-2/plugins/snippets/css.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/docbook.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
@@ -179,9 +182,14 @@ share/gnome/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.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
+%%PYTHON%%share/gnome/gedit-2/plugins/tools/build
+%%PYTHON%%share/gnome/gedit-2/plugins/tools/open-terminal-here
+%%PYTHON%%share/gnome/gedit-2/plugins/tools/remove-trailing-spaces
+%%PYTHON%%share/gnome/gedit-2/plugins/tools/run-command
share/gnome/gedit-2/taglist/HTML.tags
share/gnome/gedit-2/taglist/Latex.tags
share/gnome/gedit-2/taglist/XSLT.tags
+share/gnome/gedit-2/taglist/XUL.tags
share/gnome/gedit-2/ui/gedit-ui.xml
share/gnome/help/gedit/C/figures/gedit_format_bold.png
share/gnome/help/gedit/C/figures/gedit_format_italic.png
@@ -419,17 +427,17 @@ share/locale/zh_TW/LC_MESSAGES/gedit.mo
@dirrm share/gnome/help/gedit
@dirrm share/gnome/gedit-2/ui
@dirrm share/gnome/gedit-2/taglist
-@dirrm share/gnome/gedit-2/logo
-@dirrm share/gnome/gedit-2/icons
+%%PYTHON%%@dirrm share/gnome/gedit-2/plugins/tools
%%PYTHON%%@dirrm share/gnome/gedit-2/plugins/snippets
@dirrm share/gnome/gedit-2/plugins/filebrowser
-%%PYTHON%%@dirrm share/gnome/gedit-2/plugins/externaltools
@dirrm share/gnome/gedit-2/plugins
+@dirrm share/gnome/gedit-2/logo
+@dirrm share/gnome/gedit-2/icons
@dirrm share/gnome/gedit-2/glade
@dirrm share/gnome/gedit-2
@dirrm %%DOCSDIR%%
-%%PYTHON%%@dirrm lib/gedit-2/plugins/pythonconsole
%%PYTHON%%@dirrm lib/gedit-2/plugins/snippets
+%%PYTHON%%@dirrm lib/gedit-2/plugins/pythonconsole
%%PYTHON%%@dirrm lib/gedit-2/plugins/externaltools
@dirrm lib/gedit-2/plugins
@dirrm lib/gedit-2
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 75a55bf..e642c10 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -3,12 +3,12 @@
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
-# $MCom: ports/finance/gnucash/Makefile,v 1.12 2007/02/23 18:27:51 ahze Exp $
+# $MCom: ports/finance/gnucash/Makefile,v 1.14 2007/03/13 05:58:37 marcus Exp $
#
PORTNAME= gnucash
PORTVERSION= 2.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= finance gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.gnucash.org/pub/gnucash/sources/stable/
@@ -80,7 +80,8 @@ PLIST_SUB= AQBANKING="@comment "
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|$${datarootdir}/info|${PREFIX}/info|' \
+ @${REINPLACE_CMD} -e 's|$${datarootdir}/info|${PREFIX}/info| ; \
+ s|libgtkhtml-3.8|libgtkhtml-3.14|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|$$(datadir)/aclocal|${PREFIX}/share/aclocal|' \
${WRKSRC}/Makefile.in
diff --git a/finance/gnucash/files/patch-src_gnome-utils_gnc-html.c b/finance/gnucash/files/patch-src_gnome-utils_gnc-html.c
new file mode 100644
index 0000000..92058ac
--- /dev/null
+++ b/finance/gnucash/files/patch-src_gnome-utils_gnc-html.c
@@ -0,0 +1,11 @@
+--- src/gnome-utils/gnc-html.c.orig Tue Feb 20 23:18:48 2007
++++ src/gnome-utils/gnc-html.c Tue Feb 20 23:18:38 2007
+@@ -1325,7 +1325,7 @@
+ return;
+ }
+
+- gtk_html_print(GTK_HTML(html->html), ps->context);
++ gtk_html_print_page(GTK_HTML(html->html), ps->context);
+ gnc_print_session_done(ps);
+ }
+
diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile
index 00b2e4a..e5e8a33 100644
--- a/games/gnome-games-extra-data/Makefile
+++ b/games/gnome-games-extra-data/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnome-games-extra-data/Makefile,v 1.10 2006/07/22 20:55:44 mezz Exp $
+# $MCom: ports/games/gnome-games-extra-data/Makefile,v 1.13 2007/02/16 18:14:25 mezz Exp $
#
PORTNAME= gnome-games-extra-data
-PORTVERSION= 2.14.0
-PORTREVISION= 1
+PORTVERSION= 2.17.90
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/games/gnome-games-extra-data/distinfo b/games/gnome-games-extra-data/distinfo
index 57806d4..9859d8e 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.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
+MD5 (gnome2/gnome-games-extra-data-2.17.90.tar.bz2) = 0d44d896918bab582c947086b3038fb6
+SHA256 (gnome2/gnome-games-extra-data-2.17.90.tar.bz2) = 1f0269081f2350cd70bd6212d5200c37572588adc91a6bd9f719266c0e7ccf54
+SIZE (gnome2/gnome-games-extra-data-2.17.90.tar.bz2) = 3737561
diff --git a/games/gnome-games-extra-data/pkg-plist b/games/gnome-games-extra-data/pkg-plist
index 1a9fb8c..e2c0230 100644
--- a/games/gnome-games-extra-data/pkg-plist
+++ b/games/gnome-games-extra-data/pkg-plist
@@ -13,6 +13,7 @@ share/gnome/pixmaps/gnobots2/mice.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/gnome-games-common/cards/paris.svg
share/gnome/pixmaps/gnometris/5blocks-tig.png
share/gnome/pixmaps/gnometris/5blocks-tim.png
share/gnome/pixmaps/gnometris/5blocks.png
@@ -27,5 +28,6 @@ share/gnome/pixmaps/iagno/shrink.png
share/gnome/pixmaps/iagno/sunmoon.png
share/gnome/pixmaps/mahjongg/default.png
share/gnome/pixmaps/mahjongg/default2.png
+share/gnome/pixmaps/mahjongg/greek-letters.png
share/gnome/pixmaps/mahjongg/maya.png
share/gnome/pixmaps/mahjongg/seta.png
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index edb8acd..315fb50 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -3,18 +3,18 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnome-games/Makefile,v 1.120 2006/10/03 01:23:20 ahze Exp $
+# $MCom: ports/games/gnome-games/Makefile,v 1.139 2007/03/13 17:05:22 mezz Exp $
#
PORTNAME= gnome-games
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= The game applications package for the Gnome 2 Desktop Environment
+COMMENT= The game applications package for the GNOME 2 Desktop Environment
LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
@@ -26,28 +26,38 @@ INSTALLS_ICONS= yes
USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui \
- librsvg2
+ librsvg2 desktopfileutils pygnomedesktop gnomedocutils
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GCONF_SCHEMAS= aisleriot.schemas blackjack.schemas gataxx.schemas \
+GCONF_SCHEMAS= aisleriot.schemas blackjack.schemas glchess.schemas \
glines.schemas gnect.schemas gnibbles.schemas \
gnobots2.schemas gnometris.schemas gnomine.schemas \
gnotravex.schemas gnotski.schemas gtali.schemas \
iagno.schemas libgnomegames.schemas mahjongg.schemas \
same-gnome.schemas
-CONFLICTS= sol-1.0.*
+CONFLICTS= sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]*
.include <bsd.port.pre.mk>
-#.if exists(${LOCALBASE}/lib/libavahi-client.a) || defined(WITH_MDNS)
-#LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi
-#.endif
+.if exists(${LOCALBASE}/lib/libavahi-client.a) || defined(WITH_MDNS)
+LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi
+.endif
post-patch:
- @${REINPLACE_CMD} -e 's|bin/python|bin/env python|g' \
- ${WRKSRC}/libgames-support/games-server.py
+ @${REINPLACE_CMD} -e 's|share|share/gnome|g ; \
+ s|/usr/local|${PREFIX}|g' \
+ ${WRKSRC}/gnome-sudoku/src/lib/defaults.py.in \
+ ${WRKSRC}/glchess/src/lib/defaults.py.in
+ @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share/gnome|' \
+ ${WRKSRC}/gnome-sudoku/src/gnome-sudoku \
+ ${WRKSRC}/glchess/src/glchess \
+ ${WRKSRC}/gnome-sudoku/src/lib/dialog_swallower.py \
+ ${WRKSRC}/gnome-sudoku/src/lib/game_selector.py
+
+post-install:
+ @-update-desktop-database
.include <bsd.port.post.mk>
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 4e46e31..73ac20e 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-games-2.16.3.tar.bz2) = 88baa9ab64b84bfcac2a1ba05f84d2f9
-SHA256 (gnome2/gnome-games-2.16.3.tar.bz2) = 7c32dc59819cbf22787d5ac1fde221a4cd38a20de33831246e12811520294d05
-SIZE (gnome2/gnome-games-2.16.3.tar.bz2) = 5276299
+MD5 (gnome2/gnome-games-2.18.0.tar.bz2) = ef00cec63ca8b4e328c1975377f98f11
+SHA256 (gnome2/gnome-games-2.18.0.tar.bz2) = 52dc7345725488c64b23dc4fa6ffe441cb1ead8b1022d400216ffe48159a83ac
+SIZE (gnome2/gnome-games-2.18.0.tar.bz2) = 6971792
diff --git a/games/gnome-games/pkg-install b/games/gnome-games/pkg-install
index 41261dc..129581f 100644
--- a/games/gnome-games/pkg-install
+++ b/games/gnome-games/pkg-install
@@ -5,7 +5,7 @@ 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 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.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.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.Colors.scores gtali.Regular.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"
for i in ${SCORES}; do
if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then
touch -f ${PKG_PREFIX}/share/gnome/games/${i}
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index e283195..47853d5 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -1,10 +1,11 @@
bin/blackjack
-bin/games-server.py
-bin/gataxx
+bin/glchess
bin/glines
bin/gnect
bin/gnibbles
bin/gnobots2
+bin/gnome-gnuchess
+bin/gnome-sudoku
bin/gnometris
bin/gnomine
bin/gnotravex
@@ -17,13 +18,173 @@ bin/sol
etc/sound/events/gnibbles.soundlist
etc/sound/events/gnobots2.soundlist
etc/sound/events/iagno.soundlist
+%%PYTHON_SITELIBDIR%%/glchess/__init__.py
+%%PYTHON_SITELIBDIR%%/glchess/__init__.pyc
+%%PYTHON_SITELIBDIR%%/glchess/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/ai.py
+%%PYTHON_SITELIBDIR%%/glchess/ai.pyc
+%%PYTHON_SITELIBDIR%%/glchess/ai.pyo
+%%PYTHON_SITELIBDIR%%/glchess/cecp.py
+%%PYTHON_SITELIBDIR%%/glchess/cecp.pyc
+%%PYTHON_SITELIBDIR%%/glchess/cecp.pyo
+%%PYTHON_SITELIBDIR%%/glchess/chess/__init__.py
+%%PYTHON_SITELIBDIR%%/glchess/chess/__init__.pyc
+%%PYTHON_SITELIBDIR%%/glchess/chess/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/chess/board.py
+%%PYTHON_SITELIBDIR%%/glchess/chess/board.pyc
+%%PYTHON_SITELIBDIR%%/glchess/chess/board.pyo
+%%PYTHON_SITELIBDIR%%/glchess/chess/lan.py
+%%PYTHON_SITELIBDIR%%/glchess/chess/lan.pyc
+%%PYTHON_SITELIBDIR%%/glchess/chess/lan.pyo
+%%PYTHON_SITELIBDIR%%/glchess/chess/pgn.py
+%%PYTHON_SITELIBDIR%%/glchess/chess/pgn.pyc
+%%PYTHON_SITELIBDIR%%/glchess/chess/pgn.pyo
+%%PYTHON_SITELIBDIR%%/glchess/chess/san.py
+%%PYTHON_SITELIBDIR%%/glchess/chess/san.pyc
+%%PYTHON_SITELIBDIR%%/glchess/chess/san.pyo
+%%PYTHON_SITELIBDIR%%/glchess/config.py
+%%PYTHON_SITELIBDIR%%/glchess/config.pyc
+%%PYTHON_SITELIBDIR%%/glchess/config.pyo
+%%PYTHON_SITELIBDIR%%/glchess/defaults.py
+%%PYTHON_SITELIBDIR%%/glchess/defaults.pyc
+%%PYTHON_SITELIBDIR%%/glchess/defaults.pyo
+%%PYTHON_SITELIBDIR%%/glchess/game.py
+%%PYTHON_SITELIBDIR%%/glchess/game.pyc
+%%PYTHON_SITELIBDIR%%/glchess/game.pyo
+%%PYTHON_SITELIBDIR%%/glchess/glchess.py
+%%PYTHON_SITELIBDIR%%/glchess/glchess.pyc
+%%PYTHON_SITELIBDIR%%/glchess/glchess.pyo
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/__init__.py
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/dialogs.py
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/dialogs.pyc
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/dialogs.pyo
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/gtkui.py
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/gtkui.pyc
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/gtkui.pyo
+%%PYTHON_SITELIBDIR%%/glchess/main.py
+%%PYTHON_SITELIBDIR%%/glchess/main.pyc
+%%PYTHON_SITELIBDIR%%/glchess/main.pyo
+%%PYTHON_SITELIBDIR%%/glchess/network/__init__.py
+%%PYTHON_SITELIBDIR%%/glchess/network/__init__.pyc
+%%PYTHON_SITELIBDIR%%/glchess/network/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/network/announce.py
+%%PYTHON_SITELIBDIR%%/glchess/network/announce.pyc
+%%PYTHON_SITELIBDIR%%/glchess/network/announce.pyo
+%%PYTHON_SITELIBDIR%%/glchess/network/protocol.py
+%%PYTHON_SITELIBDIR%%/glchess/network/protocol.pyc
+%%PYTHON_SITELIBDIR%%/glchess/network/protocol.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/__init__.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/__init__.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/__init__.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/__init__.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/pieces.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/pieces.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/pieces.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/human.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/human.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/human.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/__init__.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/__init__.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/builtin_models.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/builtin_models.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/builtin_models.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/new_models.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/new_models.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/new_models.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/opengl.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/opengl.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/opengl.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/png.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/png.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/png.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/texture.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/texture.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/texture.pyo
+%%PYTHON_SITELIBDIR%%/glchess/uci.py
+%%PYTHON_SITELIBDIR%%/glchess/uci.pyc
+%%PYTHON_SITELIBDIR%%/glchess/uci.pyo
+%%PYTHON_SITELIBDIR%%/glchess/ui/__init__.py
+%%PYTHON_SITELIBDIR%%/glchess/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/glchess/ui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/ui/ui.py
+%%PYTHON_SITELIBDIR%%/glchess/ui/ui.pyc
+%%PYTHON_SITELIBDIR%%/glchess/ui/ui.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/__init__.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/colors.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/colors.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/colors.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/defaults.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/defaults.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/defaults.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/dialog_swallower.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/dialog_swallower.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/dialog_swallower.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/game_selector.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/game_selector.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/game_selector.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gnome_sudoku.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gnome_sudoku.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gnome_sudoku.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gsudoku.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gsudoku.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gsudoku.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/Undo.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/Undo.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/Undo.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/__init__.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/dialog_extras.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/dialog_extras.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/dialog_extras.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/gconf_wrapper.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/gconf_wrapper.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/gconf_wrapper.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/image_extras.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/image_extras.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/image_extras.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/pausable.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/pausable.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/pausable.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/printing.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/printing.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/printing.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/saver.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/saver.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/saver.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/simple_debug.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/simple_debug.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/simple_debug.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_generator_gui.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_generator_gui.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_generator_gui.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_labeller.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_labeller.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_labeller.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.pyo
share/gnome/applications/blackjack.desktop
share/gnome/applications/freecell.desktop
-share/gnome/applications/gataxx.desktop
+share/gnome/applications/glchess.desktop
share/gnome/applications/glines.desktop
share/gnome/applications/gnect.desktop
share/gnome/applications/gnibbles.desktop
share/gnome/applications/gnobots2.desktop
+share/gnome/applications/gnome-sudoku.desktop
share/gnome/applications/gnometris.desktop
share/gnome/applications/gnomine.desktop
share/gnome/applications/gnotravex.desktop
@@ -110,7 +271,8 @@ share/gnome/blackjack/Vegas_Strip.rules
@unexec [ -s %D/share/gnome/games/gnotski.7.scores ] || rm -f %D/share/gnome/games/gnotski.7.scores
@unexec [ -s %D/share/gnome/games/gnotski.8.scores ] || rm -f %D/share/gnome/games/gnotski.8.scores
@unexec [ -s %D/share/gnome/games/gnotski.9.scores ] || rm -f %D/share/gnome/games/gnotski.9.scores
-@unexec [ -s %D/share/gnome/games/gtali.scores ] || rm -f %D/share/gnome/games/gtali.scores
+@unexec [ -s %D/share/gnome/games/gtali.Colors.scores ] || rm -f %D/share/gnome/games/gtali.Colors.scores
+@unexec [ -s %D/share/gnome/games/gtali.Regular.scores ] || rm -f %D/share/gnome/games/gtali.Regular.scores
@unexec [ -s %D/share/gnome/games/mahjongg.bridges.scores ] || rm -f %D/share/gnome/games/mahjongg.bridges.scores
@unexec [ -s %D/share/gnome/games/mahjongg.cloud.scores ] || rm -f %D/share/gnome/games/mahjongg.cloud.scores
@unexec [ -s %D/share/gnome/games/mahjongg.confounding.scores ] || rm -f %D/share/gnome/games/mahjongg.confounding.scores
@@ -123,6 +285,27 @@ 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/ggz/gnome-games/about_bg.png
+share/gnome/ggz/gnome-games/ggz_gtk_admin.svg
+share/gnome/ggz/gnome-games/ggz_gtk_bot.svg
+share/gnome/ggz/gnome-games/ggz_gtk_guest.svg
+share/gnome/ggz/gnome-games/ggz_gtk_lag0.svg
+share/gnome/ggz/gnome-games/ggz_gtk_lag1.svg
+share/gnome/ggz/gnome-games/ggz_gtk_lag2.svg
+share/gnome/ggz/gnome-games/ggz_gtk_lag3.svg
+share/gnome/ggz/gnome-games/ggz_gtk_lag4.svg
+share/gnome/ggz/gnome-games/ggz_gtk_lag5.svg
+share/gnome/ggz/gnome-games/ggz_gtk_registered.svg
+share/gnome/glchess/ai.glade
+share/gnome/glchess/ai.xml
+share/gnome/glchess/chess_view.glade
+share/gnome/glchess/error_dialog.glade
+share/gnome/glchess/glchess.glade
+share/gnome/glchess/glchess.svg
+share/gnome/glchess/load_game.glade
+share/gnome/glchess/new_game.glade
+share/gnome/glchess/save_game.glade
share/gnome/gnect/white_ob.cn4.gz
share/gnome/gnibbles/level001.gnl
share/gnome/gnibbles/level002.gnl
@@ -155,10 +338,16 @@ 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-sudoku/high_scores.glade
+share/gnome/gnome-sudoku/new_game.glade
+share/gnome/gnome-sudoku/open_game.glade
+share/gnome/gnome-sudoku/print_games.glade
+share/gnome/gnome-sudoku/puzzle_generator.glade
+share/gnome/gnome-sudoku/starter_puzzles
+share/gnome/gnome-sudoku/tracker.glade
share/gnome/help/aisleriot/C/agnes.xml
share/gnome/help/aisleriot/C/aisleriot.xml
share/gnome/help/aisleriot/C/athena.xml
@@ -226,8 +415,6 @@ share/gnome/help/aisleriot/C/scuffle.xml
share/gnome/help/aisleriot/C/seahaven.xml
share/gnome/help/aisleriot/C/sir_tommy.xml
share/gnome/help/aisleriot/C/spider.xml
-share/gnome/help/aisleriot/C/spider_one_suit.xml
-share/gnome/help/aisleriot/C/spider_two_suit.xml
share/gnome/help/aisleriot/C/spiderette.xml
share/gnome/help/aisleriot/C/straight_up.xml
share/gnome/help/aisleriot/C/streets_and_alleys.xml
@@ -335,18 +522,32 @@ share/gnome/help/blackjack/C/blackjack.xml
share/gnome/help/blackjack/C/figures/blackjack_start_window.png
share/gnome/help/blackjack/C/figures/blackjack_win_window.png
share/gnome/help/blackjack/C/legal.xml
-share/gnome/help/gataxx/C/figures/gataxx-legalmoves.png
-share/gnome/help/gataxx/C/gataxx.xml
-share/gnome/help/gataxx/C/legal.xml
+share/gnome/help/glchess/C/glchess.xml
+share/gnome/help/glchess/C/legal.xml
share/gnome/help/glines/C/figures/glines-gameover.png
share/gnome/help/glines/C/figures/glines-startgame.png
share/gnome/help/glines/C/figures/preferences.png
share/gnome/help/glines/C/glines.xml
share/gnome/help/glines/C/legal.xml
+share/gnome/help/glines/fr/figures/glines-gameover.png
+share/gnome/help/glines/fr/figures/glines-startgame.png
+share/gnome/help/glines/fr/figures/preferences.png
+share/gnome/help/glines/fr/glines.xml
+share/gnome/help/glines/ru/figures/glines-gameover.png
+share/gnome/help/glines/ru/figures/glines-startgame.png
+share/gnome/help/glines/ru/figures/preferences.png
+share/gnome/help/glines/ru/glines.xml
+share/gnome/help/glines/sv/figures/glines-gameover.png
+share/gnome/help/glines/sv/figures/glines-startgame.png
+share/gnome/help/glines/sv/figures/preferences.png
+share/gnome/help/glines/sv/glines.xml
share/gnome/help/gnect/C/figures/mainwindow.png
share/gnome/help/gnect/C/figures/tileset.png
share/gnome/help/gnect/C/gnect.xml
share/gnome/help/gnect/C/legal.xml
+share/gnome/help/gnect/sv/figures/mainwindow.png
+share/gnome/help/gnect/sv/figures/tileset.png
+share/gnome/help/gnect/sv/gnect.xml
share/gnome/help/gnibbles/C/figures/game.png
share/gnome/help/gnibbles/C/figures/intro.png
share/gnome/help/gnibbles/C/figures/playing.png
@@ -362,6 +563,13 @@ 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-sudoku/C/figures/Print_Sudokus.png
+share/gnome/help/gnome-sudoku/C/figures/always_show_hint.png
+share/gnome/help/gnome-sudoku/C/figures/error_highlighting.png
+share/gnome/help/gnome-sudoku/C/figures/highlighting.png
+share/gnome/help/gnome-sudoku/C/figures/hints.png
+share/gnome/help/gnome-sudoku/C/gnome-sudoku.xml
+share/gnome/help/gnome-sudoku/C/legal.xml
share/gnome/help/gnometris/C/gnometris.xml
share/gnome/help/gnometris/C/legal.xml
share/gnome/help/gnomine/C/figures/easy-hints-1.png
@@ -410,12 +618,22 @@ 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/help/same-gnome/ru/figures/play.png
+share/gnome/help/same-gnome/ru/figures/start-up.png
+share/gnome/help/same-gnome/ru/same-gnome.xml
+share/gnome/help/same-gnome/sv/figures/play.png
+share/gnome/help/same-gnome/sv/figures/start-up.png
+share/gnome/help/same-gnome/sv/same-gnome.xml
+share/gnome/omf/glchess/glchess-C.omf
+share/gnome/omf/glines/glines-C.omf
+share/gnome/omf/glines/glines-fr.omf
+share/gnome/omf/glines/glines-ru.omf
+share/gnome/omf/glines/glines-sv.omf
+share/gnome/omf/gnect/gnect-C.omf
+share/gnome/omf/gnect/gnect-sv.omf
share/gnome/omf/gnome-games/aisleriot-C.omf
share/gnome/omf/gnome-games/aisleriot-fr.omf
share/gnome/omf/gnome-games/blackjack-C.omf
-share/gnome/omf/gnome-games/gataxx-C.omf
-share/gnome/omf/gnome-games/glines-C.omf
-share/gnome/omf/gnome-games/gnect-C.omf
share/gnome/omf/gnome-games/gnibbles-C.omf
share/gnome/omf/gnome-games/gnobots2-C.omf
share/gnome/omf/gnome-games/gnobots2-da.omf
@@ -429,7 +647,9 @@ share/gnome/omf/gnome-games/gtali-C.omf
share/gnome/omf/gnome-games/gtali-da.omf
share/gnome/omf/gnome-games/iagno-C.omf
share/gnome/omf/gnome-games/mahjongg-C.omf
-share/gnome/omf/gnome-games/same-gnome-C.omf
+share/gnome/omf/same-gnome/same-gnome-C.omf
+share/gnome/omf/same-gnome/same-gnome-ru.omf
+share/gnome/omf/same-gnome/same-gnome-sv.omf
share/gnome/pixmaps/blackjack/baize.png
share/gnome/pixmaps/blackjack/blackjack-splash.png
share/gnome/pixmaps/blackjack/chip-1.svg
@@ -439,6 +659,9 @@ share/gnome/pixmaps/blackjack/chip-5.svg
share/gnome/pixmaps/cards/baize.png
share/gnome/pixmaps/cards/slot.svg
share/gnome/pixmaps/cards/slots/white-outline.svg
+share/gnome/pixmaps/glchess.svg
+share/gnome/pixmaps/glchess/board.png
+share/gnome/pixmaps/glchess/piece.png
share/gnome/pixmaps/glines/balls.svg
share/gnome/pixmaps/glines/shapes.svg
share/gnome/pixmaps/gnect/bg_grotty.jpg
@@ -458,7 +681,6 @@ share/gnome/pixmaps/gnibbles/bonus4.svg
share/gnome/pixmaps/gnibbles/bonus5.svg
share/gnome/pixmaps/gnibbles/diamond.svg
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
share/gnome/pixmaps/gnibbles/snake-blue.svg
@@ -488,9 +710,9 @@ share/gnome/pixmaps/gnobots2/splat.png
share/gnome/pixmaps/gnobots2/ufo.svg
share/gnome/pixmaps/gnobots2/yahoo.png
share/gnome/pixmaps/gnome-games-common/cards/bonded.svg
-share/gnome/pixmaps/gnome-games-common/cards/paris.svg
share/gnome/pixmaps/gnome-games-common/icons/rteleport.png
share/gnome/pixmaps/gnome-games-common/icons/teleport.png
+share/gnome/pixmaps/gnome-sudoku/footprints.png
share/gnome/pixmaps/gnometris/7blocks-gw.png
share/gnome/pixmaps/gnometris/7blocks-tig.png
share/gnome/pixmaps/gnomine/bang.svg
@@ -503,6 +725,7 @@ share/gnome/pixmaps/gnomine/flag-question.svg
share/gnome/pixmaps/gnomine/flag.svg
share/gnome/pixmaps/gnomine/mine.svg
share/gnome/pixmaps/gnomine/warning.svg
+share/gnome/pixmaps/gnotravex/baize.png
share/gnome/pixmaps/gnotski.svg
share/gnome/pixmaps/gtali/gnome-dice-1.svg
share/gnome/pixmaps/gtali/gnome-dice-2.svg
@@ -511,10 +734,18 @@ share/gnome/pixmaps/gtali/gnome-dice-4.svg
share/gnome/pixmaps/gtali/gnome-dice-5.svg
share/gnome/pixmaps/gtali/gnome-dice-6.svg
share/gnome/pixmaps/gtali/gnome-dice-none.svg
+share/gnome/pixmaps/gtali/kismet-none.svg
+share/gnome/pixmaps/gtali/kismet1.svg
+share/gnome/pixmaps/gtali/kismet2.svg
+share/gnome/pixmaps/gtali/kismet3.svg
+share/gnome/pixmaps/gtali/kismet4.svg
+share/gnome/pixmaps/gtali/kismet5.svg
+share/gnome/pixmaps/gtali/kismet6.svg
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/sudoku.png
share/gnome/sol-games/agnes.scm
share/gnome/sol-games/athena.scm
share/gnome/sol-games/auld_lang_syne.scm
@@ -579,8 +810,6 @@ share/gnome/sol-games/seahaven.scm
share/gnome/sol-games/sir_tommy.scm
share/gnome/sol-games/sol.scm
share/gnome/sol-games/spider.scm
-share/gnome/sol-games/spider_one_suit.scm
-share/gnome/sol-games/spider_two_suit.scm
share/gnome/sol-games/spiderette.scm
share/gnome/sol-games/straight_up.scm
share/gnome/sol-games/streets_and_alleys.scm
@@ -623,23 +852,19 @@ share/gnome/sounds/gnometris/slide.wav
share/gnome/sounds/gnometris/turn.wav
share/gnome/sounds/iagno/flip-piece.wav
share/gnome/sounds/iagno/gameover.wav
-share/icons/hicolor/16x16/apps/gnome-ataxx.png
share/icons/hicolor/16x16/apps/gnome-gnomine.png
share/icons/hicolor/16x16/apps/gnome-iagno.png
share/icons/hicolor/16x16/apps/gnome-nibbles.png
share/icons/hicolor/16x16/apps/gnome-tali.png
-share/icons/hicolor/22x22/apps/gnome-ataxx.png
share/icons/hicolor/22x22/apps/gnome-gnomine.png
share/icons/hicolor/22x22/apps/gnome-iagno.png
share/icons/hicolor/22x22/apps/gnome-nibbles.png
share/icons/hicolor/22x22/apps/gnome-tali.png
-share/icons/hicolor/32x32/apps/gnome-ataxx.png
share/icons/hicolor/32x32/apps/gnome-gnomine.png
share/icons/hicolor/32x32/apps/gnome-iagno.png
share/icons/hicolor/32x32/apps/gnome-nibbles.png
share/icons/hicolor/32x32/apps/gnome-tali.png
share/icons/hicolor/48x48/apps/gnome-aisleriot.png
-share/icons/hicolor/48x48/apps/gnome-ataxx.png
share/icons/hicolor/48x48/apps/gnome-blackjack.png
share/icons/hicolor/48x48/apps/gnome-five-or-more.png
share/icons/hicolor/48x48/apps/gnome-four-in-a-row.png
@@ -654,7 +879,6 @@ share/icons/hicolor/48x48/apps/gnome-robots.png
share/icons/hicolor/48x48/apps/gnome-same-gnome.png
share/icons/hicolor/48x48/apps/gnome-tali.png
share/icons/hicolor/48x48/apps/gnome-tetravex.png
-share/icons/hicolor/scalable/apps/gnome-ataxx.svg
share/icons/hicolor/scalable/apps/gnome-gnomine.svg
share/icons/hicolor/scalable/apps/gnome-iagno.svg
share/icons/hicolor/scalable/apps/gnome-nibbles.svg
@@ -740,8 +964,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/pixmaps/mahjongg
@dirrm share/gnome/pixmaps/iagno
@dirrm share/gnome/pixmaps/gtali
+@dirrm share/gnome/pixmaps/gnotravex
@dirrm share/gnome/pixmaps/gnomine
@dirrm share/gnome/pixmaps/gnometris
+@dirrm share/gnome/pixmaps/gnome-sudoku
@dirrm share/gnome/pixmaps/gnome-games-common/icons
@dirrm share/gnome/pixmaps/gnome-games-common/cards
@dirrm share/gnome/pixmaps/gnome-games-common
@@ -749,10 +975,19 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/pixmaps/gnibbles
@dirrm share/gnome/pixmaps/gnect
@dirrm share/gnome/pixmaps/glines
+@dirrm share/gnome/pixmaps/glchess
@dirrm share/gnome/pixmaps/cards/slots
@dirrm share/gnome/pixmaps/cards
@dirrm share/gnome/pixmaps/blackjack
+@dirrm share/gnome/omf/same-gnome
@dirrm share/gnome/omf/gnome-games
+@dirrm share/gnome/omf/gnect
+@dirrm share/gnome/omf/glines
+@dirrm share/gnome/omf/glchess
+@dirrm share/gnome/help/same-gnome/sv/figures
+@dirrm share/gnome/help/same-gnome/sv
+@dirrm share/gnome/help/same-gnome/ru/figures
+@dirrm share/gnome/help/same-gnome/ru
@dirrm share/gnome/help/same-gnome/C/figures
@dirrm share/gnome/help/same-gnome/C
@dirrm share/gnome/help/same-gnome
@@ -777,6 +1012,9 @@ 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-sudoku/C/figures
+@dirrm share/gnome/help/gnome-sudoku/C
+@dirrm share/gnome/help/gnome-sudoku
@dirrm share/gnome/help/gnobots2/it
@dirrm share/gnome/help/gnobots2/es
@dirrm share/gnome/help/gnobots2/da
@@ -786,15 +1024,22 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/help/gnibbles/C/figures
@dirrm share/gnome/help/gnibbles/C
@dirrm share/gnome/help/gnibbles
+@dirrm share/gnome/help/gnect/sv/figures
+@dirrm share/gnome/help/gnect/sv
@dirrm share/gnome/help/gnect/C/figures
@dirrm share/gnome/help/gnect/C
@dirrm share/gnome/help/gnect
+@dirrm share/gnome/help/glines/sv/figures
+@dirrm share/gnome/help/glines/sv
+@dirrm share/gnome/help/glines/ru/figures
+@dirrm share/gnome/help/glines/ru
+@dirrm share/gnome/help/glines/fr/figures
+@dirrm share/gnome/help/glines/fr
@dirrm share/gnome/help/glines/C/figures
@dirrm share/gnome/help/glines/C
@dirrm share/gnome/help/glines
-@dirrm share/gnome/help/gataxx/C/figures
-@dirrm share/gnome/help/gataxx/C
-@dirrm share/gnome/help/gataxx
+@dirrm share/gnome/help/glchess/C
+@dirrm share/gnome/help/glchess
@dirrm share/gnome/help/blackjack/C/figures
@dirrm share/gnome/help/blackjack/C
@dirrm share/gnome/help/blackjack
@@ -803,19 +1048,32 @@ 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-sudoku
@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/glchess
+@dirrm share/gnome/ggz/gnome-games
+@dirrm share/gnome/ggz
@dirrm share/gnome/blackjack
+@dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies
+@dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku
+@dirrm %%PYTHON_SITELIBDIR%%/glchess/ui
+@dirrm %%PYTHON_SITELIBDIR%%/glchess/scene/opengl
+@dirrm %%PYTHON_SITELIBDIR%%/glchess/scene/cairo
+@dirrm %%PYTHON_SITELIBDIR%%/glchess/scene
+@dirrm %%PYTHON_SITELIBDIR%%/glchess/network
+@dirrm %%PYTHON_SITELIBDIR%%/glchess/gtkui
+@dirrm %%PYTHON_SITELIBDIR%%/glchess/chess
+@dirrm %%PYTHON_SITELIBDIR%%/glchess
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index b093b80..d98cabc 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -3,14 +3,15 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/cairo/Makefile,v 1.45 2006/08/19 16:29:11 marcus Exp $
+# $MCom: ports/graphics/cairo/Makefile,v 1.56 2007/03/06 13:39:18 ahze Exp $
#
PORTNAME= cairo
-PORTVERSION= 1.2.6
-PORTREVISION?= 1
+PORTVERSION= 1.4.0
+PORTREVISION?= 0
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
+#MASTER_SITES= http://cairographics.org/snapshots/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Vector graphics library with cross-device output support
@@ -53,15 +54,10 @@ PLIST_SUB+= X11=""
.endif
post-patch:
-.if ${OSVERSION} < 500000
- @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \
- ${WRKSRC}/src/*.* \
- ${WRKSRC}/pixman/src/*.*
-.endif
- @${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \
- ${WRKSRC}/src/*.pc.in
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
${WRKSRC}/test/Makefile.in
+ @${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \
+ ${WRKSRC}/src/*.pc.in
@${REINPLACE_CMD} -e 's|src test doc|src doc|; \
s|@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = test||' \
${WRKSRC}/Makefile.in
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 560d0cf..e13c520 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,3 +1,3 @@
-MD5 (cairo-1.2.6.tar.gz) = 487b3d7515752fe57f780d0fd707b01a
-SHA256 (cairo-1.2.6.tar.gz) = 7d36449c9a05c2c9b44248b10e9f82f0bca99f30e24848435e65aca77c28b3f9
-SIZE (cairo-1.2.6.tar.gz) = 2973689
+MD5 (cairo-1.4.0.tar.gz) = b0882df4621bcf5b69f024b9475f8d4e
+SHA256 (cairo-1.4.0.tar.gz) = 583f9ae2c9b7d2ef33cfbd194148e71a335dafc226e13e213f07ff2dc398bb47
+SIZE (cairo-1.4.0.tar.gz) = 3067230
diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist
index 39be152..c81b6e9 100644
--- a/graphics/cairo/pkg-plist
+++ b/graphics/cairo/pkg-plist
@@ -1,3 +1,4 @@
+include/cairo/cairo-deprecated.h
include/cairo/cairo-features.h
include/cairo/cairo-ft.h
%%GLITZ%%include/cairo/cairo-glitz.h
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index d207071..93a0f2d 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/eog/Makefile,v 1.4 2006/10/21 18:34:14 mezz Exp $
+# $MCom: ports/graphics/eog/Makefile,v 1.51 2007/03/13 00:48:55 mezz Exp $
#
PORTNAME= eog
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0.1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,6 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui \
librsvg2 desktopfileutils gnomedesktop
+INSTALLS_ICONS= yes
USE_GETTEXT= yes
USE_XLIB= yes
INSTALLS_OMF= yes
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index b35494e..6b68e48 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eog-2.16.3.tar.bz2) = 82468185d766b9676d7f06c124939f9d
-SHA256 (gnome2/eog-2.16.3.tar.bz2) = 81fd0962414fa5af71c38cd1cfb1753b12fafdd42111679813a7294eb5a0bdcb
-SIZE (gnome2/eog-2.16.3.tar.bz2) = 1071413
+MD5 (gnome2/eog-2.18.0.1.tar.bz2) = 32f4cd4cd3108522eccf0b8fd85c8bbd
+SHA256 (gnome2/eog-2.18.0.1.tar.bz2) = 9c18c512d7da540e8c96059f00af8e309c5ac6322de168f54f09c0451f59ec9e
+SIZE (gnome2/eog-2.18.0.1.tar.bz2) = 1235965
diff --git a/graphics/eog/files/patch-libeog_eog-image-list.c b/graphics/eog/files/patch-libeog_eog-image-list.c
deleted file mode 100644
index 609cd04..0000000
--- a/graphics/eog/files/patch-libeog_eog-image-list.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- libeog/eog-image-list.c.orig Thu Aug 25 14:57:02 2005
-+++ libeog/eog-image-list.c Thu Aug 25 14:57:46 2005
-@@ -450,12 +450,13 @@
- case GNOME_VFS_MONITOR_EVENT_CREATED:
-
- if (list && list->priv) {
-+ gchar *str;
- node = list->priv->store;
-
- while (node != NULL && !found) {
-
- uri = eog_image_get_uri(node->data);
-- gchar *str = gnome_vfs_uri_to_string
-+ str = gnome_vfs_uri_to_string
- (uri, GNOME_VFS_URI_HIDE_NONE);
- found = (strcmp (str, info_uri)==0)?TRUE:FALSE;
- g_free (str);
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index ee24418..08a99fc 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -7,8 +7,11 @@ share/gnome/help/eog/C/figures/eog_save_as_window.png
share/gnome/help/eog/C/figures/eog_start_window.png
share/gnome/help/eog/C/legal.xml
share/gnome/help/eog/de/eog.xml
+share/gnome/help/eog/de/figures/eog_save_as_window.png
share/gnome/help/eog/de/figures/eog_start_window.png
-share/gnome/help/eog/de/legal.xml
+share/gnome/help/eog/en_GB/eog.xml
+share/gnome/help/eog/en_GB/figures/eog_save_as_window.png
+share/gnome/help/eog/en_GB/figures/eog_start_window.png
share/gnome/help/eog/es/eog.xml
share/gnome/help/eog/es/figures/eog_save_as_window.png
share/gnome/help/eog/es/figures/eog_start_window.png
@@ -27,6 +30,15 @@ share/gnome/help/eog/ja/legal.xml
share/gnome/help/eog/ko/eog.xml
share/gnome/help/eog/ko/figures/eog_start_window.png
share/gnome/help/eog/ko/legal.xml
+share/gnome/help/eog/pa/eog.xml
+share/gnome/help/eog/pa/figures/eog_save_as_window.png
+share/gnome/help/eog/pa/figures/eog_start_window.png
+share/gnome/help/eog/pt_BR/eog.xml
+share/gnome/help/eog/pt_BR/figures/eog_save_as_window.png
+share/gnome/help/eog/pt_BR/figures/eog_start_window.png
+share/gnome/help/eog/ru/eog.xml
+share/gnome/help/eog/ru/figures/eog_save_as_window.png
+share/gnome/help/eog/ru/figures/eog_start_window.png
share/gnome/help/eog/sv/eog.xml
share/gnome/help/eog/sv/figures/eog_save_as_window.png
share/gnome/help/eog/sv/figures/eog_start_window.png
@@ -41,27 +53,26 @@ share/gnome/help/eog/zh_TW/figures/eog_start_window.png
share/gnome/help/eog/zh_TW/legal.xml
share/gnome/omf/eog/eog-C.omf
share/gnome/omf/eog/eog-de.omf
+share/gnome/omf/eog/eog-en_GB.omf
share/gnome/omf/eog/eog-es.omf
share/gnome/omf/eog/eog-eu.omf
share/gnome/omf/eog/eog-fr.omf
share/gnome/omf/eog/eog-it.omf
share/gnome/omf/eog/eog-ja.omf
share/gnome/omf/eog/eog-ko.omf
+share/gnome/omf/eog/eog-pa.omf
+share/gnome/omf/eog/eog-pt_BR.omf
+share/gnome/omf/eog/eog-ru.omf
share/gnome/omf/eog/eog-sv.omf
share/gnome/omf/eog/eog-uk.omf
share/gnome/omf/eog/eog-zh_CN.omf
share/gnome/omf/eog/eog-zh_TW.omf
-share/gnome/pixmaps/eog/down-right.png
-share/gnome/pixmaps/eog/loading.png
-share/gnome/pixmaps/eog/orient-horizontal.png
-share/gnome/pixmaps/eog/orient-vertical.png
-share/gnome/pixmaps/eog/right-down.png
-share/gnome/pixmaps/eog/stock-flip-horizontal-16.png
-share/gnome/pixmaps/eog/stock-flip-vertical-16.png
-share/gnome/pixmaps/eog/stock-rotate-180-16.png
-share/gnome/pixmaps/eog/stock-rotate-270-16.png
-share/gnome/pixmaps/eog/stock-rotate-90-16.png
share/gnome/pixmaps/gnome-eog.png
+share/icons/hicolor/16x16/apps/eog.png
+share/icons/hicolor/22x22/apps/eog.png
+share/icons/hicolor/24x24/apps/eog.png
+share/icons/hicolor/32x32/apps/eog.png
+share/icons/hicolor/scalable/apps/eog.svg
share/locale/af/LC_MESSAGES/eog.mo
share/locale/am/LC_MESSAGES/eog.mo
share/locale/ar/LC_MESSAGES/eog.mo
@@ -140,7 +151,6 @@ share/locale/zh_CN/LC_MESSAGES/eog.mo
share/locale/zh_HK/LC_MESSAGES/eog.mo
share/locale/zh_TW/LC_MESSAGES/eog.mo
share/locale/zu/LC_MESSAGES/eog.mo
-@dirrm share/gnome/pixmaps/eog
@dirrm share/gnome/omf/eog
@dirrm share/gnome/help/eog/zh_TW/figures
@dirrm share/gnome/help/eog/zh_TW
@@ -150,6 +160,12 @@ share/locale/zu/LC_MESSAGES/eog.mo
@dirrm share/gnome/help/eog/uk
@dirrm share/gnome/help/eog/sv/figures
@dirrm share/gnome/help/eog/sv
+@dirrm share/gnome/help/eog/ru/figures
+@dirrm share/gnome/help/eog/ru
+@dirrm share/gnome/help/eog/pt_BR/figures
+@dirrm share/gnome/help/eog/pt_BR
+@dirrm share/gnome/help/eog/pa/figures
+@dirrm share/gnome/help/eog/pa
@dirrm share/gnome/help/eog/ko/figures
@dirrm share/gnome/help/eog/ko
@dirrm share/gnome/help/eog/ja/figures
@@ -162,6 +178,8 @@ share/locale/zu/LC_MESSAGES/eog.mo
@dirrm share/gnome/help/eog/eu
@dirrm share/gnome/help/eog/es/figures
@dirrm share/gnome/help/eog/es
+@dirrm share/gnome/help/eog/en_GB/figures
+@dirrm share/gnome/help/eog/en_GB
@dirrm share/gnome/help/eog/de/figures
@dirrm share/gnome/help/eog/de
@dirrm share/gnome/help/eog/C/figures
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 04800b4..07735e3 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/evince/Makefile,v 1.58 2006/10/10 02:27:26 ahze Exp $
+# $MCom: ports/graphics/evince/Makefile,v 1.64 2007/03/13 12:00:09 ahze Exp $
#
PORTNAME= evince
-PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTVERSION= 0.8.0
CATEGORIES= graphics print gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -34,6 +33,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
GCONF_SCHEMAS= evince.schemas evince-thumbnailer.schemas
+MAN1= evince.1
+
OPTIONS= DVI "Enable DVI viewer support" off \
T1LIB "Enable T1LIB for TYPE1 fonts to DVI (Enables DVI)" off \
NAUTILUS "Enable Nautilus plugin" on \
@@ -104,10 +105,8 @@ RUN_DEPENDS+= unrar:${PORTSDIR}/archivers/unrar \
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|-lt1lib|-lt1 -lm| ; \
- s|execinfo.h|#|g' \
- ${WRKSRC}/configure \
- ${WRKSRC}/dvi/mdvi-lib/Makefile.in
+ @${REINPLACE_CMD} -e 's|execinfo.h|#|g' \
+ ${WRKSRC}/configure
post-install:
@-update-desktop-database
diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo
index f80ff61..6928356 100644
--- a/graphics/evince/distinfo
+++ b/graphics/evince/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evince-0.6.1.tar.bz2) = 55a1d4af3cac209c7cfbe83b7ffcee1d
-SHA256 (gnome2/evince-0.6.1.tar.bz2) = ee72f48ec0c76a8f44d8a6aed6759d43a147a9d5bb2b15f06460c4d6ef86025e
-SIZE (gnome2/evince-0.6.1.tar.bz2) = 1212271
+MD5 (gnome2/evince-0.8.0.tar.bz2) = b4f7b154535c05ca77a23be193fc458d
+SHA256 (gnome2/evince-0.8.0.tar.bz2) = eaed6371b1909a8cbab91f7e40c710b251e7adbb2a88174f12b96e26e132a8df
+SIZE (gnome2/evince-0.8.0.tar.bz2) = 1460387
diff --git a/graphics/evince/files/patch-CVE-2006-5864 b/graphics/evince/files/patch-CVE-2006-5864
deleted file mode 100644
index 2e39310..0000000
--- a/graphics/evince/files/patch-CVE-2006-5864
+++ /dev/null
@@ -1,22 +0,0 @@
---- ps/ps.c.orig Fri Jan 6 21:03:44 2006
-+++ ps/ps.c Thu Dec 14 10:11:35 2006
-@@ -1231,7 +1231,8 @@
- int level = 0;
- quoted = 1;
- line++;
-- while(*line && !(*line == ')' && level == 0)) {
-+ while(*line && !(*line == ')' && level == 0)
-+ && (cp - text) < PSLINELENGTH - 1) {
- if(*line == '\\') {
- if(*(line + 1) == 'n') {
- *cp++ = '\n';
-@@ -1302,7 +1303,8 @@
- }
- }
- else {
-- while(*line && !(*line == ' ' || *line == '\t' || *line == '\n'))
-+ while(*line && !(*line == ' ' || *line == '\t' || *line == '\n')
-+ && (cp - text) < PSLINELENGTH - 1)
- *cp++ = *line++;
- }
- *cp = '\0';
diff --git a/graphics/evince/files/patch-backend_ps_ps-interpreter.c b/graphics/evince/files/patch-backend_ps_ps-interpreter.c
new file mode 100644
index 0000000..9cd98bb
--- /dev/null
+++ b/graphics/evince/files/patch-backend_ps_ps-interpreter.c
@@ -0,0 +1,10 @@
+--- backend/ps/ps-interpreter.c.orig Tue Mar 13 07:00:12 2007
++++ backend/ps/ps-interpreter.c Tue Mar 13 07:00:21 2007
+@@ -29,6 +29,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ #include <errno.h>
+
+ #include "ps-interpreter.h"
diff --git a/graphics/evince/files/patch-configure b/graphics/evince/files/patch-configure
new file mode 100644
index 0000000..dc23239
--- /dev/null
+++ b/graphics/evince/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig Mon Dec 18 18:05:50 2006
++++ configure Mon Dec 18 18:06:30 2006
+@@ -25315,7 +25315,7 @@ else
+ echo "${ECHO_T}yes" >&6
+ enable_cairo_pdf=yes
+ fi
+- if test x$enable_cairo_pdf == xyes; then
++ if test x$enable_cairo_pdf = xyes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_CAIRO_PDF 1
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index 06e0564..dfb1c85 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -3,19 +3,98 @@ 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
+%%DOCSDIR%%/EvAttachment.html
+%%DOCSDIR%%/EvJobPrint.html
+%%DOCSDIR%%/EvNavigationAction.html
+%%DOCSDIR%%/EvNavigationActionWidget.html
+%%DOCSDIR%%/EvPageAction.html
+%%DOCSDIR%%/EvPageActionWidget.html
+%%DOCSDIR%%/EvWindow.html
+%%DOCSDIR%%/evince-EvHistory.html
+%%DOCSDIR%%/evince-EvImage.html
+%%DOCSDIR%%/evince-EvPasswordDialog.html
+%%DOCSDIR%%/evince-EvPasswordView.html
+%%DOCSDIR%%/evince-EvRenderContext.html
+%%DOCSDIR%%/evince-EvSidebar.html
+%%DOCSDIR%%/evince-EvSidebarAttachments.html
+%%DOCSDIR%%/evince-EvSidebarLinks.html
+%%DOCSDIR%%/evince-EvSidebarThumbnails.html
+%%DOCSDIR%%/evince-EvTooltip.html
+%%DOCSDIR%%/evince-ev-async-renderer.html
+%%DOCSDIR%%/evince-ev-document-factory.html
+%%DOCSDIR%%/evince-ev-document-find.html
+%%DOCSDIR%%/evince-ev-document-fonts.html
+%%DOCSDIR%%/evince-ev-document-images.html
+%%DOCSDIR%%/evince-ev-document-info.html
+%%DOCSDIR%%/evince-ev-document-links.html
+%%DOCSDIR%%/evince-ev-document-misc.html
+%%DOCSDIR%%/evince-ev-document-security.html
+%%DOCSDIR%%/evince-ev-document-thumbnails.html
+%%DOCSDIR%%/evince-ev-document-transition.html
+%%DOCSDIR%%/evince-ev-document.html
+%%DOCSDIR%%/evince-ev-file-exporter.html
+%%DOCSDIR%%/evince-ev-file-helpers.html
+%%DOCSDIR%%/evince-ev-job-queue.html
+%%DOCSDIR%%/evince-ev-link-action.html
+%%DOCSDIR%%/evince-ev-link-dest.html
+%%DOCSDIR%%/evince-ev-link.html
+%%DOCSDIR%%/evince-ev-metadata-manager.html
+%%DOCSDIR%%/evince-ev-page-cache.html
+%%DOCSDIR%%/evince-ev-pixbuf-cache.html
+%%DOCSDIR%%/evince-ev-print-job.html
+%%DOCSDIR%%/evince-ev-properties-dialog.html
+%%DOCSDIR%%/evince-ev-properties-fonts.html
+%%DOCSDIR%%/evince-ev-selection.html
+%%DOCSDIR%%/evince-ev-sidebar-page.html
+%%DOCSDIR%%/evince-ev-stock-icons.html
+%%DOCSDIR%%/evince-ev-utils.html
+%%DOCSDIR%%/evince-ev-view-accessible.html
+%%DOCSDIR%%/evince-ev-view.html
+%%DOCSDIR%%/evince-ev-window-title.html
+%%DOCSDIR%%/evince.devhelp
+%%DOCSDIR%%/evince.devhelp2
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/ix01.html
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/pt01.html
+%%DOCSDIR%%/pt02.html
+%%DOCSDIR%%/pt03.html
+%%DOCSDIR%%/pt04.html
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
share/gnome/applications/evince.desktop
share/gnome/evince/evince-password.glade
+share/gnome/evince/evince-preview-toolbar.xml
share/gnome/evince/evince-properties.glade
share/gnome/evince/evince-toolbar.xml
share/gnome/evince/evince-ui.xml
share/gnome/evince/hand-open.png
+share/gnome/evince/icons/hicolor/16x16/actions/view-page-continuous.png
+share/gnome/evince/icons/hicolor/16x16/actions/view-page-facing.png
+share/gnome/evince/icons/hicolor/16x16/actions/zoom-fit-page.png
+share/gnome/evince/icons/hicolor/16x16/actions/zoom-fit-width.png
+share/gnome/evince/icons/hicolor/22x22/actions/view-page-continuous.png
+share/gnome/evince/icons/hicolor/22x22/actions/view-page-facing.png
+share/gnome/evince/icons/hicolor/22x22/actions/zoom-fit-page.png
+share/gnome/evince/icons/hicolor/22x22/actions/zoom-fit-width.png
+share/gnome/evince/icons/hicolor/24x24/actions/view-page-continuous.png
+share/gnome/evince/icons/hicolor/24x24/actions/view-page-facing.png
+share/gnome/evince/icons/hicolor/24x24/actions/zoom-fit-page.png
+share/gnome/evince/icons/hicolor/24x24/actions/zoom-fit-width.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/ca/evince.xml
+share/gnome/help/evince/ca/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/en_GB/evince.xml
+share/gnome/help/evince/en_GB/figures/evince_start_window.png
share/gnome/help/evince/es/evince.xml
share/gnome/help/evince/es/figures/evince_start_window.png
share/gnome/help/evince/fi/evince.xml
@@ -36,7 +115,9 @@ 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-ca.omf
share/gnome/omf/evince/evince-el.omf
+share/gnome/omf/evince/evince-en_GB.omf
share/gnome/omf/evince/evince-es.omf
share/gnome/omf/evince/evince-fi.omf
share/gnome/omf/evince/evince-fr.omf
@@ -48,8 +129,10 @@ share/gnome/omf/evince/evince-sv.omf
share/gnome/omf/evince/evince-uk.omf
share/icons/hicolor/16x16/apps/evince.png
share/icons/hicolor/22x22/apps/evince.png
+share/icons/hicolor/24x24/apps/evince.png
share/icons/hicolor/48x48/apps/evince.png
share/icons/hicolor/scalable/apps/evince.svg
+share/locale/ar/LC_MESSAGES/evince.mo
share/locale/be/LC_MESSAGES/evince.mo
share/locale/bg/LC_MESSAGES/evince.mo
share/locale/bn/LC_MESSAGES/evince.mo
@@ -83,6 +166,7 @@ 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/mg/LC_MESSAGES/evince.mo
share/locale/mk/LC_MESSAGES/evince.mo
share/locale/ml/LC_MESSAGES/evince.mo
share/locale/mr/LC_MESSAGES/evince.mo
@@ -113,35 +197,6 @@ 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
-@dirrm share/gnome/omf/evince
-@dirrm share/gnome/help/evince/uk/figures
-@dirrm share/gnome/help/evince/uk
-@dirrm share/gnome/help/evince/sv/figures
-@dirrm share/gnome/help/evince/sv
-@dirrm share/gnome/help/evince/sr/figures
-@dirrm share/gnome/help/evince/sr
-@dirrm share/gnome/help/evince/ru/figures
-@dirrm share/gnome/help/evince/ru
-@dirrm share/gnome/help/evince/nl/figures
-@dirrm share/gnome/help/evince/nl
-@dirrm share/gnome/help/evince/it/figures
-@dirrm share/gnome/help/evince/it
-@dirrm share/gnome/help/evince/fr/figures
-@dirrm share/gnome/help/evince/fr
-@dirrm share/gnome/help/evince/fi/figures
-@dirrm share/gnome/help/evince/fi
-@dirrm share/gnome/help/evince/es/figures
-@dirrm share/gnome/help/evince/es
-@dirrm share/gnome/help/evince/el/figures
-@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
-@dirrm share/gnome/evince
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || true
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -170,6 +225,8 @@ share/locale/zh_TW/LC_MESSAGES/evince.mo
@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/ko/LC_MESSAGES
@@ -190,3 +247,45 @@ share/locale/zh_TW/LC_MESSAGES/evince.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
+@dirrm share/gnome/omf/evince
+@dirrm share/gnome/help/evince/uk/figures
+@dirrm share/gnome/help/evince/uk
+@dirrm share/gnome/help/evince/sv/figures
+@dirrm share/gnome/help/evince/sv
+@dirrm share/gnome/help/evince/sr/figures
+@dirrm share/gnome/help/evince/sr
+@dirrm share/gnome/help/evince/ru/figures
+@dirrm share/gnome/help/evince/ru
+@dirrm share/gnome/help/evince/nl/figures
+@dirrm share/gnome/help/evince/nl
+@dirrm share/gnome/help/evince/it/figures
+@dirrm share/gnome/help/evince/it
+@dirrm share/gnome/help/evince/fr/figures
+@dirrm share/gnome/help/evince/fr
+@dirrm share/gnome/help/evince/fi/figures
+@dirrm share/gnome/help/evince/fi
+@dirrm share/gnome/help/evince/es/figures
+@dirrm share/gnome/help/evince/es
+@dirrm share/gnome/help/evince/en_GB/figures
+@dirrm share/gnome/help/evince/en_GB
+@dirrm share/gnome/help/evince/el/figures
+@dirrm share/gnome/help/evince/el
+@dirrm share/gnome/help/evince/ca/figures
+@dirrm share/gnome/help/evince/ca
+@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
+@dirrm share/gnome/evince/icons/hicolor/24x24/actions
+@dirrm share/gnome/evince/icons/hicolor/24x24
+@dirrm share/gnome/evince/icons/hicolor/22x22/actions
+@dirrm share/gnome/evince/icons/hicolor/22x22
+@dirrm share/gnome/evince/icons/hicolor/16x16/actions
+@dirrm share/gnome/evince/icons/hicolor/16x16
+@dirrm share/gnome/evince/icons/hicolor
+@dirrm share/gnome/evince/icons
+@dirrm share/gnome/evince
+@dirrm %%DOCSDIR%%
+@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/graphics/p5-Cairo/Makefile b/graphics/p5-Cairo/Makefile
index 1efcb49..5f4a1e2 100644
--- a/graphics/p5-Cairo/Makefile
+++ b/graphics/p5-Cairo/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/p5-Cairo/Makefile,v 1.5 2006/09/06 22:53:39 ahze Exp $
+# $MCom: ports/graphics/p5-Cairo/Makefile,v 1.8 2007/02/16 18:14:25 mezz Exp $
#
PORTNAME= Cairo
-PORTVERSION= 1.023
+PORTVERSION= 1.030
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtk2-perl
diff --git a/graphics/p5-Cairo/distinfo b/graphics/p5-Cairo/distinfo
index 11eabbf..55033bd 100644
--- a/graphics/p5-Cairo/distinfo
+++ b/graphics/p5-Cairo/distinfo
@@ -1,3 +1,3 @@
-MD5 (Cairo-1.023.tar.gz) = 0c5a1ef1c49ab3c508f04a8b6321cb74
-SHA256 (Cairo-1.023.tar.gz) = c66e196b81f7698d6fb8eb7a8244d279f02c91195b71ccfa6c5b0b8ee9fb8e28
-SIZE (Cairo-1.023.tar.gz) = 43737
+MD5 (Cairo-1.030.tar.gz) = 6f8f8f0d200b6fc942452b4d1566a0eb
+SHA256 (Cairo-1.030.tar.gz) = bc26662ba2fffa85dc038d9909f0df3efbf09494cdd2e35df1b52bf5fb5dae86
+SIZE (Cairo-1.030.tar.gz) = 45459
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index 3e00677..35acb78 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -3,14 +3,13 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/py-cairo/Makefile,v 1.20 2006/09/06 22:05:06 marcus Exp $
+# $MCom: ports/graphics/py-cairo/Makefile,v 1.22 2007/03/14 21:38:08 ahze Exp $
#
PORTNAME= cairo
-PORTVERSION= 1.2.6
+PORTVERSION= 1.4.0
CATEGORIES= graphics python
-MASTER_SITES= http://cairographics.org/releases/ \
- http://zeqadious.homelinux.net/zenwalk/buildscripts/official/pycairo/
+MASTER_SITES= http://cairographics.org/releases/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py${PORTNAME}-${PORTVERSION}
diff --git a/graphics/py-cairo/distinfo b/graphics/py-cairo/distinfo
index 5fbc8da..14e8d75 100644
--- a/graphics/py-cairo/distinfo
+++ b/graphics/py-cairo/distinfo
@@ -1,3 +1,3 @@
-MD5 (pycairo-1.2.6.tar.gz) = 166b04c4800c01aba1a6c8b14e87e0bc
-SHA256 (pycairo-1.2.6.tar.gz) = 28f01729946721bec2361480f2802da5015e1271ce5cdbe6ff97a1442a19c595
-SIZE (pycairo-1.2.6.tar.gz) = 480714
+MD5 (pycairo-1.4.0.tar.gz) = e26e77919b606113f565d70036c1f504
+SHA256 (pycairo-1.4.0.tar.gz) = 9212afffee727e39ae99406b5a59ab3248556bcfebfae24d8278313678147e32
+SIZE (pycairo-1.4.0.tar.gz) = 479455
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 7b60ea0..7d7ef7d 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -3,11 +3,12 @@
# Whom: Glenn Johnson <gljohns@bellsouth.net>
#
# $FreeBSD$
-# $MCom: ports/mail/balsa/Makefile,v 1.7 2006/07/27 17:09:22 mezz Exp $
+# $MCom: ports/mail/balsa/Makefile,v 1.10 2007/03/14 17:45:39 marcus Exp $
#
PORTNAME= balsa
PORTVERSION= 2.3.14
+PORTREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/
DISTNAME= balsa-${PORTVERSION}
@@ -76,7 +77,8 @@ post-patch:
${WRKSRC}/libbalsa/mailbox_imap.c
# PREFIX safeness
@${REINPLACE_CMD} -E \
- -e 's|^(HICOLOR_ICON_DIR)[^/]+/|\1=${PREFIX}/|' \
+ -e 's|^(HICOLOR_ICON_DIR)[^/]+/|\1=${PREFIX}/| ; \
+ s|libgtkhtml-3.8|libgtkhtml-3.14|g' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
post-install:
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 7309ce8..4626ccd 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger, based off kiesel's ximian-exchange port
#
# $FreeBSD$
-# $MCom: ports/mail/evolution-exchange/Makefile,v 1.70 2006/10/03 02:06:00 ahze Exp $
+# $MCom: ports/mail/evolution-exchange/Makefile,v 1.83 2007/03/13 16:03:50 marcus Exp $
#
PORTNAME= evolution-exchange
-PORTVERSION= 2.8.3
+PORTVERSION= 2.10.0
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -24,17 +24,22 @@ USE_GETTEXT= yes
USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
+USE_BDB= 41
USE_OPENLDAP= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnometarget
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \
--with-static-ldap=no \
- --disable-compile-warnings
+ --disable-compile-warnings \
+ --with-libdb=${LOCALBASE}
-EVO_VERSION= 2.8
-PLIST_SUB= VERSION="2.8" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" \
- OLDDOCSDIR="share/doc/ximian-connector"
+EVO_VERSION= 2.10
+VERSION= 2.10
+PLIST_SUB= VERSION=${VERSION} EVO_VERSION=${EVO_VERSION} \
+ EDS_VERSION="1.2" OLDDOCSDIR="share/doc/ximian-connector"
+
+GCONF_SCHEMAS= apps_exchange_addressbook-${VERSION}.schemas
.include <bsd.port.pre.mk>
@@ -58,4 +63,10 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
IGNORE= does not build with ${LOCALBASE}/include/mapi.h exists in system, run pkg_info -W ${LOCALBASE}/include/mapi.h to find the offending port and uninstall it, then install ${PORTNAME} and reinstall port
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|EVOLUTION_API_VERSION=2.8|EVOLUTION_API_VERSION=2.10| ; \
+ s|EDS_BASE_VERSION=1.8|EDS_BASE_VERSION=1.10| ; \
+ s|-ldb|-l${BDB_LIB_NAME}|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.post.mk>
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index 5f71a13..1b6b343 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.8.3.tar.bz2) = 8a6be6640c7824285088f6a2e98f12a4
-SHA256 (gnome2/evolution-exchange-2.8.3.tar.bz2) = 987b31056ba8914f2c1b6d0ae64c45f8564dda6d1949fda1ebec11abc1de611b
-SIZE (gnome2/evolution-exchange-2.8.3.tar.bz2) = 1034763
+MD5 (gnome2/evolution-exchange-2.10.0.tar.bz2) = ffed2fdc7645b029bbf0c774e35e3fa0
+SHA256 (gnome2/evolution-exchange-2.10.0.tar.bz2) = faacd758f4d36a698506066a4958806d66c74b68d3a40b5767dfcd1ffd3d08d1
+SIZE (gnome2/evolution-exchange-2.10.0.tar.bz2) = 1043846
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 0ee2427d..49e44b3 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,12 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/mail/evolution/Makefile,v 1.119 2006/10/07 17:10:06 marcus Exp $
+# $MCom: ports/mail/evolution/Makefile,v 1.134 2007/03/13 05:41:38 marcus Exp $
#
PORTNAME= evolution
-PORTVERSION= 2.8.3
-PORTREVISION= 1
+PORTVERSION= 2.10.0
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -26,16 +25,13 @@ USE_BISON= yes
USE_GETTEXT= yes
USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver \
- gtkhtml3 desktopfileutils
+ gtkhtml3 desktopfileutils gnomedocutils libgnomeprintui
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
+INSTALLS_ICONS= yes
USE_LDCONFIG= yes
LDCONFIG_DIRS= %%PREFIX%%/lib/evolution/%%VERSION%%
CONFIGURE_ARGS= --enable-nss=yes \
- --with-nss-includes=${LOCALBASE}/include/nss/nss \
- --with-nss-libs=${LOCALBASE}/lib \
- --with-nspr-includes=${LOCALBASE}/include/nspr \
- --with-nspr-libs=${LOCALBASE}/lib \
--enable-mono=no \
--with-sub-version=" FreeBSD GNOME Team Port"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -47,9 +43,9 @@ GCONF_SCHEMAS= apps_evolution_addressbook-${EVO_VERSION}.schemas \
apps_evolution_shell-${EVO_VERSION}.schemas \
evolution-mail-${EVO_VERSION}.schemas
-EVO_VERSION= 2.8
+EVO_VERSION= 2.10
PLIST_SUB= VERSION=${EVO_VERSION} \
- PORTVERSION=2.8
+ PORTVERSION=2.10
OPTIONS= PILOT "Enable Palm Pilot sync support" off \
LDAP "Enable LDAP support" on \
@@ -61,7 +57,6 @@ 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
WITH_DBUS= yes
.endif
@@ -69,10 +64,6 @@ WITH_DBUS= yes
WITH_DBUS= yes
.endif
-.if exists(${LOCALBASE}/lib/libgstreamer-0.8.so)
-WITH_GSTREAMER= yes
-.endif
-
.if defined(WITH_PILOT)
LIB_DEPENDS+= gpilotdconduit.2:${PORTSDIR}/palm/gnome-pilot
CONFIGURE_ARGS+= --with-pisock=${LOCALBASE} \
@@ -93,13 +84,6 @@ CONFIGURE_ARGS+=--with-openldap=no
RUN_DEPENDS+= spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
.endif
-.if defined(WITH_GSTREAMER)
-LIB_DEPENDS+= gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer80
-PLIST_SUB+= GSTREAMER=""
-.else
-PLIST_SUB+= GSTREAMER="@comment "
-.endif
-
.if defined(WITH_DBUS)
LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
PLIST_SUB+= DBUS=""
@@ -119,6 +103,10 @@ CONFIGURE_ARGS+= --with-krb5=${LOCALBASE}
.endif
.endif
+post-patch:
+ @${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \
+ ${WRKSRC}/configure
+
post-install: install-ldconfig-file
@${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \
${PREFIX}/bin/evolution
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 5bd7281..f342183 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.8.3.tar.bz2) = 099876b347b114ec08ce6998b4a48d8c
-SHA256 (gnome2/evolution-2.8.3.tar.bz2) = 08819f459185de7f36ac43702bb5314d1b2a9fae33db9ac4c5d9dfb3aaabca90
-SIZE (gnome2/evolution-2.8.3.tar.bz2) = 12931527
+MD5 (gnome2/evolution-2.10.0.tar.bz2) = 68d32e518f235bea9d768ae55e91bffc
+SHA256 (gnome2/evolution-2.10.0.tar.bz2) = 46035f6ea64c9310d6f5c9ebe0cdd851e3a3d6748d0e7d545e088dd2682251c7
+SIZE (gnome2/evolution-2.10.0.tar.bz2) = 15525569
diff --git a/mail/evolution/files/patch-90_build_with_new_pisock b/mail/evolution/files/patch-90_build_with_new_pisock
deleted file mode 100644
index ffa2656..0000000
--- a/mail/evolution/files/patch-90_build_with_new_pisock
+++ /dev/null
@@ -1,907 +0,0 @@
-diff -Nur evolution-2.8.0/addressbook/conduit/address-conduit.c evolution-2.8.0.new/addressbook/conduit/address-conduit.c
---- addressbook/conduit/address-conduit.c.orig 2005-12-06 09:43:37.000000000 +0100
-+++ addressbook/conduit/address-conduit.c 2006-09-20 18:47:49.000000000 +0200
-@@ -462,6 +462,7 @@
- {
- static char buff[ 4096 ];
- struct Address addr;
-+ pi_buffer_t piBuf;
-
- if (remote == NULL) {
- sprintf (buff, "[NULL]");
-@@ -469,7 +470,10 @@
- }
-
- memset (&addr, 0, sizeof (struct Address));
-- unpack_Address (&addr, remote->record, remote->length);
-+ piBuf.data = remote->record;
-+ piBuf.allocated = remote->length;
-+ piBuf.used = remote->length;
-+ unpack_Address(&addr, &piBuf, address_v1);
-
- g_snprintf (buff, 4096, "['%s' '%s' '%s']",
- addr.entry[entryLastname] ?
-@@ -786,12 +790,23 @@
- }
- }
-
-+/* convert a local EAddrLocalRecord to a GnomePilotRecord for the PDA
-+ *
-+ * @param local local Evolution address record
-+ * @param ctxt conduit context
-+ * @param record record to use for GnomePilotRecord. Allow the calling
-+ * function to determine if the record should be allocated
-+ * dynamically or statically.
-+ * @param maxRecordLen size of *record (max amount of data that can be put
-+ * into record)
-+ */
- static GnomePilotRecord
- local_record_to_pilot_record (EAddrLocalRecord *local,
-- EAddrConduitContext *ctxt)
-+ EAddrConduitContext *ctxt,
-+ unsigned char *record,
-+ int maxRecordLen)
- {
- GnomePilotRecord p;
-- static char record[0xffff];
-
- g_assert (local->addr != NULL );
-
-@@ -802,10 +817,25 @@
- p.attr = local->local.attr;
- p.archived = local->local.archived;
- p.secret = local->local.secret;
-+
-+ memset(record, 0, maxRecordLen);
-
- /* Generate pilot record structure */
-- p.record = record;
-- p.length = pack_Address (local->addr, p.record, 0xffff);
-+ {
-+ pi_buffer_t piBuf;
-+ memset (&piBuf, 0, sizeof (piBuf));
-+
-+ pack_Address(local->addr, &piBuf, address_v1);
-+ if(piBuf.used > 0) {
-+ memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
-+ }
-+
-+ p.length = piBuf.used;
-+ p.record = record;
-+ if(piBuf.data) {
-+ free(piBuf.data);
-+ }
-+ }
-
- return p;
- }
-@@ -834,16 +864,26 @@
- */
- if (local->local.ID != 0) {
- struct Address addr;
-- char record[0xffff];
-+ pi_buffer_t *piBuf;
- int cat = 0;
-+ int dlpReadRetval = 0;
-+
-
-- if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
-- ctxt->dbi->db_handle,
-- local->local.ID, &record,
-- NULL, NULL, NULL, &cat) > 0) {
-+ piBuf = pi_buffer_new(0xffff);
-+ if(piBuf == NULL) {
-+ WARN( _("local_record_from_ecard: no more memory to allocate") );
-+ return;
-+ }
-+ dlpReadRetval = dlp_ReadRecordById(ctxt->dbi->pilot_socket,
-+ ctxt->dbi->db_handle,
-+ local->local.ID, piBuf,
-+ NULL, NULL, &cat);
-+
-+
-+ if (dlpReadRetval > 0) {
- local->local.category = cat;
- memset (&addr, 0, sizeof (struct Address));
-- unpack_Address (&addr, record, 0xffff);
-+ unpack_Address(&addr, piBuf, address_v1);
- for (i = 0; i < 5; i++) {
- if (addr.entry[entryPhone1 + i])
- local->addr->entry[entryPhone1 + i] =
-@@ -858,6 +898,8 @@
- }
- free_Address (&addr);
- }
-+
-+ pi_buffer_free(piBuf);
- }
-
- local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
-@@ -1022,7 +1064,13 @@
-
- g_return_val_if_fail(remote!=NULL,NULL);
- memset (&address, 0, sizeof (struct Address));
-- unpack_Address (&address, remote->record, remote->length);
-+ {
-+ pi_buffer_t piBuf;
-+ piBuf.data = remote->record;
-+ piBuf.allocated = remote->length;
-+ piBuf.used = remote->length;
-+ unpack_Address(&address, &piBuf, address_v1);
-+ }
-
- if (in_contact == NULL)
- contact = e_contact_new ();
-@@ -1212,7 +1260,7 @@
- EBookQuery *query;
- GList *l;
- int len;
-- unsigned char *buf;
-+ pi_buffer_t *piBuf;
- char *filename;
- char *change_id;
- char *auth;
-@@ -1302,9 +1350,14 @@
- gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
- gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-
-- buf = (unsigned char*)g_malloc (0xffff);
-- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-- (unsigned char *)buf, 0xffff);
-+ piBuf = pi_buffer_new(0xffff);
-+ if(piBuf == NULL) {
-+ WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
-+ gnome_pilot_conduit_error (conduit,
-+ _("pre_sync(): Error allocating pi_buffer_t memory"));
-+ return -1;
-+ }
-+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
-
- if (len < 0) {
- WARN (_("Could not read pilot's Address application block"));
-@@ -1313,8 +1366,8 @@
- _("Could not read pilot's Address application block"));
- return -1;
- }
-- unpack_AddressAppInfo (&(ctxt->ai), buf, len);
-- g_free (buf);
-+ unpack_AddressAppInfo (&(ctxt->ai), piBuf->data, len);
-+ pi_buffer_free(piBuf);
-
- check_for_slow_setting (conduit, ctxt);
- if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-@@ -1494,6 +1547,7 @@
- {
- GnomePilotRecord local_pilot;
- int retval = 0;
-+ static unsigned char record[0xffff];
-
- LOG (g_message ("compare: local=%s remote=%s...\n",
- print_local (local), print_remote (remote)));
-@@ -1501,7 +1555,7 @@
- g_return_val_if_fail (local != NULL, -1);
- g_return_val_if_fail (remote != NULL, -1);
-
-- local_pilot = local_record_to_pilot_record (local, ctxt);
-+ local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
-
- if (remote->length != local_pilot.length
- || memcmp (local_pilot.record, remote->record, remote->length))
-@@ -1693,9 +1747,11 @@
- GnomePilotRecord *remote,
- EAddrConduitContext *ctxt)
- {
-+ static unsigned char record[0xffff];
-+
- LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
-
-- *remote = local_record_to_pilot_record (local, ctxt);
-+ *remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
-
- return 0;
- }
-diff -Nur evolution-2.8.0/calendar/conduits/calendar/calendar-conduit.c evolution-2.8.0.new/calendar/conduits/calendar/calendar-conduit.c
---- calendar/conduits/calendar/calendar-conduit.c.orig 2005-12-23 05:39:34.000000000 +0100
-+++ calendar/conduits/calendar/calendar-conduit.c 2006-09-20 18:48:56.000000000 +0200
-@@ -413,6 +413,7 @@
- {
- static char buff[ 4096 ];
- struct Appointment appt;
-+ pi_buffer_t piBuf;
-
- if (remote == NULL) {
- sprintf (buff, "[NULL]");
-@@ -420,7 +421,10 @@
- }
-
- memset (&appt, 0, sizeof (struct Appointment));
-- unpack_Appointment (&appt, remote->record, remote->length);
-+ piBuf.data = remote->record;
-+ piBuf.allocated = remote->length;
-+ piBuf.used = remote->length;
-+ unpack_Appointment(&appt, &piBuf, datebook_v1);
-
- g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
- mktime (&appt.begin),
-@@ -813,12 +817,23 @@
- return TRUE;
- }
-
-+/* convert a local ECalLocalRecord to a GnomePilotRecord for the PDA
-+ *
-+ * @param local local Evolution Calendar record
-+ * @param ctxt conduit context
-+ * @param record record to use for GnomePilotRecord. Allow the calling
-+ * function to determine if the record should be allocated
-+ * dynamically or statically.
-+ * @param maxRecordLen size of *record (max amount of data that can be put
-+ * into record)
-+ */
- static GnomePilotRecord
- local_record_to_pilot_record (ECalLocalRecord *local,
-- ECalConduitContext *ctxt)
-+ ECalConduitContext *ctxt,
-+ unsigned char *record,
-+ int maxRecordLen)
- {
- GnomePilotRecord p;
-- static char record[0xffff];
-
- g_assert (local->comp != NULL);
- g_assert (local->appt != NULL );
-@@ -829,9 +844,25 @@
- p.archived = local->local.archived;
- p.secret = local->local.secret;
-
-+ memset(record, 0, maxRecordLen);
-+
- /* Generate pilot record structure */
-- p.record = record;
-- p.length = pack_Appointment (local->appt, p.record, 0xffff);
-+ {
-+
-+ pi_buffer_t piBuf;
-+ memset (&piBuf, 0, sizeof (piBuf));
-+
-+ pack_Appointment(local->appt, &piBuf, datebook_v1);
-+ if(piBuf.used > 0) {
-+ memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
-+ }
-+
-+ p.length = piBuf.used;
-+ p.record = record;
-+ if(piBuf.data) {
-+ free(piBuf.data);
-+ }
-+ }
-
- return p;
- }
-@@ -867,22 +898,31 @@
- * we don't overwrite them
- */
- if (local->local.ID != 0) {
-- struct Appointment appt;
-- char record[0xffff];
-+ struct Appointment appt;
-+ pi_buffer_t *piBuf;
- int cat = 0;
-+ int dlpReadRetval = 0;
-
-- if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
-- ctxt->dbi->db_handle,
-- local->local.ID, &record,
-- NULL, NULL, NULL, &cat) > 0) {
-+ piBuf = pi_buffer_new(0xffff);
-+ if(piBuf == NULL) {
-+ WARN( _("local_record_from_comp: no more memory to allocate") );
-+ return;
-+ }
-+ dlpReadRetval = dlp_ReadRecordById (ctxt->dbi->pilot_socket,
-+ ctxt->dbi->db_handle,
-+ local->local.ID, piBuf,
-+ NULL, NULL, &cat);
-+
-+ if (dlpReadRetval > 0) {
- local->local.category = cat;
- memset (&appt, 0, sizeof (struct Appointment));
-- unpack_Appointment (&appt, record, 0xffff);
-+ unpack_Appointment (&appt, piBuf, datebook_v1);
- local->appt->alarm = appt.alarm;
- local->appt->advance = appt.advance;
- local->appt->advanceUnits = appt.advanceUnits;
- free_Appointment (&appt);
- }
-+ pi_buffer_free(piBuf);
- }
-
- /* STOP: don't replace these with g_strdup, since free_Appointment
-@@ -1144,7 +1184,13 @@
- g_return_val_if_fail (remote != NULL, NULL);
-
- memset (&appt, 0, sizeof (struct Appointment));
-- unpack_Appointment (&appt, remote->record, remote->length);
-+ {
-+ pi_buffer_t piBuf;
-+ piBuf.data = remote->record;
-+ piBuf.allocated = remote->length;
-+ piBuf.used = remote->length;
-+ unpack_Appointment(&appt, &piBuf, datebook_v1);
-+ }
-
- if (in_comp == NULL) {
- comp = e_cal_component_new ();
-@@ -1409,7 +1455,7 @@
- GnomePilotConduitSyncAbs *abs_conduit;
- GList *removed = NULL, *added = NULL, *l;
- int len;
-- unsigned char *buf;
-+ pi_buffer_t *piBuf;
- char *filename, *change_id;
- icalcomponent *icalcomp;
- gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-@@ -1521,9 +1567,14 @@
- gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
- gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-
-- buf = (unsigned char*)g_malloc (0xffff);
-- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-- (unsigned char *)buf, 0xffff);
-+ piBuf = pi_buffer_new(0xffff);
-+ if(piBuf == NULL) {
-+ WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
-+ gnome_pilot_conduit_error (conduit,
-+ _("pre_sync(): Error allocating pi_buffer_t memory"));
-+ return -1;
-+ }
-+ len = dlp_ReadAppBlock(dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
-
- if (len < 0) {
- WARN (_("Could not read pilot's Calendar application block"));
-@@ -1532,8 +1583,8 @@
- _("Could not read pilot's Calendar application block"));
- return -1;
- }
-- unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
-- g_free (buf);
-+ unpack_AppointmentAppInfo (&(ctxt->ai), piBuf->data, len);
-+ pi_buffer_free(piBuf);
-
- check_for_slow_setting (conduit, ctxt);
- if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-@@ -1715,6 +1766,7 @@
- /* used by the quick compare */
- GnomePilotRecord local_pilot;
- int retval = 0;
-+ static unsigned char record[0xffff];
-
- LOG (g_message ("compare: local=%s remote=%s...\n",
- print_local (local), print_remote (remote)));
-@@ -1722,7 +1774,7 @@
- g_return_val_if_fail (local!=NULL,-1);
- g_return_val_if_fail (remote!=NULL,-1);
-
-- local_pilot = local_record_to_pilot_record (local, ctxt);
-+ local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
-
- if (remote->length != local_pilot.length
- || memcmp (local_pilot.record, remote->record, remote->length))
-@@ -1883,9 +1935,11 @@
- GnomePilotRecord *remote,
- ECalConduitContext *ctxt)
- {
-+ static unsigned char record[0xffff];
-+
- LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
-
-- *remote = local_record_to_pilot_record (local, ctxt);
-+ *remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
-
- return 0;
- }
-diff -Nur evolution-2.8.0/calendar/conduits/memo/memo-conduit.c evolution-2.8.0.new/calendar/conduits/memo/memo-conduit.c
---- calendar/conduits/memo/memo-conduit.c.orig 2005-10-19 13:39:35.000000000 +0200
-+++ calendar/conduits/memo/memo-conduit.c 2006-09-20 18:49:46.000000000 +0200
-@@ -331,6 +331,7 @@
- {
- static char buff[ 64 ];
- struct Memo memo;
-+ pi_buffer_t piBuf;
-
- if (remote == NULL) {
- sprintf (buff, "[NULL]");
-@@ -338,7 +339,10 @@
- }
-
- memset (&memo, 0, sizeof (struct Memo));
-- unpack_Memo (&memo, remote->record, remote->length);
-+ piBuf.data = remote->record;
-+ piBuf.allocated = remote->length;
-+ piBuf.used = remote->length;
-+ unpack_Memo(&memo, &piBuf, memo_v1);
-
- g_snprintf (buff, 64, "['%s']",
- memo.text ?
-@@ -446,12 +450,24 @@
- }
- }
-
-+/**
-+ * convert a local EMemoLocalRecord to a GnomePilotRecord for the PDA
-+ *
-+ * @param local local Evolution memo record
-+ * @param ctxt conduit context
-+ * @param record record to use for GnomePilotRecord. Allow the calling
-+ * function to determine if the record should be allocated
-+ * dynamically or statically.
-+ * @param maxRecordLen size of *record (max amount of data that can be put
-+ * into record)
-+ */
- static GnomePilotRecord
- local_record_to_pilot_record (EMemoLocalRecord *local,
-- EMemoConduitContext *ctxt)
-+ EMemoConduitContext *ctxt,
-+ unsigned char *record,
-+ int maxRecordLen)
- {
- GnomePilotRecord p;
-- static char record[0xffff];
-
- g_assert (local->comp != NULL);
- g_assert (local->memo != NULL );
-@@ -464,9 +480,25 @@
- p.archived = local->local.archived;
- p.secret = local->local.secret;
-
-+ memset(record, 0, maxRecordLen);
-+
- /* Generate pilot record structure */
-- p.record = record;
-- p.length = pack_Memo (local->memo, p.record, 0xffff);
-+ {
-+
-+ pi_buffer_t piBuf;
-+ memset (&piBuf, 0, sizeof (piBuf));
-+
-+ pack_Memo(local->memo, &piBuf, memo_v1);
-+ if(piBuf.used > 0) {
-+ memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
-+ }
-+
-+ p.length = piBuf.used;
-+ p.record = record;
-+ if(piBuf.data) {
-+ free(piBuf.data);
-+ }
-+ }
-
- return p;
- }
-@@ -483,53 +515,39 @@
- {
- int i, j;
- int retval = 0; /* 0 is the Unfiled category */
-- LOG(fprintf(stderr, "add_category_if_possible: called\n"));
-+ LOG(g_message("add_category_if_possible\n"));
-
- for(i=0; i<16; i++){
- /* if strlen is 0, then the category is empty
- the PalmOS doesn't let 0-length strings for
- categories */
-- LOG(fprintf(stderr, "add_category_if_possible: calling strlen, i==%d\n", i));
- if(strlen(category->name[i]) == 0){
- int cat_to_add_len;
-- LOG(fprintf(stderr, "add_category_if_possible: strlen == 0\n"));
-
- cat_to_add_len = strlen(cat_to_add);
-- LOG(fprintf(stderr, "add_category_if_possible: cat_to_add_len: %d\n",
-- cat_to_add_len));
- retval = i;
-
- /* only 15 characters for category, 16th is
- * '\0' can't do direct mem transfer due to
- * declaration type
- */
-- LOG(fprintf(stderr, "add_category_if_possible: copying first 15 of category\n"));
- for(j=0; j<cat_to_add_len; j++){
- category->name[i][j] = cat_to_add[j];
- }
-- LOG(fprintf(stderr,
-- "add_category_if_possible: setting from %d to i==15 to \\0\n",
-- cat_to_add_len));
-
- for(j=cat_to_add_len; j<16; j++)
- category->name[i][j] = '\0';
-
-- LOG(fprintf(stderr, "add_category_if_possible: setting ID[%d] to %d\n",
-- category->ID[i], lastDesktopUniqueID));
- category->ID[i] = lastDesktopUniqueID;
- lastDesktopUniqueID++;
--
-- LOG(fprintf(stderr, "add_category_if_possible: setting renamed[%d] to TRUE\n", i));
- category->renamed[i] = TRUE;
-
-- LOG(g_message("*** adding category '%s', ID %d ***",
-- category->name[i], category->ID[i]));
- break;
- }
- }
-
- if(retval == 0){
-- LOG(g_message("*** not adding category - category list already full ***"));
-+ LOG(g_warning( _("*** not adding category - category list already full ***") ));
- }
-
- return retval;
-@@ -554,31 +572,35 @@
- local->comp = comp;
- g_object_ref (comp);
-
-- LOG(fprintf(stderr, "local_record_from_comp: calling e_cal_component_get_uid\n"));
- e_cal_component_get_uid (local->comp, &uid);
-- LOG(fprintf(stderr, "local_record_from_comp: got UID - %s, calling e_pilot_map_lookup_pid\n", uid));
- local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid, TRUE);
-- LOG(fprintf(stderr, "local_record_from_comp: local->local.ID == %lu\n", local->local.ID));
-
- compute_status (ctxt, local, uid);
--
-- LOG(fprintf(stderr, "local_record_from_comp: local->local.attr: %d\n", local->local.attr));
-
- local->memo = g_new0 (struct Memo,1);
-
- /* Don't overwrite the category */
- if (local->local.ID != 0) {
-- char record[0xffff];
- int cat = 0;
-+ int dlpReadRetval = 0;
-+ pi_buffer_t *piBuf;
-+ piBuf = pi_buffer_new(0xffff);
-+ if(piBuf == NULL) {
-+ WARN( _("local_record_from_comp: no more memory to allocate") );
-+ return;
-+ }
-
-- LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n"));
-- if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
-- ctxt->dbi->db_handle,
-- local->local.ID, &record,
-- NULL, NULL, NULL, &cat) > 0) {
-+ dlpReadRetval = dlp_ReadRecordById(ctxt->dbi->pilot_socket,
-+ ctxt->dbi->db_handle,
-+ local->local.ID, piBuf,
-+ NULL, NULL, &cat);
-+
-+
-+ if (dlpReadRetval > 0) {
- local->local.category = cat;
- }
-- LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n"));
-+
-+ pi_buffer_free(piBuf);
- }
-
- /*
-@@ -589,34 +611,23 @@
- int cat = -1;
- int i;
-
-- LOG(fprintf(stderr, "local_record_from_comp: trying to set category"));
-- LOG(fprintf(stderr, "local_record_from_comp: calling e_cal_component_get_categories_list\n"));
--
- e_cal_component_get_categories_list(comp, &categ_list_head);
-- LOG(fprintf(stderr, "local_record_from_comp: got list, setting categ_list_cur to head\n"));
-
- categ_list_cur = categ_list_head;
- while (categ_list_cur && cat == -1)
- {
-- LOG(fprintf(stderr, "local_record_from_comp: iterating, data == %s",
-- (char *)categ_list_cur->data));
- for(i=0; i<16; i++){
-- LOG(fprintf(stderr, "local_record_from_comp: i == %d\n", i));
- if(strcmp((char *)categ_list_cur->data,
- ctxt->ai.category.name[i]) == 0){
- cat = i;
-- LOG(fprintf(stderr, "local_record_from_comp: found category, name: %s\n",
-- ctxt->ai.category.name[i]));
- break;
- }
- }
-
-- LOG(fprintf(stderr, "local_record_from_comp: calling g_slist_next\n"));
- categ_list_cur = g_slist_next(categ_list_cur);
- }
-
- if(cat != -1){
-- LOG(fprintf(stderr, "local_record_from_comp: setting category\n"));
- local->local.category = cat;
- }
- else if(categ_list_head != NULL){
-@@ -708,7 +719,13 @@
- g_return_val_if_fail (remote != NULL, NULL);
-
- memset (&memo, 0, sizeof (struct Memo));
-- unpack_Memo (&memo, remote->record, remote->length);
-+ {
-+ pi_buffer_t piBuf;
-+ piBuf.data = remote->record;
-+ piBuf.allocated = remote->length;
-+ piBuf.used = remote->length;
-+ unpack_Memo(&memo, &piBuf, memo_v1);
-+ }
-
- utc_zone = icaltimezone_get_utc_timezone ();
- now = icaltime_from_timet_with_zone (time (NULL), FALSE,
-@@ -836,7 +853,7 @@
- GnomePilotConduitSyncAbs *abs_conduit;
- GList *l;
- int len;
-- unsigned char *buf;
-+ pi_buffer_t *piBuf;
- char *filename, *change_id;
- icalcomponent *icalcomp;
- gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-@@ -929,9 +946,14 @@
- g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
- num_records, add_records, mod_records, del_records);
-
-- buf = (unsigned char*)g_malloc (0xffff);
-- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-- (unsigned char *)buf, 0xffff);
-+ piBuf = pi_buffer_new(0xffff);
-+ if(piBuf == NULL) {
-+ WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
-+ gnome_pilot_conduit_error (conduit,
-+ _("pre_sync(): Error allocating pi_buffer_t memory"));
-+ return -1;
-+ }
-+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
-
- if (len < 0) {
- WARN (_("Could not read pilot's Memo application block"));
-@@ -940,8 +962,9 @@
- _("Could not read pilot's Memo application block"));
- return -1;
- }
-- unpack_MemoAppInfo (&(ctxt->ai), buf, len);
-- g_free (buf);
-+
-+ unpack_MemoAppInfo (&(ctxt->ai), piBuf->data, len);
-+ pi_buffer_free(piBuf);
-
- lastDesktopUniqueID = 128;
-
-@@ -963,6 +986,9 @@
- unsigned char *buf;
- int dlpRetVal, len;
-
-+ /* Write AppBlock to PDA - updates categories */
-+ /* NOTE: not changed for pilot-link 0.12 because the two
-+ * functions below didn't change */
- buf = (unsigned char*)g_malloc (0xffff);
-
- len = pack_MemoAppInfo (&(ctxt->ai), buf, 0xffff);
-@@ -1156,6 +1182,7 @@
- /* used by the quick compare */
- GnomePilotRecord local_pilot;
- int retval = 0;
-+ static unsigned char record[0xffff];
-
- LOG (g_message ("compare: local=%s remote=%s...\n",
- print_local (local), print_remote (remote)));
-@@ -1163,7 +1190,7 @@
- g_return_val_if_fail (local!=NULL,-1);
- g_return_val_if_fail (remote!=NULL,-1);
-
-- local_pilot = local_record_to_pilot_record (local, ctxt);
-+ local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
-
- if (remote->length != local_pilot.length
- || memcmp (local_pilot.record, remote->record, remote->length))
-@@ -1319,9 +1346,10 @@
- GnomePilotRecord *remote,
- EMemoConduitContext *ctxt)
- {
-+ static unsigned char record[0xffff];
- LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
-
-- *remote = local_record_to_pilot_record (local, ctxt);
-+ *remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
-
- return 0;
- }
-diff -Nur evolution-2.8.0/calendar/conduits/todo/todo-conduit.c evolution-2.8.0.new/calendar/conduits/todo/todo-conduit.c
---- calendar/conduits/todo/todo-conduit.c.orig 2006-05-13 09:56:49.000000000 +0200
-+++ calendar/conduits/todo/todo-conduit.c 2006-09-20 18:50:31.000000000 +0200
-@@ -409,7 +409,13 @@
- }
-
- memset (&todo, 0, sizeof (struct ToDo));
-- unpack_ToDo (&todo, remote->record, remote->length);
-+ {
-+ pi_buffer_t piBuf;
-+ piBuf.data = remote->record;
-+ piBuf.allocated = remote->length;
-+ piBuf.used = remote->length;
-+ unpack_ToDo(&todo, &piBuf, todo_v1);
-+ }
-
- g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s' %d]",
- todo.indefinite,
-@@ -589,12 +595,24 @@
- }
- }
-
-+/**
-+ * convert a local EMemoLocalRecord to a GnomePilotRecord for the PDA
-+ *
-+ * @param local local Evolution memo record
-+ * @param ctxt conduit context
-+ * @param record record to use for GnomePilotRecord. Allow the calling
-+ * function to determine if the record should be allocated
-+ * dynamically or statically.
-+ * @param maxRecordLen size of *record (max amount of data that can be put
-+ * into record)
-+ */
- static GnomePilotRecord
- local_record_to_pilot_record (EToDoLocalRecord *local,
-- EToDoConduitContext *ctxt)
-+ EToDoConduitContext *ctxt,
-+ unsigned char *record,
-+ int maxRecordLen)
- {
- GnomePilotRecord p;
-- static char record[0xffff];
-
- g_assert (local->comp != NULL);
- g_assert (local->todo != NULL );
-@@ -607,9 +625,24 @@
- p.archived = local->local.archived;
- p.secret = local->local.secret;
-
-+ memset(record, 0, maxRecordLen);
-+
- /* Generate pilot record structure */
-- p.record = record;
-- p.length = pack_ToDo (local->todo, p.record, 0xffff);
-+ {
-+ pi_buffer_t piBuf;
-+ memset (&piBuf, 0, sizeof (piBuf));
-+
-+ pack_ToDo(local->todo, &piBuf, todo_v1);
-+ if(piBuf.used > 0) {
-+ memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
-+ }
-+
-+ p.length = piBuf.used;
-+ p.record = record;
-+ if(piBuf.data) {
-+ free(piBuf.data);
-+ }
-+ }
-
- return p;
- }
-@@ -696,15 +729,23 @@
-
- /* Don't overwrite the category */
- if (local->local.ID != 0) {
-- char record[0xffff];
- int cat = 0;
--
-- if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
-- ctxt->dbi->db_handle,
-- local->local.ID, &record,
-- NULL, NULL, NULL, &cat) > 0) {
-+ int dlpReadRetval = 0;
-+ pi_buffer_t *piBuf = pi_buffer_new(0xffff);
-+ if(piBuf == NULL) {
-+ WARN( _("local_record_from_comp: no more memory to allocate") );
-+ return;
-+ }
-+ dlpReadRetval = dlp_ReadRecordById(ctxt->dbi->pilot_socket,
-+ ctxt->dbi->db_handle,
-+ local->local.ID, piBuf,
-+ NULL, NULL, &cat);
-+
-+ if (dlpReadRetval > 0) {
- local->local.category = cat;
- }
-+
-+ pi_buffer_free(piBuf);
- }
-
- /*
-@@ -864,7 +905,13 @@
- g_return_val_if_fail (remote != NULL, NULL);
-
- memset (&todo, 0, sizeof (struct ToDo));
-- unpack_ToDo (&todo, remote->record, remote->length);
-+ {
-+ pi_buffer_t piBuf;
-+ piBuf.data = remote->record;
-+ piBuf.allocated = remote->length;
-+ piBuf.used = remote->length;
-+ unpack_ToDo(&todo, &piBuf, todo_v1);
-+ }
-
- utc_zone = icaltimezone_get_utc_timezone ();
- now = icaltime_from_timet_with_zone (time (NULL), FALSE,
-@@ -1014,7 +1061,7 @@
- GnomePilotConduitSyncAbs *abs_conduit;
- GList *l;
- int len;
-- unsigned char *buf;
-+ pi_buffer_t *piBuf;
- char *filename, *change_id;
- icalcomponent *icalcomp;
- gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-@@ -1104,9 +1151,14 @@
- g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
- num_records, add_records, mod_records, del_records);
-
-- buf = (unsigned char*)g_malloc (0xffff);
-- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-- (unsigned char *)buf, 0xffff);
-+ piBuf = pi_buffer_new(0xffff);
-+ if(piBuf == NULL) {
-+ WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
-+ gnome_pilot_conduit_error (conduit,
-+ _("pre_sync(): Error allocating pi_buffer_t memory"));
-+ return -1;
-+ }
-+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
-
- if (len < 0) {
- WARN (_("Could not read pilot's ToDo application block"));
-@@ -1115,8 +1167,9 @@
- _("Could not read pilot's ToDo application block"));
- return -1;
- }
-- unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
-- g_free (buf);
-+
-+ unpack_ToDoAppInfo (&(ctxt->ai), piBuf->data, len);
-+ pi_buffer_free(piBuf);
-
- lastDesktopUniqueID = 128;
-
-@@ -1138,6 +1191,9 @@
- unsigned char *buf;
- int dlpRetVal, len;
-
-+ /* Write AppBlock to PDA - updates categories */
-+ /* NOTE: not changed for pilot-link 0.12 because the two
-+ * functions below didn't change */
- buf = (unsigned char*)g_malloc (0xffff);
-
- len = pack_ToDoAppInfo (&(ctxt->ai), buf, 0xffff);
-@@ -1320,6 +1376,7 @@
- /* used by the quick compare */
- GnomePilotRecord local_pilot;
- int retval = 0;
-+ static unsigned char record[0xffff];
-
- LOG (g_message ("compare: local=%s remote=%s...\n",
- print_local (local), print_remote (remote)));
-@@ -1327,7 +1384,7 @@
- g_return_val_if_fail (local!=NULL,-1);
- g_return_val_if_fail (remote!=NULL,-1);
-
-- local_pilot = local_record_to_pilot_record (local, ctxt);
-+ local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
-
- if (remote->length != local_pilot.length
- || memcmp (local_pilot.record, remote->record, remote->length))
-@@ -1484,9 +1541,11 @@
- GnomePilotRecord *remote,
- EToDoConduitContext *ctxt)
- {
-+ static unsigned char record[0xffff];
-+
- LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
-
-- *remote = local_record_to_pilot_record (local, ctxt);
-+ *remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
-
- return 0;
- }
diff --git a/mail/evolution/files/patch-data_Makefile.in b/mail/evolution/files/patch-data_Makefile.in
deleted file mode 100644
index b6b89ee..0000000
--- a/mail/evolution/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- data/Makefile.in.orig Mon Jan 29 21:52:23 2007
-+++ data/Makefile.in Mon Jan 29 21:59:20 2007
-@@ -753,16 +753,16 @@
- install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file)
- $(mkinstalldirs) $(DESTDIR)$(desktopdir); \
- $(INSTALL_DATA) $(desktop_file) \
-- $(DESTDIR)$(desktopdir)/$(desktop_file) ; \
-+ $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; \
- $(mkinstalldirs) $(DESTDIR)$(keysdir); \
-- $(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file) ; \
-+ $(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ; \
- $(mkinstalldirs) $(DESTDIR)$(mimedir); \
-- $(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file) ;
-+ $(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
-
- uninstall-local: uninstall-kde-applnk
-- rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file) ; \
-- rm -rf $(DESTDIR)$(keysdir)/$(keys_file) ; \
-- rm -rf $(DESTDIR)$(mimedir)/$(mime_file) ;
-+ rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; \
-+ rm -rf $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ; \
-+ rm -rf $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
-
- # CDE Stuff
-
diff --git a/mail/evolution/files/patch-mail_em-utils.h b/mail/evolution/files/patch-mail_em-utils.h
new file mode 100644
index 0000000..b3e7b9f
--- /dev/null
+++ b/mail/evolution/files/patch-mail_em-utils.h
@@ -0,0 +1,10 @@
+--- mail/em-utils.h.orig Tue Aug 3 16:59:46 2004
++++ mail/em-utils.h Tue Aug 3 17:00:04 2004
+@@ -23,6 +23,7 @@
+ #ifndef __EM_UTILS_H__
+ #define __EM_UTILS_H__
+
++#include <sys/types.h>
+ #include <glib.h>
+
+ #ifdef __cplusplus
diff --git a/mail/evolution/files/patch-plugins_groupwise-features_junk-settings.c b/mail/evolution/files/patch-plugins_groupwise-features_junk-settings.c
deleted file mode 100644
index 6c9b6f4..0000000
--- a/mail/evolution/files/patch-plugins_groupwise-features_junk-settings.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/groupwise-features/junk-settings.c.orig Mon Feb 12 01:44:51 2007
-+++ plugins/groupwise-features/junk-settings.c Mon Feb 12 01:45:01 2007
-@@ -25,6 +25,7 @@
- #include <glade/glade.h>
- #include "junk-settings.h"
- #include <glib/gmain.h>
-+#include <glib/gi18n-lib.h>
- #include <gtk/gtktreemodel.h>
- #include <gtk/gtkliststore.h>
- #include <gtk/gtktreeselection.h>
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 4ea665c..0e14434 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -296,8 +296,6 @@ 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
-%%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
@@ -326,6 +324,8 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.la
@@ -355,7 +355,6 @@ 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
-%%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
@@ -376,6 +375,7 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-folder-permissions.xml
lib/evolution/%%VERSION%%/plugins/org-gnome-folder-subscription.xml
lib/evolution/%%VERSION%%/plugins/org-gnome-groupwise-features.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-gw-account-setup.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-imap-features.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
@@ -409,11 +409,12 @@ 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/es/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
@@ -474,6 +475,7 @@ share/gnome/evolution/%%VERSION%%/glade/exchange-folder-tree.glade
share/gnome/evolution/%%VERSION%%/glade/exchange-oof.glade
share/gnome/evolution/%%VERSION%%/glade/exchange-passwd-expiry.glade
share/gnome/evolution/%%VERSION%%/glade/exchange-permissions-dialog.glade
+share/gnome/evolution/%%VERSION%%/glade/exchange-send-options.glade
share/gnome/evolution/%%VERSION%%/glade/filter.glade
share/gnome/evolution/%%VERSION%%/glade/fulladdr.glade
share/gnome/evolution/%%VERSION%%/glade/fullname.glade
@@ -483,13 +485,14 @@ share/gnome/evolution/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
share/gnome/evolution/%%VERSION%%/glade/gal-view-new-dialog.glade
share/gnome/evolution/%%VERSION%%/glade/goto-dialog.glade
share/gnome/evolution/%%VERSION%%/glade/im.glade
+share/gnome/evolution/%%VERSION%%/glade/imap-headers.glade
share/gnome/evolution/%%VERSION%%/glade/import.glade
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/meeting-page.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
share/gnome/evolution/%%VERSION%%/glade/proxy-listing.glade
@@ -501,11 +504,10 @@ share/gnome/evolution/%%VERSION%%/glade/task-details-page.glade
share/gnome/evolution/%%VERSION%%/glade/task-page.glade
share/gnome/evolution/%%VERSION%%/help/quickref/C/quickref.pdf
share/gnome/evolution/%%VERSION%%/help/quickref/de/quickref.pdf
-share/gnome/evolution/%%VERSION%%/images/about-box.png
-share/gnome/evolution/%%VERSION%%/images/bcg.png
+share/gnome/evolution/%%VERSION%%/help/quickref/es/quickref.pdf
+share/gnome/evolution/%%VERSION%%/help/quickref/sv/quickref.pdf
share/gnome/evolution/%%VERSION%%/images/evolution-contacts-mini.png
share/gnome/evolution/%%VERSION%%/images/minus.png
-share/gnome/evolution/%%VERSION%%/images/monkey-16.png
share/gnome/evolution/%%VERSION%%/images/offline.png
share/gnome/evolution/%%VERSION%%/images/online.png
share/gnome/evolution/%%VERSION%%/images/plus.png
@@ -561,54 +563,386 @@ share/gnome/evolution/%%VERSION%%/weather/category_weather_tstorm_16.png
%%PILOT:%%share/gnome/gnome-pilot/conduits/e-address-%%VERSION%%.conduit
%%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
-share/gnome/help/evolution-%%VERSION%%/C/figures/contact-editor.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/contact.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/contacts_mainwindow_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_account_info_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_contacteditor_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_email_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_gwreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_identity_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_imapreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mail_callout_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_maildirreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mboxreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mereceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mhreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_newmess_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_popreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_receive_setup2_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_receive_setup_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_rule_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_send_setup_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_timezone_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_usereceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-delegation.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-identity.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive-options.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/filter-new-fig.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-1.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-2.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-3.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-4.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-5.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-6.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-7.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-druid-pic.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-inbox.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-threaded.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail_mainwindow_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mainwindow-pic.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/newmsg.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/replymsg.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/schedule.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/C/evolution.xml
+share/gnome/help/evolution/C/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/C/figures/account_editor_a.png
+share/gnome/help/evolution/C/figures/calendar.png
+share/gnome/help/evolution/C/figures/categories_a.png
+share/gnome/help/evolution/C/figures/collap_head_a.png
+share/gnome/help/evolution/C/figures/config-cal.png
+share/gnome/help/evolution/C/figures/config-mail.png
+share/gnome/help/evolution/C/figures/contact-editor.png
+share/gnome/help/evolution/C/figures/contact.png
+share/gnome/help/evolution/C/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/C/figures/delgt-add.png
+share/gnome/help/evolution/C/figures/evo_account_editor_a.png
+share/gnome/help/evolution/C/figures/evo_account_info_a.png
+share/gnome/help/evolution/C/figures/evo_add_rule_a.png
+share/gnome/help/evolution/C/figures/evo_adv_search_a.png
+share/gnome/help/evolution/C/figures/evo_allday_a.png
+share/gnome/help/evolution/C/figures/evo_cal_a.png
+share/gnome/help/evolution/C/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/C/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/C/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/C/figures/evo_edit_rule_a.png
+share/gnome/help/evolution/C/figures/evo_edit_search.png
+share/gnome/help/evolution/C/figures/evo_email_a.png
+share/gnome/help/evolution/C/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/C/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/C/figures/evo_gwreceiveedit_a.png
+share/gnome/help/evolution/C/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/C/figures/evo_identity_a.png
+share/gnome/help/evolution/C/figures/evo_identityedit_a.png
+share/gnome/help/evolution/C/figures/evo_imapheader_a.png
+share/gnome/help/evolution/C/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/C/figures/evo_import_asst_a.png
+share/gnome/help/evolution/C/figures/evo_mail_a.png
+share/gnome/help/evolution/C/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/C/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/C/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/C/figures/evo_memo_a.png
+share/gnome/help/evolution/C/figures/evo_mereceive_a.png
+share/gnome/help/evolution/C/figures/evo_message_filters_a.png
+share/gnome/help/evolution/C/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/C/figures/evo_newmess_a.png
+share/gnome/help/evolution/C/figures/evo_popreceive_a.png
+share/gnome/help/evolution/C/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/C/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/C/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/C/figures/evo_rmdrnotes_a.png
+share/gnome/help/evolution/C/figures/evo_rule_a.png
+share/gnome/help/evolution/C/figures/evo_select_add_folder.png
+share/gnome/help/evolution/C/figures/evo_select_folder.png
+share/gnome/help/evolution/C/figures/evo_send_option_a.png
+share/gnome/help/evolution/C/figures/evo_send_setup_a.png
+share/gnome/help/evolution/C/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/C/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/C/figures/evo_timezone_a.png
+share/gnome/help/evolution/C/figures/evo_usereceive_a.png
+share/gnome/help/evolution/C/figures/exchange-delegation.png
+share/gnome/help/evolution/C/figures/exchange-identity.png
+share/gnome/help/evolution/C/figures/exchange-receive-options.png
+share/gnome/help/evolution/C/figures/exchange-receive.png
+share/gnome/help/evolution/C/figures/exchg-identity.png
+share/gnome/help/evolution/C/figures/exchng-identity.png
+share/gnome/help/evolution/C/figures/exchng-rec-mail.png
+share/gnome/help/evolution/C/figures/exchng-rec-mails.png
+share/gnome/help/evolution/C/figures/exchng-rec-option.png
+share/gnome/help/evolution/C/figures/exchng-rec-options.png
+share/gnome/help/evolution/C/figures/exchng-settings.png
+share/gnome/help/evolution/C/figures/filter-new-fig.png
+share/gnome/help/evolution/C/figures/free_busy.png
+share/gnome/help/evolution/C/figures/full-1.png
+share/gnome/help/evolution/C/figures/full-2.png
+share/gnome/help/evolution/C/figures/full-3.png
+share/gnome/help/evolution/C/figures/full-4.png
+share/gnome/help/evolution/C/figures/full-5.png
+share/gnome/help/evolution/C/figures/full-6.png
+share/gnome/help/evolution/C/figures/full-7.png
+share/gnome/help/evolution/C/figures/mail-druid-pic.png
+share/gnome/help/evolution/C/figures/mail-inbox.png
+share/gnome/help/evolution/C/figures/mail-threaded.png
+share/gnome/help/evolution/C/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/C/figures/mailer_preferences.png
+share/gnome/help/evolution/C/figures/mainwindow-pic.png
+share/gnome/help/evolution/C/figures/minus.png
+share/gnome/help/evolution/C/figures/newmsg.png
+share/gnome/help/evolution/C/figures/plus.png
+share/gnome/help/evolution/C/figures/proxy-cal.png
+share/gnome/help/evolution/C/figures/proxy-login.png
+share/gnome/help/evolution/C/figures/quick_add_a.png
+share/gnome/help/evolution/C/figures/replymsg.png
+share/gnome/help/evolution/C/figures/schedule.png
+share/gnome/help/evolution/C/figures/stock_search.png
+share/gnome/help/evolution/C/figures/sub-others-folder.png
+share/gnome/help/evolution/C/figures/sub-pub-fold.png
+share/gnome/help/evolution/C/figures/ver_view_a.png
+share/gnome/help/evolution/C/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/en_GB/evolution.xml
+share/gnome/help/evolution/en_GB/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/en_GB/figures/account_editor_a.png
+share/gnome/help/evolution/en_GB/figures/calendar.png
+share/gnome/help/evolution/en_GB/figures/categories_a.png
+share/gnome/help/evolution/en_GB/figures/collap_head_a.png
+share/gnome/help/evolution/en_GB/figures/config-cal.png
+share/gnome/help/evolution/en_GB/figures/config-mail.png
+share/gnome/help/evolution/en_GB/figures/contact-editor.png
+share/gnome/help/evolution/en_GB/figures/contact.png
+share/gnome/help/evolution/en_GB/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/en_GB/figures/delgt-add.png
+share/gnome/help/evolution/en_GB/figures/evo_account_editor_a.png
+share/gnome/help/evolution/en_GB/figures/evo_account_info_a.png
+share/gnome/help/evolution/en_GB/figures/evo_add_rule_a.png
+share/gnome/help/evolution/en_GB/figures/evo_adv_search_a.png
+share/gnome/help/evolution/en_GB/figures/evo_allday_a.png
+share/gnome/help/evolution/en_GB/figures/evo_cal_a.png
+share/gnome/help/evolution/en_GB/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/en_GB/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/en_GB/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/en_GB/figures/evo_edit_rule_a.png
+share/gnome/help/evolution/en_GB/figures/evo_edit_search.png
+share/gnome/help/evolution/en_GB/figures/evo_email_a.png
+share/gnome/help/evolution/en_GB/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/en_GB/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_gwreceiveedit_a.png
+share/gnome/help/evolution/en_GB/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/en_GB/figures/evo_identity_a.png
+share/gnome/help/evolution/en_GB/figures/evo_identityedit_a.png
+share/gnome/help/evolution/en_GB/figures/evo_imapheader_a.png
+share/gnome/help/evolution/en_GB/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_import_asst_a.png
+share/gnome/help/evolution/en_GB/figures/evo_mail_a.png
+share/gnome/help/evolution/en_GB/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/en_GB/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_memo_a.png
+share/gnome/help/evolution/en_GB/figures/evo_mereceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_message_filters_a.png
+share/gnome/help/evolution/en_GB/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_newmess_a.png
+share/gnome/help/evolution/en_GB/figures/evo_popreceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/en_GB/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/en_GB/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/en_GB/figures/evo_rmdrnotes_a.png
+share/gnome/help/evolution/en_GB/figures/evo_rule_a.png
+share/gnome/help/evolution/en_GB/figures/evo_select_add_folder.png
+share/gnome/help/evolution/en_GB/figures/evo_select_folder.png
+share/gnome/help/evolution/en_GB/figures/evo_send_option_a.png
+share/gnome/help/evolution/en_GB/figures/evo_send_setup_a.png
+share/gnome/help/evolution/en_GB/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/en_GB/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/en_GB/figures/evo_timezone_a.png
+share/gnome/help/evolution/en_GB/figures/evo_usereceive_a.png
+share/gnome/help/evolution/en_GB/figures/exchange-delegation.png
+share/gnome/help/evolution/en_GB/figures/exchange-identity.png
+share/gnome/help/evolution/en_GB/figures/exchange-receive-options.png
+share/gnome/help/evolution/en_GB/figures/exchange-receive.png
+share/gnome/help/evolution/en_GB/figures/exchg-identity.png
+share/gnome/help/evolution/en_GB/figures/exchng-identity.png
+share/gnome/help/evolution/en_GB/figures/exchng-rec-mail.png
+share/gnome/help/evolution/en_GB/figures/exchng-rec-mails.png
+share/gnome/help/evolution/en_GB/figures/exchng-rec-option.png
+share/gnome/help/evolution/en_GB/figures/exchng-rec-options.png
+share/gnome/help/evolution/en_GB/figures/exchng-settings.png
+share/gnome/help/evolution/en_GB/figures/filter-new-fig.png
+share/gnome/help/evolution/en_GB/figures/free_busy.png
+share/gnome/help/evolution/en_GB/figures/full-1.png
+share/gnome/help/evolution/en_GB/figures/full-2.png
+share/gnome/help/evolution/en_GB/figures/full-3.png
+share/gnome/help/evolution/en_GB/figures/full-4.png
+share/gnome/help/evolution/en_GB/figures/full-5.png
+share/gnome/help/evolution/en_GB/figures/full-6.png
+share/gnome/help/evolution/en_GB/figures/full-7.png
+share/gnome/help/evolution/en_GB/figures/mail-druid-pic.png
+share/gnome/help/evolution/en_GB/figures/mail-inbox.png
+share/gnome/help/evolution/en_GB/figures/mail-threaded.png
+share/gnome/help/evolution/en_GB/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/en_GB/figures/mailer_preferences.png
+share/gnome/help/evolution/en_GB/figures/mainwindow-pic.png
+share/gnome/help/evolution/en_GB/figures/minus.png
+share/gnome/help/evolution/en_GB/figures/newmsg.png
+share/gnome/help/evolution/en_GB/figures/plus.png
+share/gnome/help/evolution/en_GB/figures/proxy-cal.png
+share/gnome/help/evolution/en_GB/figures/proxy-login.png
+share/gnome/help/evolution/en_GB/figures/quick_add_a.png
+share/gnome/help/evolution/en_GB/figures/replymsg.png
+share/gnome/help/evolution/en_GB/figures/schedule.png
+share/gnome/help/evolution/en_GB/figures/stock_search.png
+share/gnome/help/evolution/en_GB/figures/sub-others-folder.png
+share/gnome/help/evolution/en_GB/figures/sub-pub-fold.png
+share/gnome/help/evolution/en_GB/figures/ver_view_a.png
+share/gnome/help/evolution/en_GB/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/es/evolution.xml
+share/gnome/help/evolution/es/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/es/figures/account_editor_a.png
+share/gnome/help/evolution/es/figures/calendar.png
+share/gnome/help/evolution/es/figures/categories_a.png
+share/gnome/help/evolution/es/figures/collap_head_a.png
+share/gnome/help/evolution/es/figures/config-cal.png
+share/gnome/help/evolution/es/figures/config-mail.png
+share/gnome/help/evolution/es/figures/contact-editor.png
+share/gnome/help/evolution/es/figures/contact.png
+share/gnome/help/evolution/es/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/es/figures/delgt-add.png
+share/gnome/help/evolution/es/figures/evo_account_editor_a.png
+share/gnome/help/evolution/es/figures/evo_account_info_a.png
+share/gnome/help/evolution/es/figures/evo_add_rule_a.png
+share/gnome/help/evolution/es/figures/evo_adv_search_a.png
+share/gnome/help/evolution/es/figures/evo_allday_a.png
+share/gnome/help/evolution/es/figures/evo_cal_a.png
+share/gnome/help/evolution/es/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/es/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/es/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/es/figures/evo_edit_rule_a.png
+share/gnome/help/evolution/es/figures/evo_edit_search.png
+share/gnome/help/evolution/es/figures/evo_email_a.png
+share/gnome/help/evolution/es/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/es/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/es/figures/evo_gwreceiveedit_a.png
+share/gnome/help/evolution/es/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/es/figures/evo_identity_a.png
+share/gnome/help/evolution/es/figures/evo_identityedit_a.png
+share/gnome/help/evolution/es/figures/evo_imapheader_a.png
+share/gnome/help/evolution/es/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/es/figures/evo_import_asst_a.png
+share/gnome/help/evolution/es/figures/evo_mail_a.png
+share/gnome/help/evolution/es/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/es/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/es/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/es/figures/evo_memo_a.png
+share/gnome/help/evolution/es/figures/evo_mereceive_a.png
+share/gnome/help/evolution/es/figures/evo_message_filters_a.png
+share/gnome/help/evolution/es/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/es/figures/evo_newmess_a.png
+share/gnome/help/evolution/es/figures/evo_popreceive_a.png
+share/gnome/help/evolution/es/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/es/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/es/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/es/figures/evo_rmdrnotes_a.png
+share/gnome/help/evolution/es/figures/evo_rule_a.png
+share/gnome/help/evolution/es/figures/evo_select_add_folder.png
+share/gnome/help/evolution/es/figures/evo_select_folder.png
+share/gnome/help/evolution/es/figures/evo_send_option_a.png
+share/gnome/help/evolution/es/figures/evo_send_setup_a.png
+share/gnome/help/evolution/es/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/es/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/es/figures/evo_timezone_a.png
+share/gnome/help/evolution/es/figures/evo_usereceive_a.png
+share/gnome/help/evolution/es/figures/exchange-delegation.png
+share/gnome/help/evolution/es/figures/exchange-identity.png
+share/gnome/help/evolution/es/figures/exchange-receive-options.png
+share/gnome/help/evolution/es/figures/exchange-receive.png
+share/gnome/help/evolution/es/figures/exchg-identity.png
+share/gnome/help/evolution/es/figures/exchng-identity.png
+share/gnome/help/evolution/es/figures/exchng-rec-mail.png
+share/gnome/help/evolution/es/figures/exchng-rec-mails.png
+share/gnome/help/evolution/es/figures/exchng-rec-option.png
+share/gnome/help/evolution/es/figures/exchng-rec-options.png
+share/gnome/help/evolution/es/figures/exchng-settings.png
+share/gnome/help/evolution/es/figures/filter-new-fig.png
+share/gnome/help/evolution/es/figures/free_busy.png
+share/gnome/help/evolution/es/figures/full-1.png
+share/gnome/help/evolution/es/figures/full-2.png
+share/gnome/help/evolution/es/figures/full-3.png
+share/gnome/help/evolution/es/figures/full-4.png
+share/gnome/help/evolution/es/figures/full-5.png
+share/gnome/help/evolution/es/figures/full-6.png
+share/gnome/help/evolution/es/figures/full-7.png
+share/gnome/help/evolution/es/figures/mail-druid-pic.png
+share/gnome/help/evolution/es/figures/mail-inbox.png
+share/gnome/help/evolution/es/figures/mail-threaded.png
+share/gnome/help/evolution/es/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/es/figures/mailer_preferences.png
+share/gnome/help/evolution/es/figures/mainwindow-pic.png
+share/gnome/help/evolution/es/figures/minus.png
+share/gnome/help/evolution/es/figures/newmsg.png
+share/gnome/help/evolution/es/figures/plus.png
+share/gnome/help/evolution/es/figures/proxy-cal.png
+share/gnome/help/evolution/es/figures/proxy-login.png
+share/gnome/help/evolution/es/figures/quick_add_a.png
+share/gnome/help/evolution/es/figures/replymsg.png
+share/gnome/help/evolution/es/figures/schedule.png
+share/gnome/help/evolution/es/figures/stock_search.png
+share/gnome/help/evolution/es/figures/sub-others-folder.png
+share/gnome/help/evolution/es/figures/sub-pub-fold.png
+share/gnome/help/evolution/es/figures/ver_view_a.png
+share/gnome/help/evolution/es/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/sv/evolution.xml
+share/gnome/help/evolution/sv/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/sv/figures/account_editor_a.png
+share/gnome/help/evolution/sv/figures/calendar.png
+share/gnome/help/evolution/sv/figures/categories_a.png
+share/gnome/help/evolution/sv/figures/collap_head_a.png
+share/gnome/help/evolution/sv/figures/config-cal.png
+share/gnome/help/evolution/sv/figures/config-mail.png
+share/gnome/help/evolution/sv/figures/contact-editor.png
+share/gnome/help/evolution/sv/figures/contact.png
+share/gnome/help/evolution/sv/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/sv/figures/delgt-add.png
+share/gnome/help/evolution/sv/figures/evo_account_editor_a.png
+share/gnome/help/evolution/sv/figures/evo_account_info_a.png
+share/gnome/help/evolution/sv/figures/evo_add_rule_a.png
+share/gnome/help/evolution/sv/figures/evo_adv_search_a.png
+share/gnome/help/evolution/sv/figures/evo_allday_a.png
+share/gnome/help/evolution/sv/figures/evo_cal_a.png
+share/gnome/help/evolution/sv/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/sv/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/sv/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/sv/figures/evo_edit_rule_a.png
+share/gnome/help/evolution/sv/figures/evo_edit_search.png
+share/gnome/help/evolution/sv/figures/evo_email_a.png
+share/gnome/help/evolution/sv/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/sv/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/sv/figures/evo_gwreceiveedit_a.png
+share/gnome/help/evolution/sv/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/sv/figures/evo_identity_a.png
+share/gnome/help/evolution/sv/figures/evo_identityedit_a.png
+share/gnome/help/evolution/sv/figures/evo_imapheader_a.png
+share/gnome/help/evolution/sv/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/sv/figures/evo_import_asst_a.png
+share/gnome/help/evolution/sv/figures/evo_mail_a.png
+share/gnome/help/evolution/sv/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/sv/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/sv/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/sv/figures/evo_memo_a.png
+share/gnome/help/evolution/sv/figures/evo_mereceive_a.png
+share/gnome/help/evolution/sv/figures/evo_message_filters_a.png
+share/gnome/help/evolution/sv/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/sv/figures/evo_newmess_a.png
+share/gnome/help/evolution/sv/figures/evo_popreceive_a.png
+share/gnome/help/evolution/sv/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/sv/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/sv/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/sv/figures/evo_rmdrnotes_a.png
+share/gnome/help/evolution/sv/figures/evo_rule_a.png
+share/gnome/help/evolution/sv/figures/evo_select_add_folder.png
+share/gnome/help/evolution/sv/figures/evo_select_folder.png
+share/gnome/help/evolution/sv/figures/evo_send_option_a.png
+share/gnome/help/evolution/sv/figures/evo_send_setup_a.png
+share/gnome/help/evolution/sv/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/sv/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/sv/figures/evo_timezone_a.png
+share/gnome/help/evolution/sv/figures/evo_usereceive_a.png
+share/gnome/help/evolution/sv/figures/exchange-delegation.png
+share/gnome/help/evolution/sv/figures/exchange-identity.png
+share/gnome/help/evolution/sv/figures/exchange-receive-options.png
+share/gnome/help/evolution/sv/figures/exchange-receive.png
+share/gnome/help/evolution/sv/figures/exchg-identity.png
+share/gnome/help/evolution/sv/figures/exchng-identity.png
+share/gnome/help/evolution/sv/figures/exchng-rec-mail.png
+share/gnome/help/evolution/sv/figures/exchng-rec-mails.png
+share/gnome/help/evolution/sv/figures/exchng-rec-option.png
+share/gnome/help/evolution/sv/figures/exchng-rec-options.png
+share/gnome/help/evolution/sv/figures/exchng-settings.png
+share/gnome/help/evolution/sv/figures/filter-new-fig.png
+share/gnome/help/evolution/sv/figures/free_busy.png
+share/gnome/help/evolution/sv/figures/full-1.png
+share/gnome/help/evolution/sv/figures/full-2.png
+share/gnome/help/evolution/sv/figures/full-3.png
+share/gnome/help/evolution/sv/figures/full-4.png
+share/gnome/help/evolution/sv/figures/full-5.png
+share/gnome/help/evolution/sv/figures/full-6.png
+share/gnome/help/evolution/sv/figures/full-7.png
+share/gnome/help/evolution/sv/figures/mail-druid-pic.png
+share/gnome/help/evolution/sv/figures/mail-inbox.png
+share/gnome/help/evolution/sv/figures/mail-threaded.png
+share/gnome/help/evolution/sv/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/sv/figures/mailer_preferences.png
+share/gnome/help/evolution/sv/figures/mainwindow-pic.png
+share/gnome/help/evolution/sv/figures/minus.png
+share/gnome/help/evolution/sv/figures/newmsg.png
+share/gnome/help/evolution/sv/figures/plus.png
+share/gnome/help/evolution/sv/figures/proxy-cal.png
+share/gnome/help/evolution/sv/figures/proxy-login.png
+share/gnome/help/evolution/sv/figures/quick_add_a.png
+share/gnome/help/evolution/sv/figures/replymsg.png
+share/gnome/help/evolution/sv/figures/schedule.png
+share/gnome/help/evolution/sv/figures/stock_search.png
+share/gnome/help/evolution/sv/figures/sub-others-folder.png
+share/gnome/help/evolution/sv/figures/sub-pub-fold.png
+share/gnome/help/evolution/sv/figures/ver_view_a.png
+share/gnome/help/evolution/sv/figures/vfolder-createrule-fig.png
share/gnome/idl/evolution-%%VERSION%%/Composer.idl
share/gnome/idl/evolution-%%VERSION%%/Evolution-Component.idl
share/gnome/idl/evolution-%%VERSION%%/Evolution-Composer.idl
@@ -617,10 +951,17 @@ 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/omf/evolution/evolution-%%VERSION%%-C.omf
-share/gnome/pixmaps/evolution-%%VERSION%%.png
+share/gnome/mime-info/evolution.keys
+share/gnome/mime-info/evolution.mime
+share/gnome/omf/evolution/evolution-C.omf
+share/gnome/omf/evolution/evolution-en_GB.omf
+share/gnome/omf/evolution/evolution-es.omf
+share/gnome/omf/evolution/evolution-sv.omf
+share/icons/hicolor/16x16/apps/evolution.png
+share/icons/hicolor/22x22/apps/evolution.png
+share/icons/hicolor/24x24/apps/evolution.png
+share/icons/hicolor/32x32/apps/evolution.png
+share/icons/hicolor/scalable/apps/evolution.svg
share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -697,9 +1038,15 @@ share/locale/zh_HK/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
@dirrm share/gnome/omf/evolution
@dirrm share/gnome/idl/evolution-%%VERSION%%
-@dirrm share/gnome/help/evolution-%%VERSION%%/C/figures
-@dirrm share/gnome/help/evolution-%%VERSION%%/C
-@dirrm share/gnome/help/evolution-%%VERSION%%
+@dirrm share/gnome/help/evolution/sv/figures
+@dirrm share/gnome/help/evolution/sv
+@dirrm share/gnome/help/evolution/en_GB/figures
+@dirrm share/gnome/help/evolution/en_GB
+@dirrm share/gnome/help/evolution/es/figures
+@dirrm share/gnome/help/evolution/es
+@dirrm share/gnome/help/evolution/C/figures
+@dirrm share/gnome/help/evolution/C
+@dirrm share/gnome/help/evolution
@dirrm share/gnome/evolution/%%VERSION%%/weather
@dirrm share/gnome/evolution/%%VERSION%%/views/tasks
@dirrm share/gnome/evolution/%%VERSION%%/views/memos
@@ -709,6 +1056,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
@dirrm share/gnome/evolution/%%VERSION%%/views
@dirrm share/gnome/evolution/%%VERSION%%/ui
@dirrm share/gnome/evolution/%%VERSION%%/images
+@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/sv
+@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/es
@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/de
@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/C
@dirrm share/gnome/evolution/%%VERSION%%/help/quickref
@@ -741,6 +1090,9 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
@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/es/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/es/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/es
@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 cb88d55..ccc3f2a 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mail-notification
DISTVERSION= 4.0
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= mailnotify
@@ -71,7 +72,7 @@ PLIST_SUB+= GMAIL=""
CONFIGURE_ARGS+=--disable-evolution
PLIST_SUB+= EVOLUTION="@comment "
.else
-EVO_VERSION= 2.8
+EVO_VERSION= 2.10
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/evolution-plugin-${EVO_VERSION}.pc:${PORTSDIR}/mail/evolution
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/evolution-plugin-${EVO_VERSION}.pc:${PORTSDIR}/mail/evolution
PLIST_SUB+= EVOLUTION="" EVO_VERSION=${EVO_VERSION}
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index b916521..f765344 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/math/gcalctool/Makefile,v 1.55 2006/09/04 15:14:28 ahze Exp $
+# $MCom: ports/math/gcalctool/Makefile,v 1.65 2007/03/12 19:02:22 mezz Exp $
#
PORTNAME= gcalctool
-PORTVERSION= 5.8.25
+PORTVERSION= 5.9.14
PORTEPOCH= 2
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index 01a77a0..c5063e9 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gcalctool-5.8.25.tar.bz2) = 28074081a9625b8b3d1f7499bc27bbfb
-SHA256 (gnome2/gcalctool-5.8.25.tar.bz2) = a7942e8be300fdeea061ac5ed50b7f0b81e5bf7f598713317aff85b85b5345a3
-SIZE (gnome2/gcalctool-5.8.25.tar.bz2) = 1146544
+MD5 (gnome2/gcalctool-5.9.14.tar.bz2) = dd51bc2fa9e53a3b6d7b3264e1059296
+SHA256 (gnome2/gcalctool-5.9.14.tar.bz2) = f94a63f6860bfd3d868d8419de2a9d709381eeb44d8535565629525dbc9729c5
+SIZE (gnome2/gcalctool-5.9.14.tar.bz2) = 1189518
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index be2e67a..4375af8 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -122,6 +122,7 @@ share/locale/ko/LC_MESSAGES/gcalctool.mo
share/locale/ku/LC_MESSAGES/gcalctool.mo
share/locale/lt/LC_MESSAGES/gcalctool.mo
share/locale/lv/LC_MESSAGES/gcalctool.mo
+share/locale/mg/LC_MESSAGES/gcalctool.mo
share/locale/mk/LC_MESSAGES/gcalctool.mo
share/locale/ml/LC_MESSAGES/gcalctool.mo
share/locale/mn/LC_MESSAGES/gcalctool.mo
@@ -213,6 +214,8 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/ko/LC_MESSAGES
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 5855248..8a87add 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -3,12 +3,12 @@
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
-# $MCom: ports/math/gnumeric/Makefile,v 1.14 2005/10/11 22:44:47 marcus Exp $
+# $MCom: ports/math/gnumeric/Makefile,v 1.28 2007/03/06 17:06:53 marcus Exp $
#
PORTNAME= gnumeric
-PORTVERSION= 1.6.3
-PORTREVISION= 2
+PORTVERSION= 1.7.8
+PORTREVISION= 1
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -17,12 +17,12 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= The GNOME 2 spreadsheet
-LIB_DEPENDS= goffice-1.2:${PORTSDIR}/devel/goffice \
+LIB_DEPENDS= goffice-0.3:${PORTSDIR}/devel/goffice \
psiconv.10:${PORTSDIR}/converters/psiconv
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnomehier libgnomeprintui \
@@ -31,7 +31,8 @@ USE_PYTHON= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --without-guile --with-bonobo
+CONFIGURE_ARGS= --without-guile --with-bonobo \
+ --mandir=${PREFIX}/man
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
python_prog=${PYTHON_VERSION}
@@ -64,9 +65,10 @@ PLIST_SUB+= GNOMEDB="@comment "
post-patch:
@${RM} -f ${WRKSRC}/GNOME_Gnumeric.server.in
- @${REINPLACE_CMD} 's|gnm_sys_data_dir (), "doc"|"${PREFIX}/share/gnome/help/gnumeric/"|' ${WRKSRC}/src/wbcg-actions.c
post-install:
+ ${INSTALL_DATA} ${WRKSRC}/gnumeric.desktop ${PREFIX}/share/gnome/applications
+ ${INSTALL_DATA} ${WRKSRC}/gnumeric.mime ${PREFIX}/share/gnome/mime-info
@-update-desktop-database
.for dir in share/gnome lib
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${dir}/gnumeric
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 1fdbc53..2d6f794 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnumeric-1.6.3.tar.bz2) = 78ffd75ae6abc3bb20dd04407a082a26
-SHA256 (gnome2/gnumeric-1.6.3.tar.bz2) = badaa6899f71ef112515ce81aee02e559e18b5fa87c7f2262390764aaf9b1dc0
-SIZE (gnome2/gnumeric-1.6.3.tar.bz2) = 12540950
+MD5 (gnome2/gnumeric-1.7.8.tar.bz2) = 20d585ae0fa006ec9cf8a23a2e926fac
+SHA256 (gnome2/gnumeric-1.7.8.tar.bz2) = 693a2603ad00b890f5f4f097fdb069983bf548f27a0f84b88d987db79e461e48
+SIZE (gnome2/gnumeric-1.7.8.tar.bz2) = 13169343
diff --git a/math/gnumeric/files/patch-src_tools_solver_lp_solve_lp_solve.c b/math/gnumeric/files/patch-src_tools_solver_lp_solve_lp_solve.c
deleted file mode 100644
index 61a15d5..0000000
--- a/math/gnumeric/files/patch-src_tools_solver_lp_solve_lp_solve.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/tools/solver/lp_solve/lp_solve.c.orig Sun Aug 28 16:01:54 2005
-+++ src/tools/solver/lp_solve/lp_solve.c Sun Aug 28 16:04:24 2005
-@@ -7,7 +7,7 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <time.h>
--#include <sys/timeb.h>
-+#include <sys/time.h>
-
- #define LoadInverseLib FALSE
- #define LoadLanguageLib FALSE
-@@ -15891,10 +15891,10 @@ static double timeNow(void)
- #elif defined CLOCKTIME
- return((double)clock()/CLOCKS_PER_SEC /* CLK_TCK */);
- #else
-- struct timeb buf;
-+ struct timeval tp;
-
-- ftime(&buf);
-- return((double)buf.time+((double) buf.millitm)/1000.0);
-+ (void)gettimeofday(&tp, NULL);
-+ return((double)tp.tv_sec+((double) (tp.tv_usec*1000))/1000.0);
- #endif
- }
-
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index 20e15f4..8b4a819 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -1,6 +1,128 @@
bin/gnumeric
bin/gnumeric-%%VERSION%%
bin/ssconvert
+bin/ssindex
+include/libspreadsheet-1-7/application.h
+include/libspreadsheet-1-7/auto-format.h
+include/libspreadsheet-1-7/cell-draw.h
+include/libspreadsheet-1-7/cell.h
+include/libspreadsheet-1-7/cellspan.h
+include/libspreadsheet-1-7/clipboard.h
+include/libspreadsheet-1-7/cmd-edit.h
+include/libspreadsheet-1-7/collect.h
+include/libspreadsheet-1-7/colrow.h
+include/libspreadsheet-1-7/command-context-stderr.h
+include/libspreadsheet-1-7/command-context.h
+include/libspreadsheet-1-7/commands.h
+include/libspreadsheet-1-7/complete-sheet.h
+include/libspreadsheet-1-7/complete.h
+include/libspreadsheet-1-7/complex.h
+include/libspreadsheet-1-7/consolidate.h
+include/libspreadsheet-1-7/dependent.h
+include/libspreadsheet-1-7/expr-impl.h
+include/libspreadsheet-1-7/expr-name.h
+include/libspreadsheet-1-7/expr.h
+include/libspreadsheet-1-7/file-autoft.h
+include/libspreadsheet-1-7/format-template.h
+include/libspreadsheet-1-7/func-builtin.h
+include/libspreadsheet-1-7/func.h
+include/libspreadsheet-1-7/gnm-datetime.h
+include/libspreadsheet-1-7/gnm-format.h
+include/libspreadsheet-1-7/gnm-graph-window.h
+include/libspreadsheet-1-7/gnm-plugin.h
+include/libspreadsheet-1-7/gnm-so-filled.h
+include/libspreadsheet-1-7/gnm-so-line.h
+include/libspreadsheet-1-7/gnm-so-polygon.h
+include/libspreadsheet-1-7/gnm-style-impl.h
+include/libspreadsheet-1-7/gnumeric-canvas.h
+include/libspreadsheet-1-7/gnumeric-gconf.h
+include/libspreadsheet-1-7/gnumeric-pane.h
+include/libspreadsheet-1-7/gnumeric-simple-canvas.h
+include/libspreadsheet-1-7/gnumeric.h
+include/libspreadsheet-1-7/graph.h
+include/libspreadsheet-1-7/gui-clipboard.h
+include/libspreadsheet-1-7/gui-file.h
+include/libspreadsheet-1-7/gui-gnumeric.h
+include/libspreadsheet-1-7/gui-util.h
+include/libspreadsheet-1-7/gutils.h
+include/libspreadsheet-1-7/history.h
+include/libspreadsheet-1-7/hlink-impl.h
+include/libspreadsheet-1-7/hlink.h
+include/libspreadsheet-1-7/input-msg.h
+include/libspreadsheet-1-7/item-acetate.h
+include/libspreadsheet-1-7/item-bar.h
+include/libspreadsheet-1-7/item-cursor.h
+include/libspreadsheet-1-7/item-debug.h
+include/libspreadsheet-1-7/item-edit.h
+include/libspreadsheet-1-7/item-grid.h
+include/libspreadsheet-1-7/libgnumeric.h
+include/libspreadsheet-1-7/mathfunc.h
+include/libspreadsheet-1-7/mstyle.h
+include/libspreadsheet-1-7/number-match.h
+include/libspreadsheet-1-7/numbers.h
+include/libspreadsheet-1-7/parse-util.h
+include/libspreadsheet-1-7/pattern.h
+include/libspreadsheet-1-7/pivottable.h
+include/libspreadsheet-1-7/position.h
+include/libspreadsheet-1-7/preview-grid-impl.h
+include/libspreadsheet-1-7/preview-grid.h
+include/libspreadsheet-1-7/print-cell.h
+include/libspreadsheet-1-7/print-info.h
+include/libspreadsheet-1-7/print.h
+include/libspreadsheet-1-7/rangefunc-strings.h
+include/libspreadsheet-1-7/rangefunc.h
+include/libspreadsheet-1-7/ranges.h
+include/libspreadsheet-1-7/regression.h
+include/libspreadsheet-1-7/rendered-value.h
+include/libspreadsheet-1-7/search.h
+include/libspreadsheet-1-7/selection.h
+include/libspreadsheet-1-7/session.h
+include/libspreadsheet-1-7/sheet-autofill.h
+include/libspreadsheet-1-7/sheet-control-gui-priv.h
+include/libspreadsheet-1-7/sheet-control-gui.h
+include/libspreadsheet-1-7/sheet-control-priv.h
+include/libspreadsheet-1-7/sheet-control.h
+include/libspreadsheet-1-7/sheet-filter-combo.h
+include/libspreadsheet-1-7/sheet-filter.h
+include/libspreadsheet-1-7/sheet-merge.h
+include/libspreadsheet-1-7/sheet-object-cell-comment.h
+include/libspreadsheet-1-7/sheet-object-graph.h
+include/libspreadsheet-1-7/sheet-object-image.h
+include/libspreadsheet-1-7/sheet-object-impl.h
+include/libspreadsheet-1-7/sheet-object-widget.h
+include/libspreadsheet-1-7/sheet-object.h
+include/libspreadsheet-1-7/sheet-private.h
+include/libspreadsheet-1-7/sheet-style.h
+include/libspreadsheet-1-7/sheet-view.h
+include/libspreadsheet-1-7/sheet.h
+include/libspreadsheet-1-7/solver.h
+include/libspreadsheet-1-7/sort.h
+include/libspreadsheet-1-7/stf-export.h
+include/libspreadsheet-1-7/stf-parse.h
+include/libspreadsheet-1-7/stf.h
+include/libspreadsheet-1-7/str.h
+include/libspreadsheet-1-7/style-border.h
+include/libspreadsheet-1-7/style-color.h
+include/libspreadsheet-1-7/style-conditions.h
+include/libspreadsheet-1-7/style-font.h
+include/libspreadsheet-1-7/style.h
+include/libspreadsheet-1-7/symbol.h
+include/libspreadsheet-1-7/validation-combo.h
+include/libspreadsheet-1-7/validation.h
+include/libspreadsheet-1-7/value.h
+include/libspreadsheet-1-7/wbc-gtk.h
+include/libspreadsheet-1-7/workbook-cmd-format.h
+include/libspreadsheet-1-7/workbook-control-gui-priv.h
+include/libspreadsheet-1-7/workbook-control-gui.h
+include/libspreadsheet-1-7/workbook-control-priv.h
+include/libspreadsheet-1-7/workbook-control.h
+include/libspreadsheet-1-7/workbook-edit.h
+include/libspreadsheet-1-7/workbook-priv.h
+include/libspreadsheet-1-7/workbook-view.h
+include/libspreadsheet-1-7/workbook.h
+include/libspreadsheet-1-7/xml-io-version.h
+include/libspreadsheet-1-7/xml-io.h
+include/libspreadsheet-1-7/xml-sax.h
lib/gnumeric/%%VERSION%%/plugins/applix/applix.la
lib/gnumeric/%%VERSION%%/plugins/applix/applix.so
lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml
@@ -124,13 +246,17 @@ lib/gnumeric/%%VERSION%%/plugins/uihello/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/xbase/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.la
lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.so
+lib/goffice/0.3.7/plugins/gnumeric/gnumeric.la
+lib/goffice/0.3.7/plugins/gnumeric/gnumeric.so
+lib/goffice/0.3.7/plugins/gnumeric/plugin.xml
lib/libspreadsheet-%%VERSION%%.so
lib/libspreadsheet.la
lib/libspreadsheet.so
-libdata/bonobo/servers/GNOME_Gnumeric.server
+libdata/pkgconfig/libspreadsheet-1.7.pc
@exec update-desktop-database > /dev/null || /usr/bin/true
share/gnome/applications/gnumeric.desktop
share/gnome/gnumeric/%%VERSION%%/GNOME_Gnumeric-gtk.xml
+share/gnome/gnumeric/%%VERSION%%/Gnumeric-embed.xml
share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/.category
share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.button.xml
share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.list.xml
@@ -177,6 +303,7 @@ share/gnome/gnumeric/%%VERSION%%/glade/consolidate.glade
share/gnome/gnumeric/%%VERSION%%/glade/correlation.glade
share/gnome/gnumeric/%%VERSION%%/glade/covariance.glade
share/gnome/gnumeric/%%VERSION%%/glade/dao.glade
+share/gnome/gnumeric/%%VERSION%%/glade/data-table.glade
share/gnome/gnumeric/%%VERSION%%/glade/define-name.glade
share/gnome/gnumeric/%%VERSION%%/glade/delete-cells.glade
share/gnome/gnumeric/%%VERSION%%/glade/descriptive-stats.glade
@@ -218,9 +345,9 @@ share/gnome/gnumeric/%%VERSION%%/glade/shuffle.glade
share/gnome/gnumeric/%%VERSION%%/glade/simulation.glade
share/gnome/gnumeric/%%VERSION%%/glade/so-checkbox.glade
share/gnome/gnumeric/%%VERSION%%/glade/so-frame.glade
+share/gnome/gnumeric/%%VERSION%%/glade/so-list.glade
share/gnome/gnumeric/%%VERSION%%/glade/so-scrollbar.glade
share/gnome/gnumeric/%%VERSION%%/glade/solver.glade
-share/gnome/gnumeric/%%VERSION%%/glade/summary.glade
share/gnome/gnumeric/%%VERSION%%/glade/tabulate.glade
share/gnome/gnumeric/%%VERSION%%/glade/variance-tests.glade
share/gnome/gnumeric/%%VERSION%%/glade/view.glade
@@ -630,8 +757,6 @@ share/gnome/help/gnumeric/C/quick-start.xml
share/gnome/help/gnumeric/C/welcome.xml
share/gnome/help/gnumeric/C/workbooks.xml
share/gnome/help/gnumeric/C/worksheets.xml
-share/gnome/mc/templates/gnumeric.desktop
-share/gnome/mime-info/gnumeric.keys
share/gnome/mime-info/gnumeric.mime
share/gnome/omf/gnumeric/gnumeric-C.omf
share/gnome/pixmaps/gnome-application-vnd.lotus-1-2-3.png
@@ -656,6 +781,8 @@ share/gnome/pixmaps/gnumeric/win32-gnumeric.ico
share/gnome/pixmaps/win32-gnumeric.ico
share/locale/am/LC_MESSAGES/gnumeric-functions.mo
share/locale/am/LC_MESSAGES/gnumeric.mo
+share/locale/ar/LC_MESSAGES/gnumeric-functions.mo
+share/locale/ar/LC_MESSAGES/gnumeric.mo
share/locale/az/LC_MESSAGES/gnumeric-functions.mo
share/locale/az/LC_MESSAGES/gnumeric.mo
share/locale/bg/LC_MESSAGES/gnumeric-functions.mo
@@ -808,4 +935,44 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
@dirrm lib/gnumeric/%%VERSION%%/plugins
@dirrm lib/gnumeric/%%VERSION%%
@dirrm lib/gnumeric
+@dirrm lib/goffice/0.3.7/plugins/gnumeric
+@dirrm include/libspreadsheet-1-7
@unexec update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index 5d331b0..40e51e5 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.88 2006/09/12 07:38:48 marcus Exp $
+# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.99 2007/03/12 23:58:09 marcus Exp $
#
PORTNAME= gnome-icon-theme
-PORTVERSION= 2.16.1
-PORTREVISION= 1
+PORTVERSION= 2.18.0
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo
index 16be4b9..7c64ad2 100644
--- a/misc/gnome-icon-theme/distinfo
+++ b/misc/gnome-icon-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-icon-theme-2.16.1.tar.bz2) = 4a5da64a6084fdddf056e553a929c169
-SHA256 (gnome2/gnome-icon-theme-2.16.1.tar.bz2) = a620fda16bd1f4939fa4014850e3ac72cb627eba07ee5331d832c1c5aa5daeb2
-SIZE (gnome2/gnome-icon-theme-2.16.1.tar.bz2) = 2490570
+MD5 (gnome2/gnome-icon-theme-2.18.0.tar.bz2) = 0b9aa12c473e0be61dc324b059c106e3
+SHA256 (gnome2/gnome-icon-theme-2.18.0.tar.bz2) = 52177c009549b23924a091c6bc494a44343429f836fb19a3645b98ac3fd6306e
+SIZE (gnome2/gnome-icon-theme-2.18.0.tar.bz2) = 2734653
diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist
index 3a14d5d..777b1b3 100644
--- a/misc/gnome-icon-theme/pkg-plist
+++ b/misc/gnome-icon-theme/pkg-plist
@@ -1,14 +1,22 @@
libdata/pkgconfig/gnome-icon-theme.pc
share/icons/gnome/16x16/actions/add.png
+share/icons/gnome/16x16/actions/address-book-new.png
share/icons/gnome/16x16/actions/application-exit.png
share/icons/gnome/16x16/actions/appointment-new.png
share/icons/gnome/16x16/actions/appointment.png
share/icons/gnome/16x16/actions/back.png
+share/icons/gnome/16x16/actions/bookmark-new.png
+share/icons/gnome/16x16/actions/bookmark_add.png
+share/icons/gnome/16x16/actions/bookmarks_list_add.png
share/icons/gnome/16x16/actions/bottom.png
share/icons/gnome/16x16/actions/centrejust.png
+share/icons/gnome/16x16/actions/contact-new.png
share/icons/gnome/16x16/actions/document-new.png
+share/icons/gnome/16x16/actions/document-open.png
share/icons/gnome/16x16/actions/document-print-preview.png
share/icons/gnome/16x16/actions/document-print.png
+share/icons/gnome/16x16/actions/document-properties.png
+share/icons/gnome/16x16/actions/document-revert.png
share/icons/gnome/16x16/actions/document-save-as.png
share/icons/gnome/16x16/actions/document-save.png
share/icons/gnome/16x16/actions/down.png
@@ -19,6 +27,7 @@ share/icons/gnome/16x16/actions/edit-find-replace.png
share/icons/gnome/16x16/actions/edit-find.png
share/icons/gnome/16x16/actions/edit-paste.png
share/icons/gnome/16x16/actions/edit-redo.png
+share/icons/gnome/16x16/actions/edit-select-all.png
share/icons/gnome/16x16/actions/edit-undo.png
share/icons/gnome/16x16/actions/editcopy.png
share/icons/gnome/16x16/actions/editcut.png
@@ -27,6 +36,7 @@ share/icons/gnome/16x16/actions/editpaste.png
share/icons/gnome/16x16/actions/exit.png
share/icons/gnome/16x16/actions/filefind.png
share/icons/gnome/16x16/actions/filenew.png
+share/icons/gnome/16x16/actions/fileopen.png
share/icons/gnome/16x16/actions/fileprint.png
share/icons/gnome/16x16/actions/filequickprint.png
share/icons/gnome/16x16/actions/filesave.png
@@ -106,15 +116,20 @@ share/icons/gnome/16x16/actions/gtk-media-rewind-ltr.png
share/icons/gnome/16x16/actions/gtk-media-rewind-rtl.png
share/icons/gnome/16x16/actions/gtk-media-stop.png
share/icons/gnome/16x16/actions/gtk-new.png
+share/icons/gnome/16x16/actions/gtk-open.png
share/icons/gnome/16x16/actions/gtk-paste.png
share/icons/gnome/16x16/actions/gtk-print-preview.png
share/icons/gnome/16x16/actions/gtk-print.png
+share/icons/gnome/16x16/actions/gtk-properties.png
share/icons/gnome/16x16/actions/gtk-quit.png
share/icons/gnome/16x16/actions/gtk-redo-ltr.png
share/icons/gnome/16x16/actions/gtk-refresh.png
share/icons/gnome/16x16/actions/gtk-remove.png
share/icons/gnome/16x16/actions/gtk-save-as.png
share/icons/gnome/16x16/actions/gtk-save.png
+share/icons/gnome/16x16/actions/gtk-select-all.png
+share/icons/gnome/16x16/actions/gtk-sort-ascending.png
+share/icons/gnome/16x16/actions/gtk-sort-descending.png
share/icons/gnome/16x16/actions/gtk-stop.png
share/icons/gnome/16x16/actions/gtk-strikethrough.png
share/icons/gnome/16x16/actions/gtk-underline.png
@@ -124,6 +139,10 @@ share/icons/gnome/16x16/actions/gtk-zoom-100.png
share/icons/gnome/16x16/actions/gtk-zoom-fit.png
share/icons/gnome/16x16/actions/gtk-zoom-in.png
share/icons/gnome/16x16/actions/gtk-zoom-out.png
+share/icons/gnome/16x16/actions/help-faq.png
+share/icons/gnome/16x16/actions/insert-image.png
+share/icons/gnome/16x16/actions/insert-link.png
+share/icons/gnome/16x16/actions/insert-text.png
share/icons/gnome/16x16/actions/kfm_home.png
share/icons/gnome/16x16/actions/leftjust.png
share/icons/gnome/16x16/actions/list-add.png
@@ -141,6 +160,7 @@ share/icons/gnome/16x16/actions/mail_new.png
share/icons/gnome/16x16/actions/mail_reply.png
share/icons/gnome/16x16/actions/mail_replyall.png
share/icons/gnome/16x16/actions/mail_spam.png
+share/icons/gnome/16x16/actions/media-eject.png
share/icons/gnome/16x16/actions/media-playback-pause.png
share/icons/gnome/16x16/actions/media-playback-start.png
share/icons/gnome/16x16/actions/media-playback-stop.png
@@ -150,6 +170,11 @@ share/icons/gnome/16x16/actions/media-seek-forward.png
share/icons/gnome/16x16/actions/media-skip-backward.png
share/icons/gnome/16x16/actions/media-skip-forward.png
share/icons/gnome/16x16/actions/next.png
+share/icons/gnome/16x16/actions/object-flip-horizontal.png
+share/icons/gnome/16x16/actions/object-flip-vertical.png
+share/icons/gnome/16x16/actions/object-rotate-left.png
+share/icons/gnome/16x16/actions/object-rotate-right.png
+share/icons/gnome/16x16/actions/player_eject.png
share/icons/gnome/16x16/actions/player_end.png
share/icons/gnome/16x16/actions/player_fwd.png
share/icons/gnome/16x16/actions/player_pause.png
@@ -169,14 +194,17 @@ share/icons/gnome/16x16/actions/reload_page.png
share/icons/gnome/16x16/actions/remove.png
share/icons/gnome/16x16/actions/rightjust.png
share/icons/gnome/16x16/actions/start.png
+share/icons/gnome/16x16/actions/stock_add-bookmark.png
share/icons/gnome/16x16/actions/stock_bottom.png
share/icons/gnome/16x16/actions/stock_close.png
share/icons/gnome/16x16/actions/stock_copy.png
share/icons/gnome/16x16/actions/stock_cut.png
share/icons/gnome/16x16/actions/stock_delete.png
share/icons/gnome/16x16/actions/stock_down.png
+share/icons/gnome/16x16/actions/stock_file-properites.png
share/icons/gnome/16x16/actions/stock_first.png
share/icons/gnome/16x16/actions/stock_fullscreen.png
+share/icons/gnome/16x16/actions/stock_help-add-bookmark.png
share/icons/gnome/16x16/actions/stock_home.png
share/icons/gnome/16x16/actions/stock_last.png
share/icons/gnome/16x16/actions/stock_leave-fullscreen.png
@@ -194,7 +222,9 @@ share/icons/gnome/16x16/actions/stock_media-prev.png
share/icons/gnome/16x16/actions/stock_media-rec.png
share/icons/gnome/16x16/actions/stock_media-rew.png
share/icons/gnome/16x16/actions/stock_media-stop.png
+share/icons/gnome/16x16/actions/stock_new-address-book.png
share/icons/gnome/16x16/actions/stock_new-appointment.png
+share/icons/gnome/16x16/actions/stock_new-bcard.png
share/icons/gnome/16x16/actions/stock_new-dir.png
share/icons/gnome/16x16/actions/stock_new-tab.png
share/icons/gnome/16x16/actions/stock_new-text.png
@@ -203,6 +233,7 @@ share/icons/gnome/16x16/actions/stock_not-spam.png
share/icons/gnome/16x16/actions/stock_paste.png
share/icons/gnome/16x16/actions/stock_print-preview.png
share/icons/gnome/16x16/actions/stock_print.png
+share/icons/gnome/16x16/actions/stock_properties.png
share/icons/gnome/16x16/actions/stock_redo.png
share/icons/gnome/16x16/actions/stock_refresh.png
share/icons/gnome/16x16/actions/stock_right.png
@@ -210,6 +241,7 @@ share/icons/gnome/16x16/actions/stock_save-as.png
share/icons/gnome/16x16/actions/stock_save.png
share/icons/gnome/16x16/actions/stock_search-and-replace.png
share/icons/gnome/16x16/actions/stock_search.png
+share/icons/gnome/16x16/actions/stock_select-all.png
share/icons/gnome/16x16/actions/stock_spam.png
share/icons/gnome/16x16/actions/stock_stop.png
share/icons/gnome/16x16/actions/stock_text-strikethrough.png
@@ -244,6 +276,8 @@ share/icons/gnome/16x16/actions/up.png
share/icons/gnome/16x16/actions/view-fullscreen.png
share/icons/gnome/16x16/actions/view-refresh.png
share/icons/gnome/16x16/actions/view-restore.png
+share/icons/gnome/16x16/actions/view-sort-ascending.png
+share/icons/gnome/16x16/actions/view-sort-descending.png
share/icons/gnome/16x16/actions/viewmag+.png
share/icons/gnome/16x16/actions/viewmag-.png
share/icons/gnome/16x16/actions/viewmag1.png
@@ -265,22 +299,30 @@ share/icons/gnome/16x16/animations/process-idle.png
share/icons/gnome/16x16/animations/process-working.png
share/icons/gnome/16x16/apps/access.png
share/icons/gnome/16x16/apps/accessibility-directory.png
+share/icons/gnome/16x16/apps/accessories-calculator.png
share/icons/gnome/16x16/apps/accessories-dictionary.png
share/icons/gnome/16x16/apps/accessories-text-editor.png
share/icons/gnome/16x16/apps/applets-screenshooter.png
share/icons/gnome/16x16/apps/arts.png
share/icons/gnome/16x16/apps/background.png
share/icons/gnome/16x16/apps/boot.png
+share/icons/gnome/16x16/apps/calc.png
share/icons/gnome/16x16/apps/config-language.png
-share/icons/gnome/16x16/apps/evolution.png
+share/icons/gnome/16x16/apps/config-users.png
share/icons/gnome/16x16/apps/file-manager.png
+share/icons/gnome/16x16/apps/fonts.png
+share/icons/gnome/16x16/apps/gnome-calculator.png
share/icons/gnome/16x16/apps/gnome-help.png
share/icons/gnome/16x16/apps/gnome-logout.png
share/icons/gnome/16x16/apps/gnome-mixer.png
share/icons/gnome/16x16/apps/gnome-monitor.png
-share/icons/gnome/16x16/apps/gnome-session.png
+share/icons/gnome/16x16/apps/gnome-remote-desktop.png
share/icons/gnome/16x16/apps/gnome-settings-accessibility-technologies.png
share/icons/gnome/16x16/apps/gnome-settings-background.png
+share/icons/gnome/16x16/apps/gnome-settings-font.png
+share/icons/gnome/16x16/apps/gnome-settings-keybindings.png
+share/icons/gnome/16x16/apps/gnome-settings-theme.png
+share/icons/gnome/16x16/apps/gnome-settings-ui-behavior.png
share/icons/gnome/16x16/apps/gnome-shutdown.png
share/icons/gnome/16x16/apps/gnome-terminal.png
share/icons/gnome/16x16/apps/gnome-window-manager.png
@@ -295,29 +337,46 @@ 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/kcalc.png
+share/icons/gnome/16x16/apps/kcmkwm.png
share/icons/gnome/16x16/apps/kcmsound.png
share/icons/gnome/16x16/apps/kedit.png
+share/icons/gnome/16x16/apps/key_bindings.png
share/icons/gnome/16x16/apps/kfm.png
share/icons/gnome/16x16/apps/khelpcenter.png
share/icons/gnome/16x16/apps/konsole.png
+share/icons/gnome/16x16/apps/krfb.png
share/icons/gnome/16x16/apps/kscreensaver.png
share/icons/gnome/16x16/apps/ksysguard.png
+share/icons/gnome/16x16/apps/kuser.png
+share/icons/gnome/16x16/apps/kwin.png
share/icons/gnome/16x16/apps/locale.png
share/icons/gnome/16x16/apps/logviewer.png
share/icons/gnome/16x16/apps/multimedia-volume-control.png
share/icons/gnome/16x16/apps/multimedia.png
share/icons/gnome/16x16/apps/openterm.png
share/icons/gnome/16x16/apps/preferences-desktop-accessibility.png
+share/icons/gnome/16x16/apps/preferences-desktop-font.png
+share/icons/gnome/16x16/apps/preferences-desktop-keyboard-shortcuts.png
+share/icons/gnome/16x16/apps/preferences-desktop-keyboard.png
share/icons/gnome/16x16/apps/preferences-desktop-locale.png
+share/icons/gnome/16x16/apps/preferences-desktop-remote-desktop.png
share/icons/gnome/16x16/apps/preferences-desktop-screensaver.png
+share/icons/gnome/16x16/apps/preferences-desktop-theme.png
share/icons/gnome/16x16/apps/preferences-desktop-wallpaper.png
+share/icons/gnome/16x16/apps/preferences-system-windows.png
share/icons/gnome/16x16/apps/redhat-filemanager.png
share/icons/gnome/16x16/apps/screensaver.png
share/icons/gnome/16x16/apps/stock_help.png
+share/icons/gnome/16x16/apps/style.png
share/icons/gnome/16x16/apps/susehelpcenter.png
+share/icons/gnome/16x16/apps/system-config-users.png
share/icons/gnome/16x16/apps/system-file-manager.png
+share/icons/gnome/16x16/apps/system-software-installer.png
+share/icons/gnome/16x16/apps/system-users.png
share/icons/gnome/16x16/apps/terminal.png
share/icons/gnome/16x16/apps/text-editor.png
+share/icons/gnome/16x16/apps/user-info.png
share/icons/gnome/16x16/apps/utilities-system-monitor.png
share/icons/gnome/16x16/apps/utilities-terminal.png
share/icons/gnome/16x16/apps/volume-knob.png
@@ -327,6 +386,7 @@ share/icons/gnome/16x16/apps/xfce-filemanager.png
share/icons/gnome/16x16/apps/xfce-terminal.png
share/icons/gnome/16x16/apps/xfce4-backdrop.png
share/icons/gnome/16x16/apps/xfce4-mixer.png
+share/icons/gnome/16x16/apps/xfwm4.png
share/icons/gnome/16x16/apps/xscreensaver.png
share/icons/gnome/16x16/categories/applications-accessories.png
share/icons/gnome/16x16/categories/applications-development.png
@@ -334,6 +394,11 @@ share/icons/gnome/16x16/categories/applications-games.png
share/icons/gnome/16x16/categories/applications-graphics.png
share/icons/gnome/16x16/categories/applications-internet.png
share/icons/gnome/16x16/categories/applications-multimedia.png
+share/icons/gnome/16x16/categories/applications-office.png
+share/icons/gnome/16x16/categories/applications-other.png
+share/icons/gnome/16x16/categories/applications-science.png
+share/icons/gnome/16x16/categories/applications-system.png
+share/icons/gnome/16x16/categories/gnome-applications.png
share/icons/gnome/16x16/categories/gnome-control-center.png
share/icons/gnome/16x16/categories/gnome-devel.png
share/icons/gnome/16x16/categories/gnome-globe.png
@@ -341,6 +406,7 @@ share/icons/gnome/16x16/categories/gnome-graphics.png
share/icons/gnome/16x16/categories/gnome-joystick.png
share/icons/gnome/16x16/categories/gnome-multimedia.png
share/icons/gnome/16x16/categories/gnome-settings.png
+share/icons/gnome/16x16/categories/gnome-system.png
share/icons/gnome/16x16/categories/gnome-util.png
share/icons/gnome/16x16/categories/gtk-preferences.png
share/icons/gnome/16x16/categories/kcontrol.png
@@ -349,7 +415,9 @@ share/icons/gnome/16x16/categories/package_games.png
share/icons/gnome/16x16/categories/package_graphics.png
share/icons/gnome/16x16/categories/package_multimedia.png
share/icons/gnome/16x16/categories/package_network.png
+share/icons/gnome/16x16/categories/package_office.png
share/icons/gnome/16x16/categories/package_settings.png
+share/icons/gnome/16x16/categories/package_system.png
share/icons/gnome/16x16/categories/package_utilities.png
share/icons/gnome/16x16/categories/preferences-desktop.png
share/icons/gnome/16x16/categories/preferences-system.png
@@ -357,21 +425,28 @@ share/icons/gnome/16x16/categories/redhat-accessories.png
share/icons/gnome/16x16/categories/redhat-games.png
share/icons/gnome/16x16/categories/redhat-graphics.png
share/icons/gnome/16x16/categories/redhat-internet.png
+share/icons/gnome/16x16/categories/redhat-office.png
share/icons/gnome/16x16/categories/redhat-preferences.png
share/icons/gnome/16x16/categories/redhat-programming.png
share/icons/gnome/16x16/categories/redhat-sound_video.png
share/icons/gnome/16x16/categories/redhat-system_settings.png
+share/icons/gnome/16x16/categories/redhat-system_tools.png
share/icons/gnome/16x16/categories/stock_internet.png
share/icons/gnome/16x16/categories/xfce-games.png
share/icons/gnome/16x16/categories/xfce-graphics.png
share/icons/gnome/16x16/categories/xfce-internet.png
share/icons/gnome/16x16/categories/xfce-multimedia.png
+share/icons/gnome/16x16/categories/xfce-office.png
share/icons/gnome/16x16/categories/xfce-system-settings.png
share/icons/gnome/16x16/categories/xfce-utils.png
share/icons/gnome/16x16/categories/xfce4-settings.png
share/icons/gnome/16x16/devices/3floppy_unmount.png
share/icons/gnome/16x16/devices/audio-input-microphone.png
share/icons/gnome/16x16/devices/battery.png
+share/icons/gnome/16x16/devices/camera-photo.png
+share/icons/gnome/16x16/devices/camera-web.png
+share/icons/gnome/16x16/devices/camera.png
+share/icons/gnome/16x16/devices/camera_unmount.png
share/icons/gnome/16x16/devices/cdrom_unmount.png
share/icons/gnome/16x16/devices/cdwriter_unmount.png
share/icons/gnome/16x16/devices/chardevice.png
@@ -413,6 +488,7 @@ share/icons/gnome/16x16/devices/gnome-dev-removable-usb.png
share/icons/gnome/16x16/devices/gnome-dev-removable.png
share/icons/gnome/16x16/devices/gnome-dev-wavelan.png
share/icons/gnome/16x16/devices/gnome-fs-client.png
+share/icons/gnome/16x16/devices/gnome-modem.png
share/icons/gnome/16x16/devices/gnome-stock-mic.png
share/icons/gnome/16x16/devices/gtk-cdrom.png
share/icons/gnome/16x16/devices/gtk-floppy.png
@@ -421,6 +497,7 @@ share/icons/gnome/16x16/devices/harddrive.png
share/icons/gnome/16x16/devices/hdd_unmount.png
share/icons/gnome/16x16/devices/input-keyboard.png
share/icons/gnome/16x16/devices/input-mouse.png
+share/icons/gnome/16x16/devices/input-tablet.png
share/icons/gnome/16x16/devices/ipod_mount.png
share/icons/gnome/16x16/devices/keyboard.png
share/icons/gnome/16x16/devices/kjobviewer.png
@@ -429,6 +506,8 @@ share/icons/gnome/16x16/devices/media-cdrom.png
share/icons/gnome/16x16/devices/media-flash.png
share/icons/gnome/16x16/devices/media-floppy.png
share/icons/gnome/16x16/devices/media-optical.png
+share/icons/gnome/16x16/devices/media-tape.png
+share/icons/gnome/16x16/devices/modem.png
share/icons/gnome/16x16/devices/mouse.png
share/icons/gnome/16x16/devices/multimedia-player.png
share/icons/gnome/16x16/devices/network-wired.png
@@ -451,6 +530,7 @@ share/icons/gnome/16x16/devices/yast_HD.png
share/icons/gnome/16x16/devices/yast_idetude.png
share/icons/gnome/16x16/devices/yast_mouse.png
share/icons/gnome/16x16/devices/yast_printer.png
+share/icons/gnome/16x16/emblems/emblem-default.png
share/icons/gnome/16x16/emblems/emblem-favorite.png
share/icons/gnome/16x16/emblems/emblem-important.png
share/icons/gnome/16x16/emblems/emblem-new.png
@@ -461,18 +541,22 @@ share/icons/gnome/16x16/emblems/stock_mail-priority-high.png
share/icons/gnome/16x16/filesystems/gnome-fs-bookmark-missing.png
share/icons/gnome/16x16/filesystems/gnome-fs-bookmark.png
share/icons/gnome/16x16/mimetypes/application-certificate.png
+share/icons/gnome/16x16/mimetypes/application-x-executable.png
share/icons/gnome/16x16/mimetypes/ascii.png
share/icons/gnome/16x16/mimetypes/audio-x-generic.png
+share/icons/gnome/16x16/mimetypes/binary.png
share/icons/gnome/16x16/mimetypes/contents2.png
share/icons/gnome/16x16/mimetypes/deb.png
share/icons/gnome/16x16/mimetypes/document.png
share/icons/gnome/16x16/mimetypes/empty.png
+share/icons/gnome/16x16/mimetypes/exec.png
share/icons/gnome/16x16/mimetypes/folder_tar.png
share/icons/gnome/16x16/mimetypes/font-x-generic.png
share/icons/gnome/16x16/mimetypes/font.png
share/icons/gnome/16x16/mimetypes/font_bitmap.png
share/icons/gnome/16x16/mimetypes/font_truetype.png
share/icons/gnome/16x16/mimetypes/font_type1.png
+share/icons/gnome/16x16/mimetypes/gnome-fs-executable.png
share/icons/gnome/16x16/mimetypes/gnome-fs-regular.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-magicpoint.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-msword.png
@@ -514,6 +598,7 @@ share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-cpio-compressed.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-cpio.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-deb.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-dvi.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-executable.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-afm.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-bdf.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-linux-psf.png
@@ -530,6 +615,7 @@ share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-kspread.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-kword.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-lha.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-lhz.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-ms-dos-executable.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-perl.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-php.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-python-bytecode.png
@@ -678,6 +764,7 @@ share/icons/gnome/16x16/status/gtk-dialog-warning.png
share/icons/gnome/16x16/status/image-loading.png
share/icons/gnome/16x16/status/important.png
share/icons/gnome/16x16/status/info.png
+share/icons/gnome/16x16/status/mail-attachment.png
share/icons/gnome/16x16/status/media-playlist-repeat.png
share/icons/gnome/16x16/status/media-playlist-shuffle.png
share/icons/gnome/16x16/status/messagebox_critical.png
@@ -694,6 +781,7 @@ share/icons/gnome/16x16/status/nm-adhoc.png
share/icons/gnome/16x16/status/nm-device-wired.png
share/icons/gnome/16x16/status/nm-device-wireless.png
share/icons/gnome/16x16/status/nm-no-connection.png
+share/icons/gnome/16x16/status/printer-error.png
share/icons/gnome/16x16/status/stock_appointment-reminder-excl.png
share/icons/gnome/16x16/status/stock_appointment-reminder.png
share/icons/gnome/16x16/status/stock_dialog-error.png
@@ -1482,7 +1570,6 @@ 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
@@ -1521,6 +1608,7 @@ 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/22x22/actions/add.png
+share/icons/gnome/22x22/actions/address-book-new.png
share/icons/gnome/22x22/actions/application-exit.png
share/icons/gnome/22x22/actions/appointment-new.png
share/icons/gnome/22x22/actions/appointment.png
@@ -1530,9 +1618,13 @@ share/icons/gnome/22x22/actions/bookmark_add.png
share/icons/gnome/22x22/actions/bookmarks_list_add.png
share/icons/gnome/22x22/actions/bottom.png
share/icons/gnome/22x22/actions/centrejust.png
+share/icons/gnome/22x22/actions/contact-new.png
share/icons/gnome/22x22/actions/document-new.png
+share/icons/gnome/22x22/actions/document-open.png
share/icons/gnome/22x22/actions/document-print-preview.png
share/icons/gnome/22x22/actions/document-print.png
+share/icons/gnome/22x22/actions/document-properties.png
+share/icons/gnome/22x22/actions/document-revert.png
share/icons/gnome/22x22/actions/document-save-as.png
share/icons/gnome/22x22/actions/document-save.png
share/icons/gnome/22x22/actions/down.png
@@ -1543,6 +1635,7 @@ share/icons/gnome/22x22/actions/edit-find-replace.png
share/icons/gnome/22x22/actions/edit-find.png
share/icons/gnome/22x22/actions/edit-paste.png
share/icons/gnome/22x22/actions/edit-redo.png
+share/icons/gnome/22x22/actions/edit-select-all.png
share/icons/gnome/22x22/actions/edit-undo.png
share/icons/gnome/22x22/actions/editcopy.png
share/icons/gnome/22x22/actions/editcut.png
@@ -1551,6 +1644,7 @@ share/icons/gnome/22x22/actions/editpaste.png
share/icons/gnome/22x22/actions/exit.png
share/icons/gnome/22x22/actions/filefind.png
share/icons/gnome/22x22/actions/filenew.png
+share/icons/gnome/22x22/actions/fileopen.png
share/icons/gnome/22x22/actions/fileprint.png
share/icons/gnome/22x22/actions/filequickprint.png
share/icons/gnome/22x22/actions/filesave.png
@@ -1630,15 +1724,20 @@ share/icons/gnome/22x22/actions/gtk-media-rewind-ltr.png
share/icons/gnome/22x22/actions/gtk-media-rewind-rtl.png
share/icons/gnome/22x22/actions/gtk-media-stop.png
share/icons/gnome/22x22/actions/gtk-new.png
+share/icons/gnome/22x22/actions/gtk-open.png
share/icons/gnome/22x22/actions/gtk-paste.png
share/icons/gnome/22x22/actions/gtk-print-preview.png
share/icons/gnome/22x22/actions/gtk-print.png
+share/icons/gnome/22x22/actions/gtk-properties.png
share/icons/gnome/22x22/actions/gtk-quit.png
share/icons/gnome/22x22/actions/gtk-redo-ltr.png
share/icons/gnome/22x22/actions/gtk-refresh.png
share/icons/gnome/22x22/actions/gtk-remove.png
share/icons/gnome/22x22/actions/gtk-save-as.png
share/icons/gnome/22x22/actions/gtk-save.png
+share/icons/gnome/22x22/actions/gtk-select-all.png
+share/icons/gnome/22x22/actions/gtk-sort-ascending.png
+share/icons/gnome/22x22/actions/gtk-sort-descending.png
share/icons/gnome/22x22/actions/gtk-stop.png
share/icons/gnome/22x22/actions/gtk-strikethrough.png
share/icons/gnome/22x22/actions/gtk-underline.png
@@ -1648,6 +1747,10 @@ share/icons/gnome/22x22/actions/gtk-zoom-100.png
share/icons/gnome/22x22/actions/gtk-zoom-fit.png
share/icons/gnome/22x22/actions/gtk-zoom-in.png
share/icons/gnome/22x22/actions/gtk-zoom-out.png
+share/icons/gnome/22x22/actions/help-faq.png
+share/icons/gnome/22x22/actions/insert-image.png
+share/icons/gnome/22x22/actions/insert-link.png
+share/icons/gnome/22x22/actions/insert-text.png
share/icons/gnome/22x22/actions/kfm_home.png
share/icons/gnome/22x22/actions/leftjust.png
share/icons/gnome/22x22/actions/list-add.png
@@ -1665,6 +1768,7 @@ share/icons/gnome/22x22/actions/mail_new.png
share/icons/gnome/22x22/actions/mail_reply.png
share/icons/gnome/22x22/actions/mail_replyall.png
share/icons/gnome/22x22/actions/mail_spam.png
+share/icons/gnome/22x22/actions/media-eject.png
share/icons/gnome/22x22/actions/media-playback-pause.png
share/icons/gnome/22x22/actions/media-playback-start.png
share/icons/gnome/22x22/actions/media-playback-stop.png
@@ -1674,6 +1778,11 @@ share/icons/gnome/22x22/actions/media-seek-forward.png
share/icons/gnome/22x22/actions/media-skip-backward.png
share/icons/gnome/22x22/actions/media-skip-forward.png
share/icons/gnome/22x22/actions/next.png
+share/icons/gnome/22x22/actions/object-flip-horizontal.png
+share/icons/gnome/22x22/actions/object-flip-vertical.png
+share/icons/gnome/22x22/actions/object-rotate-left.png
+share/icons/gnome/22x22/actions/object-rotate-right.png
+share/icons/gnome/22x22/actions/player_eject.png
share/icons/gnome/22x22/actions/player_end.png
share/icons/gnome/22x22/actions/player_fwd.png
share/icons/gnome/22x22/actions/player_pause.png
@@ -1700,6 +1809,7 @@ share/icons/gnome/22x22/actions/stock_copy.png
share/icons/gnome/22x22/actions/stock_cut.png
share/icons/gnome/22x22/actions/stock_delete.png
share/icons/gnome/22x22/actions/stock_down.png
+share/icons/gnome/22x22/actions/stock_file-properites.png
share/icons/gnome/22x22/actions/stock_first.png
share/icons/gnome/22x22/actions/stock_fullscreen.png
share/icons/gnome/22x22/actions/stock_help-add-bookmark.png
@@ -1720,7 +1830,9 @@ share/icons/gnome/22x22/actions/stock_media-prev.png
share/icons/gnome/22x22/actions/stock_media-rec.png
share/icons/gnome/22x22/actions/stock_media-rew.png
share/icons/gnome/22x22/actions/stock_media-stop.png
+share/icons/gnome/22x22/actions/stock_new-address-book.png
share/icons/gnome/22x22/actions/stock_new-appointment.png
+share/icons/gnome/22x22/actions/stock_new-bcard.png
share/icons/gnome/22x22/actions/stock_new-dir.png
share/icons/gnome/22x22/actions/stock_new-tab.png
share/icons/gnome/22x22/actions/stock_new-text.png
@@ -1729,6 +1841,7 @@ share/icons/gnome/22x22/actions/stock_not-spam.png
share/icons/gnome/22x22/actions/stock_paste.png
share/icons/gnome/22x22/actions/stock_print-preview.png
share/icons/gnome/22x22/actions/stock_print.png
+share/icons/gnome/22x22/actions/stock_properties.png
share/icons/gnome/22x22/actions/stock_redo.png
share/icons/gnome/22x22/actions/stock_refresh.png
share/icons/gnome/22x22/actions/stock_right.png
@@ -1736,6 +1849,7 @@ share/icons/gnome/22x22/actions/stock_save-as.png
share/icons/gnome/22x22/actions/stock_save.png
share/icons/gnome/22x22/actions/stock_search-and-replace.png
share/icons/gnome/22x22/actions/stock_search.png
+share/icons/gnome/22x22/actions/stock_select-all.png
share/icons/gnome/22x22/actions/stock_spam.png
share/icons/gnome/22x22/actions/stock_stop.png
share/icons/gnome/22x22/actions/stock_text-strikethrough.png
@@ -1770,6 +1884,8 @@ share/icons/gnome/22x22/actions/up.png
share/icons/gnome/22x22/actions/view-fullscreen.png
share/icons/gnome/22x22/actions/view-refresh.png
share/icons/gnome/22x22/actions/view-restore.png
+share/icons/gnome/22x22/actions/view-sort-ascending.png
+share/icons/gnome/22x22/actions/view-sort-descending.png
share/icons/gnome/22x22/actions/viewmag+.png
share/icons/gnome/22x22/actions/viewmag-.png
share/icons/gnome/22x22/actions/viewmag1.png
@@ -1791,20 +1907,32 @@ share/icons/gnome/22x22/animations/process-idle.png
share/icons/gnome/22x22/animations/process-working.png
share/icons/gnome/22x22/apps/access.png
share/icons/gnome/22x22/apps/accessibility-directory.png
+share/icons/gnome/22x22/apps/accessories-calculator.png
share/icons/gnome/22x22/apps/accessories-dictionary.png
share/icons/gnome/22x22/apps/accessories-text-editor.png
share/icons/gnome/22x22/apps/applets-screenshooter.png
+share/icons/gnome/22x22/apps/arts.png
share/icons/gnome/22x22/apps/background.png
share/icons/gnome/22x22/apps/boot.png
-share/icons/gnome/22x22/apps/evolution.png
+share/icons/gnome/22x22/apps/calc.png
+share/icons/gnome/22x22/apps/config-language.png
+share/icons/gnome/22x22/apps/config-users.png
share/icons/gnome/22x22/apps/file-manager.png
+share/icons/gnome/22x22/apps/fonts.png
+share/icons/gnome/22x22/apps/gnome-calculator.png
share/icons/gnome/22x22/apps/gnome-help.png
+share/icons/gnome/22x22/apps/gnome-mixer.png
share/icons/gnome/22x22/apps/gnome-monitor.png
-share/icons/gnome/22x22/apps/gnome-session.png
+share/icons/gnome/22x22/apps/gnome-remote-desktop.png
share/icons/gnome/22x22/apps/gnome-settings-accessibility-technologies.png
share/icons/gnome/22x22/apps/gnome-settings-background.png
+share/icons/gnome/22x22/apps/gnome-settings-font.png
+share/icons/gnome/22x22/apps/gnome-settings-keybindings.png
+share/icons/gnome/22x22/apps/gnome-settings-theme.png
+share/icons/gnome/22x22/apps/gnome-settings-ui-behavior.png
share/icons/gnome/22x22/apps/gnome-shutdown.png
share/icons/gnome/22x22/apps/gnome-terminal.png
+share/icons/gnome/22x22/apps/gnome-window-manager.png
share/icons/gnome/22x22/apps/gtk-help.png
share/icons/gnome/22x22/apps/help-browser.png
share/icons/gnome/22x22/apps/help.png
@@ -1814,31 +1942,56 @@ share/icons/gnome/22x22/apps/im-jabber.png
share/icons/gnome/22x22/apps/im-msn.png
share/icons/gnome/22x22/apps/im-nov.png
share/icons/gnome/22x22/apps/im-yahoo.png
+share/icons/gnome/22x22/apps/kcalc.png
+share/icons/gnome/22x22/apps/kcmkwm.png
+share/icons/gnome/22x22/apps/kcmsound.png
share/icons/gnome/22x22/apps/kedit.png
+share/icons/gnome/22x22/apps/key_bindings.png
share/icons/gnome/22x22/apps/kfm.png
share/icons/gnome/22x22/apps/khelpcenter.png
share/icons/gnome/22x22/apps/konsole.png
+share/icons/gnome/22x22/apps/krfb.png
share/icons/gnome/22x22/apps/kscreensaver.png
share/icons/gnome/22x22/apps/ksysguard.png
+share/icons/gnome/22x22/apps/kuser.png
+share/icons/gnome/22x22/apps/kwin.png
+share/icons/gnome/22x22/apps/locale.png
share/icons/gnome/22x22/apps/logviewer.png
+share/icons/gnome/22x22/apps/multimedia-volume-control.png
+share/icons/gnome/22x22/apps/multimedia.png
share/icons/gnome/22x22/apps/openterm.png
share/icons/gnome/22x22/apps/preferences-desktop-accessibility.png
+share/icons/gnome/22x22/apps/preferences-desktop-font.png
+share/icons/gnome/22x22/apps/preferences-desktop-keyboard-shortcuts.png
+share/icons/gnome/22x22/apps/preferences-desktop-keyboard.png
+share/icons/gnome/22x22/apps/preferences-desktop-locale.png
+share/icons/gnome/22x22/apps/preferences-desktop-remote-desktop.png
share/icons/gnome/22x22/apps/preferences-desktop-screensaver.png
+share/icons/gnome/22x22/apps/preferences-desktop-theme.png
share/icons/gnome/22x22/apps/preferences-desktop-wallpaper.png
+share/icons/gnome/22x22/apps/preferences-system-windows.png
share/icons/gnome/22x22/apps/redhat-filemanager.png
share/icons/gnome/22x22/apps/screensaver.png
share/icons/gnome/22x22/apps/stock_help.png
+share/icons/gnome/22x22/apps/style.png
share/icons/gnome/22x22/apps/susehelpcenter.png
+share/icons/gnome/22x22/apps/system-config-users.png
share/icons/gnome/22x22/apps/system-file-manager.png
+share/icons/gnome/22x22/apps/system-software-installer.png
+share/icons/gnome/22x22/apps/system-users.png
share/icons/gnome/22x22/apps/terminal.png
share/icons/gnome/22x22/apps/text-editor.png
+share/icons/gnome/22x22/apps/user-info.png
share/icons/gnome/22x22/apps/utilities-system-monitor.png
share/icons/gnome/22x22/apps/utilities-terminal.png
+share/icons/gnome/22x22/apps/volume-knob.png
share/icons/gnome/22x22/apps/wallpaper.png
share/icons/gnome/22x22/apps/web-browser.png
share/icons/gnome/22x22/apps/xfce-filemanager.png
share/icons/gnome/22x22/apps/xfce-terminal.png
share/icons/gnome/22x22/apps/xfce4-backdrop.png
+share/icons/gnome/22x22/apps/xfce4-mixer.png
+share/icons/gnome/22x22/apps/xfwm4.png
share/icons/gnome/22x22/apps/xscreensaver.png
share/icons/gnome/22x22/categories/applications-accessories.png
share/icons/gnome/22x22/categories/applications-development.png
@@ -1846,6 +1999,11 @@ share/icons/gnome/22x22/categories/applications-games.png
share/icons/gnome/22x22/categories/applications-graphics.png
share/icons/gnome/22x22/categories/applications-internet.png
share/icons/gnome/22x22/categories/applications-multimedia.png
+share/icons/gnome/22x22/categories/applications-office.png
+share/icons/gnome/22x22/categories/applications-other.png
+share/icons/gnome/22x22/categories/applications-science.png
+share/icons/gnome/22x22/categories/applications-system.png
+share/icons/gnome/22x22/categories/gnome-applications.png
share/icons/gnome/22x22/categories/gnome-control-center.png
share/icons/gnome/22x22/categories/gnome-devel.png
share/icons/gnome/22x22/categories/gnome-globe.png
@@ -1853,6 +2011,7 @@ share/icons/gnome/22x22/categories/gnome-graphics.png
share/icons/gnome/22x22/categories/gnome-joystick.png
share/icons/gnome/22x22/categories/gnome-multimedia.png
share/icons/gnome/22x22/categories/gnome-settings.png
+share/icons/gnome/22x22/categories/gnome-system.png
share/icons/gnome/22x22/categories/gnome-util.png
share/icons/gnome/22x22/categories/gtk-preferences.png
share/icons/gnome/22x22/categories/kcontrol.png
@@ -1861,7 +2020,9 @@ share/icons/gnome/22x22/categories/package_games.png
share/icons/gnome/22x22/categories/package_graphics.png
share/icons/gnome/22x22/categories/package_multimedia.png
share/icons/gnome/22x22/categories/package_network.png
+share/icons/gnome/22x22/categories/package_office.png
share/icons/gnome/22x22/categories/package_settings.png
+share/icons/gnome/22x22/categories/package_system.png
share/icons/gnome/22x22/categories/package_utilities.png
share/icons/gnome/22x22/categories/preferences-desktop.png
share/icons/gnome/22x22/categories/preferences-system.png
@@ -1869,21 +2030,28 @@ share/icons/gnome/22x22/categories/redhat-accessories.png
share/icons/gnome/22x22/categories/redhat-games.png
share/icons/gnome/22x22/categories/redhat-graphics.png
share/icons/gnome/22x22/categories/redhat-internet.png
+share/icons/gnome/22x22/categories/redhat-office.png
share/icons/gnome/22x22/categories/redhat-preferences.png
share/icons/gnome/22x22/categories/redhat-programming.png
share/icons/gnome/22x22/categories/redhat-sound_video.png
share/icons/gnome/22x22/categories/redhat-system_settings.png
+share/icons/gnome/22x22/categories/redhat-system_tools.png
share/icons/gnome/22x22/categories/stock_internet.png
share/icons/gnome/22x22/categories/xfce-games.png
share/icons/gnome/22x22/categories/xfce-graphics.png
share/icons/gnome/22x22/categories/xfce-internet.png
share/icons/gnome/22x22/categories/xfce-multimedia.png
+share/icons/gnome/22x22/categories/xfce-office.png
share/icons/gnome/22x22/categories/xfce-system-settings.png
share/icons/gnome/22x22/categories/xfce-utils.png
share/icons/gnome/22x22/categories/xfce4-settings.png
share/icons/gnome/22x22/devices/3floppy_unmount.png
share/icons/gnome/22x22/devices/audio-input-microphone.png
share/icons/gnome/22x22/devices/battery.png
+share/icons/gnome/22x22/devices/camera-photo.png
+share/icons/gnome/22x22/devices/camera-web.png
+share/icons/gnome/22x22/devices/camera.png
+share/icons/gnome/22x22/devices/camera_unmount.png
share/icons/gnome/22x22/devices/cdrom_unmount.png
share/icons/gnome/22x22/devices/cdwriter_unmount.png
share/icons/gnome/22x22/devices/chardevice.png
@@ -1925,6 +2093,7 @@ share/icons/gnome/22x22/devices/gnome-dev-removable-usb.png
share/icons/gnome/22x22/devices/gnome-dev-removable.png
share/icons/gnome/22x22/devices/gnome-dev-wavelan.png
share/icons/gnome/22x22/devices/gnome-fs-client.png
+share/icons/gnome/22x22/devices/gnome-modem.png
share/icons/gnome/22x22/devices/gnome-stock-mic.png
share/icons/gnome/22x22/devices/gtk-cdrom.png
share/icons/gnome/22x22/devices/gtk-floppy.png
@@ -1933,6 +2102,7 @@ share/icons/gnome/22x22/devices/harddrive.png
share/icons/gnome/22x22/devices/hdd_unmount.png
share/icons/gnome/22x22/devices/input-keyboard.png
share/icons/gnome/22x22/devices/input-mouse.png
+share/icons/gnome/22x22/devices/input-tablet.png
share/icons/gnome/22x22/devices/ipod_mount.png
share/icons/gnome/22x22/devices/keyboard.png
share/icons/gnome/22x22/devices/kjobviewer.png
@@ -1941,6 +2111,8 @@ share/icons/gnome/22x22/devices/media-cdrom.png
share/icons/gnome/22x22/devices/media-flash.png
share/icons/gnome/22x22/devices/media-floppy.png
share/icons/gnome/22x22/devices/media-optical.png
+share/icons/gnome/22x22/devices/media-tape.png
+share/icons/gnome/22x22/devices/modem.png
share/icons/gnome/22x22/devices/mouse.png
share/icons/gnome/22x22/devices/multimedia-player.png
share/icons/gnome/22x22/devices/network-wired.png
@@ -1963,6 +2135,7 @@ share/icons/gnome/22x22/devices/yast_HD.png
share/icons/gnome/22x22/devices/yast_idetude.png
share/icons/gnome/22x22/devices/yast_mouse.png
share/icons/gnome/22x22/devices/yast_printer.png
+share/icons/gnome/22x22/emblems/emblem-default.png
share/icons/gnome/22x22/emblems/emblem-favorite.png
share/icons/gnome/22x22/emblems/emblem-important.png
share/icons/gnome/22x22/emblems/emblem-new.png
@@ -1987,6 +2160,7 @@ share/icons/gnome/22x22/mimetypes/font_bitmap.png
share/icons/gnome/22x22/mimetypes/font_truetype.png
share/icons/gnome/22x22/mimetypes/font_type1.png
share/icons/gnome/22x22/mimetypes/gnome-fs-executable.png
+share/icons/gnome/22x22/mimetypes/gnome-fs-regular.png
share/icons/gnome/22x22/mimetypes/gnome-mime-application-magicpoint.png
share/icons/gnome/22x22/mimetypes/gnome-mime-application-msword.png
share/icons/gnome/22x22/mimetypes/gnome-mime-application-ogg.png
@@ -2073,6 +2247,7 @@ share/icons/gnome/22x22/mimetypes/gnome-mime-text.png
share/icons/gnome/22x22/mimetypes/gnome-mime-video.png
share/icons/gnome/22x22/mimetypes/gnome-mime-x-font-afm.png
share/icons/gnome/22x22/mimetypes/gnome-package.png
+share/icons/gnome/22x22/mimetypes/gtk-file.png
share/icons/gnome/22x22/mimetypes/html.png
share/icons/gnome/22x22/mimetypes/image-x-generic.png
share/icons/gnome/22x22/mimetypes/image.png
@@ -2097,6 +2272,7 @@ share/icons/gnome/22x22/mimetypes/template_source.png
share/icons/gnome/22x22/mimetypes/text-html.png
share/icons/gnome/22x22/mimetypes/text-x-generic-template.png
share/icons/gnome/22x22/mimetypes/text-x-generic.png
+share/icons/gnome/22x22/mimetypes/text-x-preview.png
share/icons/gnome/22x22/mimetypes/text-x-script.png
share/icons/gnome/22x22/mimetypes/tgz.png
share/icons/gnome/22x22/mimetypes/txt.png
@@ -2160,6 +2336,10 @@ share/icons/gnome/22x22/places/user-trash.png
share/icons/gnome/22x22/places/xfce-trash_empty.png
share/icons/gnome/22x22/status/appointment-missed.png
share/icons/gnome/22x22/status/appointment-soon.png
+share/icons/gnome/22x22/status/audio-volume-high.png
+share/icons/gnome/22x22/status/audio-volume-low.png
+share/icons/gnome/22x22/status/audio-volume-medium.png
+share/icons/gnome/22x22/status/audio-volume-muted.png
share/icons/gnome/22x22/status/connect_creating.png
share/icons/gnome/22x22/status/connect_established.png
share/icons/gnome/22x22/status/connect_no.png
@@ -2190,6 +2370,7 @@ share/icons/gnome/22x22/status/gtk-dialog-warning.png
share/icons/gnome/22x22/status/image-loading.png
share/icons/gnome/22x22/status/important.png
share/icons/gnome/22x22/status/info.png
+share/icons/gnome/22x22/status/mail-attachment.png
share/icons/gnome/22x22/status/media-playlist-repeat.png
share/icons/gnome/22x22/status/media-playlist-shuffle.png
share/icons/gnome/22x22/status/messagebox_critical.png
@@ -2206,6 +2387,7 @@ share/icons/gnome/22x22/status/nm-adhoc.png
share/icons/gnome/22x22/status/nm-device-wired.png
share/icons/gnome/22x22/status/nm-device-wireless.png
share/icons/gnome/22x22/status/nm-no-connection.png
+share/icons/gnome/22x22/status/printer-error.png
share/icons/gnome/22x22/status/stock_appointment-reminder-excl.png
share/icons/gnome/22x22/status/stock_appointment-reminder.png
share/icons/gnome/22x22/status/stock_dialog-error.png
@@ -2215,6 +2397,12 @@ share/icons/gnome/22x22/status/stock_open.png
share/icons/gnome/22x22/status/stock_repeat.png
share/icons/gnome/22x22/status/stock_shuffle.png
share/icons/gnome/22x22/status/stock_trash_full.png
+share/icons/gnome/22x22/status/stock_volume-0.png
+share/icons/gnome/22x22/status/stock_volume-max.png
+share/icons/gnome/22x22/status/stock_volume-med.png
+share/icons/gnome/22x22/status/stock_volume-min.png
+share/icons/gnome/22x22/status/stock_volume-mute.png
+share/icons/gnome/22x22/status/stock_volume.png
share/icons/gnome/22x22/status/stock_weather-cloudy.png
share/icons/gnome/22x22/status/stock_weather-few-clouds.png
share/icons/gnome/22x22/status/stock_weather-night-clear.png
@@ -2238,6 +2426,7 @@ share/icons/gnome/22x22/status/weather-snow.png
share/icons/gnome/22x22/status/weather-storm.png
share/icons/gnome/22x22/status/xfce-trash_full.png
share/icons/gnome/24x24/actions/add.png
+share/icons/gnome/24x24/actions/address-book-new.png
share/icons/gnome/24x24/actions/application-exit.png
share/icons/gnome/24x24/actions/appointment-new.png
share/icons/gnome/24x24/actions/appointment.png
@@ -2247,9 +2436,13 @@ share/icons/gnome/24x24/actions/bookmark_add.png
share/icons/gnome/24x24/actions/bookmarks_list_add.png
share/icons/gnome/24x24/actions/bottom.png
share/icons/gnome/24x24/actions/centrejust.png
+share/icons/gnome/24x24/actions/contact-new.png
share/icons/gnome/24x24/actions/document-new.png
+share/icons/gnome/24x24/actions/document-open.png
share/icons/gnome/24x24/actions/document-print-preview.png
share/icons/gnome/24x24/actions/document-print.png
+share/icons/gnome/24x24/actions/document-properties.png
+share/icons/gnome/24x24/actions/document-revert.png
share/icons/gnome/24x24/actions/document-save-as.png
share/icons/gnome/24x24/actions/document-save.png
share/icons/gnome/24x24/actions/down.png
@@ -2260,6 +2453,7 @@ share/icons/gnome/24x24/actions/edit-find-replace.png
share/icons/gnome/24x24/actions/edit-find.png
share/icons/gnome/24x24/actions/edit-paste.png
share/icons/gnome/24x24/actions/edit-redo.png
+share/icons/gnome/24x24/actions/edit-select-all.png
share/icons/gnome/24x24/actions/edit-undo.png
share/icons/gnome/24x24/actions/editcopy.png
share/icons/gnome/24x24/actions/editcut.png
@@ -2268,12 +2462,15 @@ share/icons/gnome/24x24/actions/editpaste.png
share/icons/gnome/24x24/actions/exit.png
share/icons/gnome/24x24/actions/filefind.png
share/icons/gnome/24x24/actions/filenew.png
+share/icons/gnome/24x24/actions/fileopen.png
share/icons/gnome/24x24/actions/fileprint.png
share/icons/gnome/24x24/actions/filequickprint.png
share/icons/gnome/24x24/actions/filesave.png
share/icons/gnome/24x24/actions/filesaveas.png
share/icons/gnome/24x24/actions/find.png
share/icons/gnome/24x24/actions/finish.png
+share/icons/gnome/24x24/actions/folder-new.png
+share/icons/gnome/24x24/actions/folder_new.png
share/icons/gnome/24x24/actions/format-indent-less.png
share/icons/gnome/24x24/actions/format-indent-more.png
share/icons/gnome/24x24/actions/format-justify-center.png
@@ -2345,15 +2542,20 @@ share/icons/gnome/24x24/actions/gtk-media-rewind-ltr.png
share/icons/gnome/24x24/actions/gtk-media-rewind-rtl.png
share/icons/gnome/24x24/actions/gtk-media-stop.png
share/icons/gnome/24x24/actions/gtk-new.png
+share/icons/gnome/24x24/actions/gtk-open.png
share/icons/gnome/24x24/actions/gtk-paste.png
share/icons/gnome/24x24/actions/gtk-print-preview.png
share/icons/gnome/24x24/actions/gtk-print.png
+share/icons/gnome/24x24/actions/gtk-properties.png
share/icons/gnome/24x24/actions/gtk-quit.png
share/icons/gnome/24x24/actions/gtk-redo-ltr.png
share/icons/gnome/24x24/actions/gtk-refresh.png
share/icons/gnome/24x24/actions/gtk-remove.png
share/icons/gnome/24x24/actions/gtk-save-as.png
share/icons/gnome/24x24/actions/gtk-save.png
+share/icons/gnome/24x24/actions/gtk-select-all.png
+share/icons/gnome/24x24/actions/gtk-sort-ascending.png
+share/icons/gnome/24x24/actions/gtk-sort-descending.png
share/icons/gnome/24x24/actions/gtk-stop.png
share/icons/gnome/24x24/actions/gtk-strikethrough.png
share/icons/gnome/24x24/actions/gtk-underline.png
@@ -2363,6 +2565,10 @@ share/icons/gnome/24x24/actions/gtk-zoom-100.png
share/icons/gnome/24x24/actions/gtk-zoom-fit.png
share/icons/gnome/24x24/actions/gtk-zoom-in.png
share/icons/gnome/24x24/actions/gtk-zoom-out.png
+share/icons/gnome/24x24/actions/help-faq.png
+share/icons/gnome/24x24/actions/insert-image.png
+share/icons/gnome/24x24/actions/insert-link.png
+share/icons/gnome/24x24/actions/insert-text.png
share/icons/gnome/24x24/actions/kfm_home.png
share/icons/gnome/24x24/actions/leftjust.png
share/icons/gnome/24x24/actions/list-add.png
@@ -2380,6 +2586,7 @@ share/icons/gnome/24x24/actions/mail_new.png
share/icons/gnome/24x24/actions/mail_reply.png
share/icons/gnome/24x24/actions/mail_replyall.png
share/icons/gnome/24x24/actions/mail_spam.png
+share/icons/gnome/24x24/actions/media-eject.png
share/icons/gnome/24x24/actions/media-playback-pause.png
share/icons/gnome/24x24/actions/media-playback-start.png
share/icons/gnome/24x24/actions/media-playback-stop.png
@@ -2389,6 +2596,11 @@ share/icons/gnome/24x24/actions/media-seek-forward.png
share/icons/gnome/24x24/actions/media-skip-backward.png
share/icons/gnome/24x24/actions/media-skip-forward.png
share/icons/gnome/24x24/actions/next.png
+share/icons/gnome/24x24/actions/object-flip-horizontal.png
+share/icons/gnome/24x24/actions/object-flip-vertical.png
+share/icons/gnome/24x24/actions/object-rotate-left.png
+share/icons/gnome/24x24/actions/object-rotate-right.png
+share/icons/gnome/24x24/actions/player_eject.png
share/icons/gnome/24x24/actions/player_end.png
share/icons/gnome/24x24/actions/player_fwd.png
share/icons/gnome/24x24/actions/player_pause.png
@@ -2415,6 +2627,7 @@ share/icons/gnome/24x24/actions/stock_copy.png
share/icons/gnome/24x24/actions/stock_cut.png
share/icons/gnome/24x24/actions/stock_delete.png
share/icons/gnome/24x24/actions/stock_down.png
+share/icons/gnome/24x24/actions/stock_file-properites.png
share/icons/gnome/24x24/actions/stock_first.png
share/icons/gnome/24x24/actions/stock_fullscreen.png
share/icons/gnome/24x24/actions/stock_help-add-bookmark.png
@@ -2435,7 +2648,10 @@ share/icons/gnome/24x24/actions/stock_media-prev.png
share/icons/gnome/24x24/actions/stock_media-rec.png
share/icons/gnome/24x24/actions/stock_media-rew.png
share/icons/gnome/24x24/actions/stock_media-stop.png
+share/icons/gnome/24x24/actions/stock_new-address-book.png
share/icons/gnome/24x24/actions/stock_new-appointment.png
+share/icons/gnome/24x24/actions/stock_new-bcard.png
+share/icons/gnome/24x24/actions/stock_new-dir.png
share/icons/gnome/24x24/actions/stock_new-tab.png
share/icons/gnome/24x24/actions/stock_new-text.png
share/icons/gnome/24x24/actions/stock_new-window.png
@@ -2443,6 +2659,7 @@ share/icons/gnome/24x24/actions/stock_not-spam.png
share/icons/gnome/24x24/actions/stock_paste.png
share/icons/gnome/24x24/actions/stock_print-preview.png
share/icons/gnome/24x24/actions/stock_print.png
+share/icons/gnome/24x24/actions/stock_properties.png
share/icons/gnome/24x24/actions/stock_redo.png
share/icons/gnome/24x24/actions/stock_refresh.png
share/icons/gnome/24x24/actions/stock_right.png
@@ -2450,6 +2667,7 @@ share/icons/gnome/24x24/actions/stock_save-as.png
share/icons/gnome/24x24/actions/stock_save.png
share/icons/gnome/24x24/actions/stock_search-and-replace.png
share/icons/gnome/24x24/actions/stock_search.png
+share/icons/gnome/24x24/actions/stock_select-all.png
share/icons/gnome/24x24/actions/stock_spam.png
share/icons/gnome/24x24/actions/stock_stop.png
share/icons/gnome/24x24/actions/stock_text-strikethrough.png
@@ -2484,6 +2702,8 @@ share/icons/gnome/24x24/actions/up.png
share/icons/gnome/24x24/actions/view-fullscreen.png
share/icons/gnome/24x24/actions/view-refresh.png
share/icons/gnome/24x24/actions/view-restore.png
+share/icons/gnome/24x24/actions/view-sort-ascending.png
+share/icons/gnome/24x24/actions/view-sort-descending.png
share/icons/gnome/24x24/actions/viewmag+.png
share/icons/gnome/24x24/actions/viewmag-.png
share/icons/gnome/24x24/actions/viewmag1.png
@@ -2506,6 +2726,7 @@ share/icons/gnome/24x24/animations/process-working.png
share/icons/gnome/24x24/apps/access.png
share/icons/gnome/24x24/apps/accessibility-directory.png
share/icons/gnome/24x24/apps/accessories-calculator.png
+share/icons/gnome/24x24/apps/accessories-dictionary.png
share/icons/gnome/24x24/apps/accessories-text-editor.png
share/icons/gnome/24x24/apps/administration.png
share/icons/gnome/24x24/apps/advanced-directory.png
@@ -2522,12 +2743,10 @@ 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/file-manager.png
share/icons/gnome/24x24/apps/fonts.png
share/icons/gnome/24x24/apps/gdm.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-cpu.png
@@ -2541,8 +2760,8 @@ share/icons/gnome/24x24/apps/gnome-mini-commander.png
share/icons/gnome/24x24/apps/gnome-mixer.png
share/icons/gnome/24x24/apps/gnome-monitor.png
share/icons/gnome/24x24/apps/gnome-networktool.png
+share/icons/gnome/24x24/apps/gnome-remote-desktop.png
share/icons/gnome/24x24/apps/gnome-searchtool.png
-share/icons/gnome/24x24/apps/gnome-session.png
share/icons/gnome/24x24/apps/gnome-settings-accessibility-technologies.png
share/icons/gnome/24x24/apps/gnome-settings-background.png
share/icons/gnome/24x24/apps/gnome-settings-font.png
@@ -2566,13 +2785,19 @@ share/icons/gnome/24x24/apps/im-nov.png
share/icons/gnome/24x24/apps/im-yahoo.png
share/icons/gnome/24x24/apps/image-viewer.png
share/icons/gnome/24x24/apps/kcalc.png
+share/icons/gnome/24x24/apps/kcmkwm.png
share/icons/gnome/24x24/apps/kcmsound.png
share/icons/gnome/24x24/apps/kedit.png
+share/icons/gnome/24x24/apps/key_bindings.png
share/icons/gnome/24x24/apps/kfm.png
share/icons/gnome/24x24/apps/khelpcenter.png
share/icons/gnome/24x24/apps/konsole.png
+share/icons/gnome/24x24/apps/krfb.png
share/icons/gnome/24x24/apps/kscreensaver.png
share/icons/gnome/24x24/apps/ksysguard.png
+share/icons/gnome/24x24/apps/kuser.png
+share/icons/gnome/24x24/apps/kwin.png
+share/icons/gnome/24x24/apps/locale.png
share/icons/gnome/24x24/apps/logviewer.png
share/icons/gnome/24x24/apps/multimedia-volume-control.png
share/icons/gnome/24x24/apps/multimedia.png
@@ -2589,9 +2814,14 @@ share/icons/gnome/24x24/apps/openterm.png
share/icons/gnome/24x24/apps/postscript-viewer.png
share/icons/gnome/24x24/apps/preferences-desktop-accessibility.png
share/icons/gnome/24x24/apps/preferences-desktop-font.png
+share/icons/gnome/24x24/apps/preferences-desktop-keyboard-shortcuts.png
+share/icons/gnome/24x24/apps/preferences-desktop-keyboard.png
+share/icons/gnome/24x24/apps/preferences-desktop-locale.png
+share/icons/gnome/24x24/apps/preferences-desktop-remote-desktop.png
share/icons/gnome/24x24/apps/preferences-desktop-screensaver.png
share/icons/gnome/24x24/apps/preferences-desktop-theme.png
share/icons/gnome/24x24/apps/preferences-desktop-wallpaper.png
+share/icons/gnome/24x24/apps/preferences-system-windows.png
share/icons/gnome/24x24/apps/redhat-filemanager.png
share/icons/gnome/24x24/apps/screensaver.png
share/icons/gnome/24x24/apps/shares.png
@@ -2599,9 +2829,13 @@ share/icons/gnome/24x24/apps/stock-ticker.png
share/icons/gnome/24x24/apps/stock_help.png
share/icons/gnome/24x24/apps/style.png
share/icons/gnome/24x24/apps/susehelpcenter.png
+share/icons/gnome/24x24/apps/system-config-users.png
share/icons/gnome/24x24/apps/system-file-manager.png
+share/icons/gnome/24x24/apps/system-software-installer.png
+share/icons/gnome/24x24/apps/system-users.png
share/icons/gnome/24x24/apps/terminal.png
share/icons/gnome/24x24/apps/text-editor.png
+share/icons/gnome/24x24/apps/user-info.png
share/icons/gnome/24x24/apps/utilities-system-monitor.png
share/icons/gnome/24x24/apps/utilities-terminal.png
share/icons/gnome/24x24/apps/volume-knob.png
@@ -2611,6 +2845,7 @@ share/icons/gnome/24x24/apps/xfce-filemanager.png
share/icons/gnome/24x24/apps/xfce-terminal.png
share/icons/gnome/24x24/apps/xfce4-backdrop.png
share/icons/gnome/24x24/apps/xfce4-mixer.png
+share/icons/gnome/24x24/apps/xfwm4.png
share/icons/gnome/24x24/apps/xscreensaver.png
share/icons/gnome/24x24/categories/applications-accessories.png
share/icons/gnome/24x24/categories/applications-development.png
@@ -2619,6 +2854,9 @@ share/icons/gnome/24x24/categories/applications-graphics.png
share/icons/gnome/24x24/categories/applications-internet.png
share/icons/gnome/24x24/categories/applications-multimedia.png
share/icons/gnome/24x24/categories/applications-office.png
+share/icons/gnome/24x24/categories/applications-other.png
+share/icons/gnome/24x24/categories/applications-science.png
+share/icons/gnome/24x24/categories/applications-system.png
share/icons/gnome/24x24/categories/gnome-applications.png
share/icons/gnome/24x24/categories/gnome-control-center.png
share/icons/gnome/24x24/categories/gnome-devel.png
@@ -2627,6 +2865,7 @@ share/icons/gnome/24x24/categories/gnome-graphics.png
share/icons/gnome/24x24/categories/gnome-joystick.png
share/icons/gnome/24x24/categories/gnome-multimedia.png
share/icons/gnome/24x24/categories/gnome-settings.png
+share/icons/gnome/24x24/categories/gnome-system.png
share/icons/gnome/24x24/categories/gnome-util.png
share/icons/gnome/24x24/categories/gtk-preferences.png
share/icons/gnome/24x24/categories/kcontrol.png
@@ -2637,6 +2876,7 @@ share/icons/gnome/24x24/categories/package_multimedia.png
share/icons/gnome/24x24/categories/package_network.png
share/icons/gnome/24x24/categories/package_office.png
share/icons/gnome/24x24/categories/package_settings.png
+share/icons/gnome/24x24/categories/package_system.png
share/icons/gnome/24x24/categories/package_utilities.png
share/icons/gnome/24x24/categories/preferences-desktop.png
share/icons/gnome/24x24/categories/preferences-system.png
@@ -2649,6 +2889,7 @@ share/icons/gnome/24x24/categories/redhat-preferences.png
share/icons/gnome/24x24/categories/redhat-programming.png
share/icons/gnome/24x24/categories/redhat-sound_video.png
share/icons/gnome/24x24/categories/redhat-system_settings.png
+share/icons/gnome/24x24/categories/redhat-system_tools.png
share/icons/gnome/24x24/categories/stock_internet.png
share/icons/gnome/24x24/categories/xfce-games.png
share/icons/gnome/24x24/categories/xfce-graphics.png
@@ -2661,6 +2902,10 @@ share/icons/gnome/24x24/categories/xfce4-settings.png
share/icons/gnome/24x24/devices/3floppy_unmount.png
share/icons/gnome/24x24/devices/audio-input-microphone.png
share/icons/gnome/24x24/devices/battery.png
+share/icons/gnome/24x24/devices/camera-photo.png
+share/icons/gnome/24x24/devices/camera-web.png
+share/icons/gnome/24x24/devices/camera.png
+share/icons/gnome/24x24/devices/camera_unmount.png
share/icons/gnome/24x24/devices/cdrom_unmount.png
share/icons/gnome/24x24/devices/cdwriter_unmount.png
share/icons/gnome/24x24/devices/chardevice.png
@@ -2711,6 +2956,7 @@ share/icons/gnome/24x24/devices/harddrive.png
share/icons/gnome/24x24/devices/hdd_unmount.png
share/icons/gnome/24x24/devices/input-keyboard.png
share/icons/gnome/24x24/devices/input-mouse.png
+share/icons/gnome/24x24/devices/input-tablet.png
share/icons/gnome/24x24/devices/ipod_mount.png
share/icons/gnome/24x24/devices/keyboard.png
share/icons/gnome/24x24/devices/kjobviewer.png
@@ -2719,6 +2965,7 @@ share/icons/gnome/24x24/devices/media-cdrom.png
share/icons/gnome/24x24/devices/media-flash.png
share/icons/gnome/24x24/devices/media-floppy.png
share/icons/gnome/24x24/devices/media-optical.png
+share/icons/gnome/24x24/devices/media-tape.png
share/icons/gnome/24x24/devices/modem.png
share/icons/gnome/24x24/devices/mouse.png
share/icons/gnome/24x24/devices/multimedia-player.png
@@ -2742,6 +2989,7 @@ share/icons/gnome/24x24/devices/yast_HD.png
share/icons/gnome/24x24/devices/yast_idetude.png
share/icons/gnome/24x24/devices/yast_mouse.png
share/icons/gnome/24x24/devices/yast_printer.png
+share/icons/gnome/24x24/emblems/emblem-default.png
share/icons/gnome/24x24/emblems/emblem-favorite.png
share/icons/gnome/24x24/emblems/emblem-important.png
share/icons/gnome/24x24/emblems/emblem-new.png
@@ -2998,6 +3246,7 @@ share/icons/gnome/24x24/status/nm-adhoc.png
share/icons/gnome/24x24/status/nm-device-wired.png
share/icons/gnome/24x24/status/nm-device-wireless.png
share/icons/gnome/24x24/status/nm-no-connection.png
+share/icons/gnome/24x24/status/printer-error.png
share/icons/gnome/24x24/status/stock_appointment-reminder-excl.png
share/icons/gnome/24x24/status/stock_appointment-reminder.png
share/icons/gnome/24x24/status/stock_dialog-error.png
@@ -3626,7 +3875,6 @@ 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
@@ -3659,18 +3907,39 @@ 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/actions/add.png
+share/icons/gnome/32x32/actions/address-book-new.png
share/icons/gnome/32x32/actions/back.png
+share/icons/gnome/32x32/actions/bookmark-new.png
+share/icons/gnome/32x32/actions/bookmark_add.png
+share/icons/gnome/32x32/actions/bookmarks_list_add.png
share/icons/gnome/32x32/actions/bottom.png
+share/icons/gnome/32x32/actions/centrejust.png
+share/icons/gnome/32x32/actions/contact-new.png
share/icons/gnome/32x32/actions/document-new.png
+share/icons/gnome/32x32/actions/document-open.png
+share/icons/gnome/32x32/actions/document-properties.png
+share/icons/gnome/32x32/actions/document-revert.png
share/icons/gnome/32x32/actions/document-save-as.png
share/icons/gnome/32x32/actions/document-save.png
share/icons/gnome/32x32/actions/down.png
+share/icons/gnome/32x32/actions/edit-cut.png
+share/icons/gnome/32x32/actions/edit-paste.png
+share/icons/gnome/32x32/actions/edit-redo.png
+share/icons/gnome/32x32/actions/edit-select-all.png
+share/icons/gnome/32x32/actions/edit-undo.png
+share/icons/gnome/32x32/actions/editcut.png
+share/icons/gnome/32x32/actions/editpaste.png
share/icons/gnome/32x32/actions/filenew.png
+share/icons/gnome/32x32/actions/fileopen.png
share/icons/gnome/32x32/actions/filesave.png
share/icons/gnome/32x32/actions/filesaveas.png
share/icons/gnome/32x32/actions/finish.png
share/icons/gnome/32x32/actions/folder-new.png
share/icons/gnome/32x32/actions/folder_new.png
+share/icons/gnome/32x32/actions/format-justify-center.png
+share/icons/gnome/32x32/actions/format-justify-fill.png
+share/icons/gnome/32x32/actions/format-justify-left.png
+share/icons/gnome/32x32/actions/format-justify-right.png
share/icons/gnome/32x32/actions/forward.png
share/icons/gnome/32x32/actions/gnome-lockscreen.png
share/icons/gnome/32x32/actions/gnome-run.png
@@ -3685,6 +3954,7 @@ share/icons/gnome/32x32/actions/go-top.png
share/icons/gnome/32x32/actions/go-up.png
share/icons/gnome/32x32/actions/gohome.png
share/icons/gnome/32x32/actions/gtk-add.png
+share/icons/gnome/32x32/actions/gtk-cut.png
share/icons/gnome/32x32/actions/gtk-fullscreen.png
share/icons/gnome/32x32/actions/gtk-go-back-ltr.png
share/icons/gnome/32x32/actions/gtk-go-back-rtl.png
@@ -3699,50 +3969,92 @@ share/icons/gnome/32x32/actions/gtk-goto-last-ltr.png
share/icons/gnome/32x32/actions/gtk-goto-last-rtl.png
share/icons/gnome/32x32/actions/gtk-goto-top.png
share/icons/gnome/32x32/actions/gtk-home.png
+share/icons/gnome/32x32/actions/gtk-justify-center.png
+share/icons/gnome/32x32/actions/gtk-justify-fill.png
+share/icons/gnome/32x32/actions/gtk-justify-left.png
+share/icons/gnome/32x32/actions/gtk-justify-right.png
share/icons/gnome/32x32/actions/gtk-leave-fullscreen.png
share/icons/gnome/32x32/actions/gtk-new.png
+share/icons/gnome/32x32/actions/gtk-open.png
+share/icons/gnome/32x32/actions/gtk-paste.png
+share/icons/gnome/32x32/actions/gtk-properties.png
+share/icons/gnome/32x32/actions/gtk-redo-ltr.png
share/icons/gnome/32x32/actions/gtk-remove.png
share/icons/gnome/32x32/actions/gtk-save-as.png
share/icons/gnome/32x32/actions/gtk-save.png
+share/icons/gnome/32x32/actions/gtk-select-all.png
+share/icons/gnome/32x32/actions/gtk-sort-ascending.png
+share/icons/gnome/32x32/actions/gtk-sort-descending.png
+share/icons/gnome/32x32/actions/gtk-stop.png
+share/icons/gnome/32x32/actions/gtk-undo-ltr.png
share/icons/gnome/32x32/actions/gtk-zoom-100.png
share/icons/gnome/32x32/actions/gtk-zoom-fit.png
share/icons/gnome/32x32/actions/gtk-zoom-in.png
share/icons/gnome/32x32/actions/gtk-zoom-out.png
+share/icons/gnome/32x32/actions/help-faq.png
share/icons/gnome/32x32/actions/kfm_home.png
+share/icons/gnome/32x32/actions/leftjust.png
share/icons/gnome/32x32/actions/list-add.png
share/icons/gnome/32x32/actions/list-remove.png
share/icons/gnome/32x32/actions/lock.png
+share/icons/gnome/32x32/actions/media-eject.png
share/icons/gnome/32x32/actions/next.png
+share/icons/gnome/32x32/actions/object-rotate-left.png
+share/icons/gnome/32x32/actions/object-rotate-right.png
+share/icons/gnome/32x32/actions/player_eject.png
share/icons/gnome/32x32/actions/previous.png
+share/icons/gnome/32x32/actions/process-stop.png
share/icons/gnome/32x32/actions/redhat-home.png
+share/icons/gnome/32x32/actions/redo.png
share/icons/gnome/32x32/actions/remove.png
+share/icons/gnome/32x32/actions/rightjust.png
share/icons/gnome/32x32/actions/start.png
+share/icons/gnome/32x32/actions/stock_add-bookmark.png
share/icons/gnome/32x32/actions/stock_bottom.png
+share/icons/gnome/32x32/actions/stock_cut.png
share/icons/gnome/32x32/actions/stock_down.png
+share/icons/gnome/32x32/actions/stock_file-properites.png
share/icons/gnome/32x32/actions/stock_first.png
share/icons/gnome/32x32/actions/stock_fullscreen.png
+share/icons/gnome/32x32/actions/stock_help-add-bookmark.png
share/icons/gnome/32x32/actions/stock_home.png
share/icons/gnome/32x32/actions/stock_last.png
share/icons/gnome/32x32/actions/stock_leave-fullscreen.png
share/icons/gnome/32x32/actions/stock_left.png
+share/icons/gnome/32x32/actions/stock_new-address-book.png
+share/icons/gnome/32x32/actions/stock_new-bcard.png
share/icons/gnome/32x32/actions/stock_new-dir.png
share/icons/gnome/32x32/actions/stock_new-text.png
share/icons/gnome/32x32/actions/stock_new-window.png
+share/icons/gnome/32x32/actions/stock_paste.png
+share/icons/gnome/32x32/actions/stock_properties.png
+share/icons/gnome/32x32/actions/stock_redo.png
share/icons/gnome/32x32/actions/stock_right.png
share/icons/gnome/32x32/actions/stock_save-as.png
share/icons/gnome/32x32/actions/stock_save.png
+share/icons/gnome/32x32/actions/stock_select-all.png
+share/icons/gnome/32x32/actions/stock_stop.png
+share/icons/gnome/32x32/actions/stock_text_center.png
+share/icons/gnome/32x32/actions/stock_text_justify.png
+share/icons/gnome/32x32/actions/stock_text_left.png
+share/icons/gnome/32x32/actions/stock_text_right.png
share/icons/gnome/32x32/actions/stock_top.png
+share/icons/gnome/32x32/actions/stock_undo.png
share/icons/gnome/32x32/actions/stock_up.png
share/icons/gnome/32x32/actions/stock_zoom-1.png
share/icons/gnome/32x32/actions/stock_zoom-in.png
share/icons/gnome/32x32/actions/stock_zoom-out.png
share/icons/gnome/32x32/actions/stock_zoom-page.png
+share/icons/gnome/32x32/actions/stop.png
share/icons/gnome/32x32/actions/system-lock-screen.png
share/icons/gnome/32x32/actions/system-run.png
share/icons/gnome/32x32/actions/top.png
+share/icons/gnome/32x32/actions/undo.png
share/icons/gnome/32x32/actions/up.png
share/icons/gnome/32x32/actions/view-fullscreen.png
share/icons/gnome/32x32/actions/view-restore.png
+share/icons/gnome/32x32/actions/view-sort-ascending.png
+share/icons/gnome/32x32/actions/view-sort-descending.png
share/icons/gnome/32x32/actions/viewmag+.png
share/icons/gnome/32x32/actions/viewmag-.png
share/icons/gnome/32x32/actions/viewmag1.png
@@ -3760,64 +4072,140 @@ share/icons/gnome/32x32/animations/gnome-spinner-rest.png
share/icons/gnome/32x32/animations/gnome-spinner.png
share/icons/gnome/32x32/animations/process-idle.png
share/icons/gnome/32x32/animations/process-working.png
+share/icons/gnome/32x32/apps/access.png
+share/icons/gnome/32x32/apps/accessibility-directory.png
+share/icons/gnome/32x32/apps/accessories-calculator.png
share/icons/gnome/32x32/apps/accessories-text-editor.png
-share/icons/gnome/32x32/apps/evolution.png
+share/icons/gnome/32x32/apps/background.png
+share/icons/gnome/32x32/apps/calc.png
+share/icons/gnome/32x32/apps/config-language.png
+share/icons/gnome/32x32/apps/config-users.png
share/icons/gnome/32x32/apps/file-manager.png
+share/icons/gnome/32x32/apps/fonts.png
+share/icons/gnome/32x32/apps/gnome-calculator.png
share/icons/gnome/32x32/apps/gnome-help.png
share/icons/gnome/32x32/apps/gnome-monitor.png
+share/icons/gnome/32x32/apps/gnome-remote-desktop.png
+share/icons/gnome/32x32/apps/gnome-settings-accessibility-technologies.png
+share/icons/gnome/32x32/apps/gnome-settings-background.png
+share/icons/gnome/32x32/apps/gnome-settings-font.png
+share/icons/gnome/32x32/apps/gnome-settings-keybindings.png
+share/icons/gnome/32x32/apps/gnome-settings-theme.png
+share/icons/gnome/32x32/apps/gnome-settings-ui-behavior.png
share/icons/gnome/32x32/apps/gnome-terminal.png
+share/icons/gnome/32x32/apps/gnome-window-manager.png
share/icons/gnome/32x32/apps/gtk-help.png
share/icons/gnome/32x32/apps/help-browser.png
share/icons/gnome/32x32/apps/help.png
+share/icons/gnome/32x32/apps/kcalc.png
+share/icons/gnome/32x32/apps/kcmkwm.png
share/icons/gnome/32x32/apps/kedit.png
+share/icons/gnome/32x32/apps/key_bindings.png
share/icons/gnome/32x32/apps/kfm.png
share/icons/gnome/32x32/apps/khelpcenter.png
share/icons/gnome/32x32/apps/konsole.png
+share/icons/gnome/32x32/apps/krfb.png
share/icons/gnome/32x32/apps/kscreensaver.png
share/icons/gnome/32x32/apps/ksysguard.png
+share/icons/gnome/32x32/apps/kuser.png
+share/icons/gnome/32x32/apps/kwin.png
+share/icons/gnome/32x32/apps/locale.png
share/icons/gnome/32x32/apps/logviewer.png
share/icons/gnome/32x32/apps/openterm.png
+share/icons/gnome/32x32/apps/preferences-desktop-accessibility.png
+share/icons/gnome/32x32/apps/preferences-desktop-font.png
+share/icons/gnome/32x32/apps/preferences-desktop-keyboard-shortcuts.png
+share/icons/gnome/32x32/apps/preferences-desktop-keyboard.png
+share/icons/gnome/32x32/apps/preferences-desktop-locale.png
+share/icons/gnome/32x32/apps/preferences-desktop-remote-desktop.png
share/icons/gnome/32x32/apps/preferences-desktop-screensaver.png
+share/icons/gnome/32x32/apps/preferences-desktop-theme.png
+share/icons/gnome/32x32/apps/preferences-desktop-wallpaper.png
+share/icons/gnome/32x32/apps/preferences-system-windows.png
share/icons/gnome/32x32/apps/redhat-filemanager.png
share/icons/gnome/32x32/apps/screensaver.png
share/icons/gnome/32x32/apps/stock_help.png
+share/icons/gnome/32x32/apps/style.png
share/icons/gnome/32x32/apps/susehelpcenter.png
+share/icons/gnome/32x32/apps/system-config-users.png
share/icons/gnome/32x32/apps/system-file-manager.png
+share/icons/gnome/32x32/apps/system-software-installer.png
+share/icons/gnome/32x32/apps/system-users.png
share/icons/gnome/32x32/apps/terminal.png
share/icons/gnome/32x32/apps/text-editor.png
+share/icons/gnome/32x32/apps/user-info.png
share/icons/gnome/32x32/apps/utilities-system-monitor.png
share/icons/gnome/32x32/apps/utilities-terminal.png
+share/icons/gnome/32x32/apps/wallpaper.png
share/icons/gnome/32x32/apps/xfce-filemanager.png
share/icons/gnome/32x32/apps/xfce-terminal.png
+share/icons/gnome/32x32/apps/xfce4-backdrop.png
+share/icons/gnome/32x32/apps/xfwm4.png
share/icons/gnome/32x32/apps/xscreensaver.png
share/icons/gnome/32x32/categories/applications-accessories.png
share/icons/gnome/32x32/categories/applications-development.png
share/icons/gnome/32x32/categories/applications-games.png
+share/icons/gnome/32x32/categories/applications-graphics.png
share/icons/gnome/32x32/categories/applications-internet.png
+share/icons/gnome/32x32/categories/applications-multimedia.png
+share/icons/gnome/32x32/categories/applications-office.png
+share/icons/gnome/32x32/categories/applications-other.png
+share/icons/gnome/32x32/categories/applications-science.png
+share/icons/gnome/32x32/categories/applications-system.png
+share/icons/gnome/32x32/categories/gnome-applications.png
+share/icons/gnome/32x32/categories/gnome-control-center.png
share/icons/gnome/32x32/categories/gnome-devel.png
share/icons/gnome/32x32/categories/gnome-globe.png
+share/icons/gnome/32x32/categories/gnome-graphics.png
share/icons/gnome/32x32/categories/gnome-joystick.png
+share/icons/gnome/32x32/categories/gnome-multimedia.png
+share/icons/gnome/32x32/categories/gnome-settings.png
+share/icons/gnome/32x32/categories/gnome-system.png
share/icons/gnome/32x32/categories/gnome-util.png
+share/icons/gnome/32x32/categories/gtk-preferences.png
+share/icons/gnome/32x32/categories/kcontrol.png
share/icons/gnome/32x32/categories/package_development.png
share/icons/gnome/32x32/categories/package_games.png
+share/icons/gnome/32x32/categories/package_graphics.png
+share/icons/gnome/32x32/categories/package_multimedia.png
share/icons/gnome/32x32/categories/package_network.png
+share/icons/gnome/32x32/categories/package_office.png
share/icons/gnome/32x32/categories/package_settings.png
+share/icons/gnome/32x32/categories/package_system.png
share/icons/gnome/32x32/categories/package_utilities.png
+share/icons/gnome/32x32/categories/preferences-desktop.png
share/icons/gnome/32x32/categories/preferences-system.png
share/icons/gnome/32x32/categories/redhat-accessories.png
share/icons/gnome/32x32/categories/redhat-games.png
+share/icons/gnome/32x32/categories/redhat-graphics.png
share/icons/gnome/32x32/categories/redhat-internet.png
+share/icons/gnome/32x32/categories/redhat-office.png
+share/icons/gnome/32x32/categories/redhat-preferences.png
share/icons/gnome/32x32/categories/redhat-programming.png
+share/icons/gnome/32x32/categories/redhat-sound_video.png
share/icons/gnome/32x32/categories/redhat-system_settings.png
+share/icons/gnome/32x32/categories/redhat-system_tools.png
share/icons/gnome/32x32/categories/stock_internet.png
share/icons/gnome/32x32/categories/xfce-games.png
+share/icons/gnome/32x32/categories/xfce-graphics.png
share/icons/gnome/32x32/categories/xfce-internet.png
+share/icons/gnome/32x32/categories/xfce-multimedia.png
+share/icons/gnome/32x32/categories/xfce-office.png
+share/icons/gnome/32x32/categories/xfce4-settings.png
share/icons/gnome/32x32/categories/xfce-system-settings.png
share/icons/gnome/32x32/categories/xfce-utils.png
share/icons/gnome/32x32/devices/3floppy_unmount.png
+share/icons/gnome/32x32/devices/audio-input-microphone.png
share/icons/gnome/32x32/devices/battery.png
+share/icons/gnome/32x32/devices/camera-photo.png
+share/icons/gnome/32x32/devices/camera-web.png
+share/icons/gnome/32x32/devices/camera.png
+share/icons/gnome/32x32/devices/camera_unmount.png
share/icons/gnome/32x32/devices/cdrom_unmount.png
share/icons/gnome/32x32/devices/cdwriter_unmount.png
+share/icons/gnome/32x32/devices/chardevice.png
+share/icons/gnome/32x32/devices/computer.png
+share/icons/gnome/32x32/devices/display.png
share/icons/gnome/32x32/devices/drive-cdrom.png
share/icons/gnome/32x32/devices/drive-harddisk.png
share/icons/gnome/32x32/devices/drive-optical.png
@@ -3826,6 +4214,7 @@ share/icons/gnome/32x32/devices/dvd_unmount.png
share/icons/gnome/32x32/devices/gnome-dev-battery.png
share/icons/gnome/32x32/devices/gnome-dev-cdrom-audio.png
share/icons/gnome/32x32/devices/gnome-dev-cdrom.png
+share/icons/gnome/32x32/devices/gnome-dev-computer.png
share/icons/gnome/32x32/devices/gnome-dev-disc-cdr.png
share/icons/gnome/32x32/devices/gnome-dev-disc-cdrw.png
share/icons/gnome/32x32/devices/gnome-dev-disc-dvdr-plus.png
@@ -3850,6 +4239,9 @@ share/icons/gnome/32x32/devices/gnome-dev-printer.png
share/icons/gnome/32x32/devices/gnome-dev-removable-1394.png
share/icons/gnome/32x32/devices/gnome-dev-removable-usb.png
share/icons/gnome/32x32/devices/gnome-dev-removable.png
+share/icons/gnome/32x32/devices/gnome-fs-client.png
+share/icons/gnome/32x32/devices/gnome-modem.png
+share/icons/gnome/32x32/devices/gnome-stock-mic.png
share/icons/gnome/32x32/devices/gtk-cdrom.png
share/icons/gnome/32x32/devices/gtk-floppy.png
share/icons/gnome/32x32/devices/gtk-harddisk.png
@@ -3857,6 +4249,7 @@ share/icons/gnome/32x32/devices/harddrive.png
share/icons/gnome/32x32/devices/hdd_unmount.png
share/icons/gnome/32x32/devices/input-keyboard.png
share/icons/gnome/32x32/devices/input-mouse.png
+share/icons/gnome/32x32/devices/input-tablet.png
share/icons/gnome/32x32/devices/ipod_mount.png
share/icons/gnome/32x32/devices/keyboard.png
share/icons/gnome/32x32/devices/kjobviewer.png
@@ -3865,22 +4258,29 @@ share/icons/gnome/32x32/devices/media-cdrom.png
share/icons/gnome/32x32/devices/media-flash.png
share/icons/gnome/32x32/devices/media-floppy.png
share/icons/gnome/32x32/devices/media-optical.png
+share/icons/gnome/32x32/devices/media-tape.png
+share/icons/gnome/32x32/devices/modem.png
share/icons/gnome/32x32/devices/mouse.png
share/icons/gnome/32x32/devices/multimedia-player.png
share/icons/gnome/32x32/devices/printer-remote.png
share/icons/gnome/32x32/devices/printer.png
share/icons/gnome/32x32/devices/printer1.png
share/icons/gnome/32x32/devices/printmgr.png
+share/icons/gnome/32x32/devices/stock_mic.png
share/icons/gnome/32x32/devices/stock_printers.png
share/icons/gnome/32x32/devices/system-floppy.png
+share/icons/gnome/32x32/devices/system.png
share/icons/gnome/32x32/devices/usbpendrive_unmount.png
+share/icons/gnome/32x32/devices/video-display.png
share/icons/gnome/32x32/devices/xfce-printer.png
+share/icons/gnome/32x32/devices/xfce4-display.png
share/icons/gnome/32x32/devices/xfce4-keyboard.png
share/icons/gnome/32x32/devices/xfce4-mouse.png
share/icons/gnome/32x32/devices/yast_HD.png
share/icons/gnome/32x32/devices/yast_idetude.png
share/icons/gnome/32x32/devices/yast_mouse.png
share/icons/gnome/32x32/devices/yast_printer.png
+share/icons/gnome/32x32/emblems/emblem-default.png
share/icons/gnome/32x32/emblems/emblem-favorite.png
share/icons/gnome/32x32/emblems/emblem-important.png
share/icons/gnome/32x32/emblems/emblem-new.png
@@ -3905,6 +4305,7 @@ share/icons/gnome/32x32/mimetypes/font_bitmap.png
share/icons/gnome/32x32/mimetypes/font_truetype.png
share/icons/gnome/32x32/mimetypes/font_type1.png
share/icons/gnome/32x32/mimetypes/gnome-fs-executable.png
+share/icons/gnome/32x32/mimetypes/gnome-fs-regular.png
share/icons/gnome/32x32/mimetypes/gnome-mime-application-magicpoint.png
share/icons/gnome/32x32/mimetypes/gnome-mime-application-msword.png
share/icons/gnome/32x32/mimetypes/gnome-mime-application-ogg.png
@@ -3991,6 +4392,7 @@ share/icons/gnome/32x32/mimetypes/gnome-mime-text.png
share/icons/gnome/32x32/mimetypes/gnome-mime-video.png
share/icons/gnome/32x32/mimetypes/gnome-mime-x-font-afm.png
share/icons/gnome/32x32/mimetypes/gnome-package.png
+share/icons/gnome/32x32/mimetypes/gtk-file.png
share/icons/gnome/32x32/mimetypes/html.png
share/icons/gnome/32x32/mimetypes/image-x-generic.png
share/icons/gnome/32x32/mimetypes/image.png
@@ -4015,6 +4417,7 @@ share/icons/gnome/32x32/mimetypes/template_source.png
share/icons/gnome/32x32/mimetypes/text-html.png
share/icons/gnome/32x32/mimetypes/text-x-generic-template.png
share/icons/gnome/32x32/mimetypes/text-x-generic.png
+share/icons/gnome/32x32/mimetypes/text-x-preview.png
share/icons/gnome/32x32/mimetypes/text-x-script.png
share/icons/gnome/32x32/mimetypes/tgz.png
share/icons/gnome/32x32/mimetypes/txt.png
@@ -4102,6 +4505,7 @@ share/icons/gnome/32x32/status/gtk-dialog-warning.png
share/icons/gnome/32x32/status/image-loading.png
share/icons/gnome/32x32/status/important.png
share/icons/gnome/32x32/status/info.png
+share/icons/gnome/32x32/status/mail-attachment.png
share/icons/gnome/32x32/status/messagebox_critical.png
share/icons/gnome/32x32/status/messagebox_info.png
share/icons/gnome/32x32/status/messagebox_warning.png
@@ -4115,6 +4519,7 @@ share/icons/gnome/32x32/status/nm-adhoc.png
share/icons/gnome/32x32/status/nm-device-wired.png
share/icons/gnome/32x32/status/nm-device-wireless.png
share/icons/gnome/32x32/status/nm-no-connection.png
+share/icons/gnome/32x32/status/printer-error.png
share/icons/gnome/32x32/status/stock_dialog-error.png
share/icons/gnome/32x32/status/stock_dialog-info.png
share/icons/gnome/32x32/status/stock_dialog-warning.png
@@ -4142,6 +4547,7 @@ share/icons/gnome/32x32/status/weather-showers.png
share/icons/gnome/32x32/status/weather-snow.png
share/icons/gnome/32x32/status/weather-storm.png
share/icons/gnome/32x32/status/xfce-trash_full.png
+share/icons/gnome/32x32/stock/generic/stock_person.png
share/icons/gnome/48x48/actions/appointment-new.png
share/icons/gnome/48x48/actions/appointment.png
share/icons/gnome/48x48/actions/gnome-stock-mail-new.png
@@ -4160,26 +4566,18 @@ share/icons/gnome/48x48/animations/gnome-spinner-rest.png
share/icons/gnome/48x48/animations/gnome-spinner.png
share/icons/gnome/48x48/animations/process-idle.png
share/icons/gnome/48x48/animations/process-working.png
-share/icons/gnome/48x48/apps/access.png
-share/icons/gnome/48x48/apps/accessibility-directory.png
-share/icons/gnome/48x48/apps/accessories-calculator.png
share/icons/gnome/48x48/apps/administration.png
share/icons/gnome/48x48/apps/advanced-directory.png
share/icons/gnome/48x48/apps/apacheconf.png
share/icons/gnome/48x48/apps/applets-screenshooter.png
-share/icons/gnome/48x48/apps/calc.png
share/icons/gnome/48x48/apps/character-picker.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/disks.png
share/icons/gnome/48x48/apps/eyes.png
-share/icons/gnome/48x48/apps/fonts.png
share/icons/gnome/48x48/apps/gdm.png
share/icons/gnome/48x48/apps/gnome-amusements.png
share/icons/gnome/48x48/apps/gnome-audio.png
-share/icons/gnome/48x48/apps/gnome-calculator.png
share/icons/gnome/48x48/apps/gnome-desktop-config.png
share/icons/gnome/48x48/apps/gnome-favorites.png
share/icons/gnome/48x48/apps/gnome-finance.png
@@ -4191,69 +4589,27 @@ 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-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-system-config.png
share/icons/gnome/48x48/apps/gnome-unknown.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/im.png
share/icons/gnome/48x48/apps/image-viewer.png
-share/icons/gnome/48x48/apps/kcalc.png
share/icons/gnome/48x48/apps/launcher-program.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/postscript-viewer.png
-share/icons/gnome/48x48/apps/preferences-desktop-accessibility.png
-share/icons/gnome/48x48/apps/preferences-desktop-font.png
-share/icons/gnome/48x48/apps/preferences-desktop-theme.png
share/icons/gnome/48x48/apps/serviceconf.png
share/icons/gnome/48x48/apps/stock-ticker.png
-share/icons/gnome/48x48/apps/style.png
-share/icons/gnome/48x48/apps/user-info.png
share/icons/gnome/48x48/apps/visor.png
-share/icons/gnome/48x48/categories/applications-graphics.png
-share/icons/gnome/48x48/categories/applications-multimedia.png
-share/icons/gnome/48x48/categories/applications-office.png
-share/icons/gnome/48x48/categories/applications-other.png
-share/icons/gnome/48x48/categories/applications-system.png
-share/icons/gnome/48x48/categories/gnome-applications.png
-share/icons/gnome/48x48/categories/gnome-control-center.png
-share/icons/gnome/48x48/categories/gnome-graphics.png
-share/icons/gnome/48x48/categories/gnome-multimedia.png
-share/icons/gnome/48x48/categories/gnome-settings.png
-share/icons/gnome/48x48/categories/gnome-system.png
-share/icons/gnome/48x48/categories/gtk-preferences.png
-share/icons/gnome/48x48/categories/kcontrol.png
-share/icons/gnome/48x48/categories/package_graphics.png
-share/icons/gnome/48x48/categories/package_multimedia.png
-share/icons/gnome/48x48/categories/package_office.png
-share/icons/gnome/48x48/categories/package_system.png
-share/icons/gnome/48x48/categories/preferences-desktop.png
-share/icons/gnome/48x48/categories/redhat-graphics.png
-share/icons/gnome/48x48/categories/redhat-office.png
-share/icons/gnome/48x48/categories/redhat-preferences.png
-share/icons/gnome/48x48/categories/redhat-sound_video.png
-share/icons/gnome/48x48/categories/redhat-system_tools.png
-share/icons/gnome/48x48/categories/xfce-graphics.png
-share/icons/gnome/48x48/categories/xfce-multimedia.png
-share/icons/gnome/48x48/categories/xfce-office.png
-share/icons/gnome/48x48/categories/xfce4-settings.png
share/icons/gnome/48x48/devices/gnome-dev-jazdisk.png
share/icons/gnome/48x48/devices/gnome-dev-zipdisk.png
-share/icons/gnome/48x48/devices/gnome-modem.png
share/icons/gnome/48x48/devices/media-jaz.png
share/icons/gnome/48x48/devices/media-zip.png
-share/icons/gnome/48x48/devices/modem.png
share/icons/gnome/48x48/emblems/emblem-OK.icon
share/icons/gnome/48x48/emblems/emblem-OK.png
share/icons/gnome/48x48/emblems/emblem-art.icon
@@ -4395,24 +4751,42 @@ 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/8x8/emblems/emblem-default.png
share/icons/gnome/8x8/emblems/emblem-new.png
share/icons/gnome/8x8/emblems/emblem-symbolic-link.png
share/icons/gnome/index.theme
share/icons/gnome/scalable/actions/add.svg
+share/icons/gnome/scalable/actions/address-book-new.svg
share/icons/gnome/scalable/actions/back.svg
+share/icons/gnome/scalable/actions/bookmark-new.svg
+share/icons/gnome/scalable/actions/bookmark_add.svg
+share/icons/gnome/scalable/actions/bookmarks_list_add.svg
share/icons/gnome/scalable/actions/bottom.svg
+share/icons/gnome/scalable/actions/centrejust.svg
+share/icons/gnome/scalable/actions/contact-new.svg
share/icons/gnome/scalable/actions/document-new.svg
+share/icons/gnome/scalable/actions/document-open.svg
share/icons/gnome/scalable/actions/document-print-preview.svg
share/icons/gnome/scalable/actions/document-print.svg
+share/icons/gnome/scalable/actions/document-properties.svg
+share/icons/gnome/scalable/actions/document-revert.svg
share/icons/gnome/scalable/actions/document-save-as.svg
share/icons/gnome/scalable/actions/document-save.svg
share/icons/gnome/scalable/actions/down.svg
+share/icons/gnome/scalable/actions/edit-cut.svg
share/icons/gnome/scalable/actions/edit-delete.svg
share/icons/gnome/scalable/actions/edit-find-replace.svg
share/icons/gnome/scalable/actions/edit-find.svg
+share/icons/gnome/scalable/actions/edit-paste.svg
+share/icons/gnome/scalable/actions/edit-redo.svg
+share/icons/gnome/scalable/actions/edit-select-all.svg
+share/icons/gnome/scalable/actions/edit-undo.svg
+share/icons/gnome/scalable/actions/editcut.svg
+share/icons/gnome/scalable/actions/editpaste.svg
share/icons/gnome/scalable/actions/editdelete.svg
share/icons/gnome/scalable/actions/filefind.svg
share/icons/gnome/scalable/actions/filenew.svg
+share/icons/gnome/scalable/actions/fileopen.svg
share/icons/gnome/scalable/actions/fileprint.svg
share/icons/gnome/scalable/actions/filequickprint.svg
share/icons/gnome/scalable/actions/filesave.svg
@@ -4421,6 +4795,10 @@ share/icons/gnome/scalable/actions/find.svg
share/icons/gnome/scalable/actions/finish.svg
share/icons/gnome/scalable/actions/folder-new.svg
share/icons/gnome/scalable/actions/folder_new.svg
+share/icons/gnome/scalable/actions/format-justify-center.svg
+share/icons/gnome/scalable/actions/format-justify-fill.svg
+share/icons/gnome/scalable/actions/format-justify-left.svg
+share/icons/gnome/scalable/actions/format-justify-right.svg
share/icons/gnome/scalable/actions/forward.svg
share/icons/gnome/scalable/actions/gnome-lockscreen.svg
share/icons/gnome/scalable/actions/gnome-run.svg
@@ -4435,6 +4813,7 @@ share/icons/gnome/scalable/actions/go-top.svg
share/icons/gnome/scalable/actions/go-up.svg
share/icons/gnome/scalable/actions/gohome.svg
share/icons/gnome/scalable/actions/gtk-add.svg
+share/icons/gnome/scalable/actions/gtk-cut.svg
share/icons/gnome/scalable/actions/gtk-delete.svg
share/icons/gnome/scalable/actions/gtk-find-and-replace.svg
share/icons/gnome/scalable/actions/gtk-find.svg
@@ -4452,57 +4831,104 @@ share/icons/gnome/scalable/actions/gtk-goto-last-ltr.svg
share/icons/gnome/scalable/actions/gtk-goto-last-rtl.svg
share/icons/gnome/scalable/actions/gtk-goto-top.svg
share/icons/gnome/scalable/actions/gtk-home.svg
+share/icons/gnome/scalable/actions/gtk-justify-center.svg
+share/icons/gnome/scalable/actions/gtk-justify-fill.svg
+share/icons/gnome/scalable/actions/gtk-justify-left.svg
+share/icons/gnome/scalable/actions/gtk-justify-right.svg
share/icons/gnome/scalable/actions/gtk-leave-fullscreen.svg
share/icons/gnome/scalable/actions/gtk-new.svg
+share/icons/gnome/scalable/actions/gtk-open.svg
+share/icons/gnome/scalable/actions/gtk-paste.svg
share/icons/gnome/scalable/actions/gtk-print-preview.svg
share/icons/gnome/scalable/actions/gtk-print.svg
+share/icons/gnome/scalable/actions/gtk-properties.svg
+share/icons/gnome/scalable/actions/gtk-redo-ltr.svg
share/icons/gnome/scalable/actions/gtk-remove.svg
share/icons/gnome/scalable/actions/gtk-save-as.svg
share/icons/gnome/scalable/actions/gtk-save.svg
+share/icons/gnome/scalable/actions/gtk-select-all.svg
+share/icons/gnome/scalable/actions/gtk-sort-ascending.svg
+share/icons/gnome/scalable/actions/gtk-sort-descending.svg
+share/icons/gnome/scalable/actions/gtk-stop.svg
+share/icons/gnome/scalable/actions/gtk-undo-ltr.svg
share/icons/gnome/scalable/actions/gtk-zoom-100.svg
share/icons/gnome/scalable/actions/gtk-zoom-fit.svg
share/icons/gnome/scalable/actions/gtk-zoom-in.svg
share/icons/gnome/scalable/actions/gtk-zoom-out.svg
+share/icons/gnome/scalable/actions/help-faq.svg
+share/icons/gnome/scalable/actions/insert-image.svg
+share/icons/gnome/scalable/actions/insert-link.svg
+share/icons/gnome/scalable/actions/insert-text.svg
share/icons/gnome/scalable/actions/kfm_home.svg
+share/icons/gnome/scalable/actions/leftjust.svg
share/icons/gnome/scalable/actions/list-add.svg
share/icons/gnome/scalable/actions/list-remove.svg
share/icons/gnome/scalable/actions/lock.svg
+share/icons/gnome/scalable/actions/media-eject.svg
share/icons/gnome/scalable/actions/next.svg
+share/icons/gnome/scalable/actions/object-flip-horizontal.svg
+share/icons/gnome/scalable/actions/object-flip-vertical.svg
+share/icons/gnome/scalable/actions/object-rotate-left.svg
+share/icons/gnome/scalable/actions/object-rotate-right.svg
+share/icons/gnome/scalable/actions/player_eject.svg
share/icons/gnome/scalable/actions/previous.svg
+share/icons/gnome/scalable/actions/process-stop.svg
share/icons/gnome/scalable/actions/redhat-home.svg
+share/icons/gnome/scalable/actions/redo.svg
share/icons/gnome/scalable/actions/remove.svg
+share/icons/gnome/scalable/actions/rightjust.svg
share/icons/gnome/scalable/actions/start.svg
+share/icons/gnome/scalable/actions/stock_add-bookmark.svg
share/icons/gnome/scalable/actions/stock_bottom.svg
+share/icons/gnome/scalable/actions/stock_cut.svg
share/icons/gnome/scalable/actions/stock_delete.svg
share/icons/gnome/scalable/actions/stock_down.svg
+share/icons/gnome/scalable/actions/stock_file-properites.svg
share/icons/gnome/scalable/actions/stock_first.svg
share/icons/gnome/scalable/actions/stock_fullscreen.svg
+share/icons/gnome/scalable/actions/stock_help-add-bookmark.svg
share/icons/gnome/scalable/actions/stock_home.svg
share/icons/gnome/scalable/actions/stock_last.svg
share/icons/gnome/scalable/actions/stock_leave-fullscreen.svg
share/icons/gnome/scalable/actions/stock_left.svg
+share/icons/gnome/scalable/actions/stock_new-address-book.svg
+share/icons/gnome/scalable/actions/stock_new-bcard.svg
share/icons/gnome/scalable/actions/stock_new-dir.svg
share/icons/gnome/scalable/actions/stock_new-text.svg
share/icons/gnome/scalable/actions/stock_new-window.svg
+share/icons/gnome/scalable/actions/stock_paste.svg
share/icons/gnome/scalable/actions/stock_print-preview.svg
share/icons/gnome/scalable/actions/stock_print.svg
+share/icons/gnome/scalable/actions/stock_properties.svg
+share/icons/gnome/scalable/actions/stock_redo.svg
share/icons/gnome/scalable/actions/stock_right.svg
share/icons/gnome/scalable/actions/stock_save-as.svg
share/icons/gnome/scalable/actions/stock_save.svg
share/icons/gnome/scalable/actions/stock_search-and-replace.svg
share/icons/gnome/scalable/actions/stock_search.svg
+share/icons/gnome/scalable/actions/stock_select-all.svg
+share/icons/gnome/scalable/actions/stock_stop.svg
+share/icons/gnome/scalable/actions/stock_text_center.svg
+share/icons/gnome/scalable/actions/stock_text_justify.svg
+share/icons/gnome/scalable/actions/stock_text_left.svg
+share/icons/gnome/scalable/actions/stock_text_right.svg
share/icons/gnome/scalable/actions/stock_top.svg
+share/icons/gnome/scalable/actions/stock_undo.svg
share/icons/gnome/scalable/actions/stock_up.svg
share/icons/gnome/scalable/actions/stock_zoom-1.svg
share/icons/gnome/scalable/actions/stock_zoom-in.svg
share/icons/gnome/scalable/actions/stock_zoom-out.svg
share/icons/gnome/scalable/actions/stock_zoom-page.svg
+share/icons/gnome/scalable/actions/stop.svg
share/icons/gnome/scalable/actions/system-lock-screen.svg
share/icons/gnome/scalable/actions/system-run.svg
share/icons/gnome/scalable/actions/top.svg
+share/icons/gnome/scalable/actions/undo.svg
share/icons/gnome/scalable/actions/up.svg
share/icons/gnome/scalable/actions/view-fullscreen.svg
share/icons/gnome/scalable/actions/view-restore.svg
+share/icons/gnome/scalable/actions/view-sort-ascending.svg
+share/icons/gnome/scalable/actions/view-sort-descending.svg
share/icons/gnome/scalable/actions/viewmag+.svg
share/icons/gnome/scalable/actions/viewmag-.svg
share/icons/gnome/scalable/actions/viewmag1.svg
@@ -4516,18 +4942,32 @@ share/icons/gnome/scalable/actions/zoom-best-fit.svg
share/icons/gnome/scalable/actions/zoom-in.svg
share/icons/gnome/scalable/actions/zoom-original.svg
share/icons/gnome/scalable/actions/zoom-out.svg
+share/icons/gnome/scalable/apps/access.svg
+share/icons/gnome/scalable/apps/accessibility-directory.svg
+share/icons/gnome/scalable/apps/accessories-calculator.svg
share/icons/gnome/scalable/apps/accessories-dictionary.svg
share/icons/gnome/scalable/apps/accessories-text-editor.svg
share/icons/gnome/scalable/apps/arts.svg
share/icons/gnome/scalable/apps/background.svg
-share/icons/gnome/scalable/apps/evolution.svg
+share/icons/gnome/scalable/apps/calc.svg
+share/icons/gnome/scalable/apps/config-language.svg
+share/icons/gnome/scalable/apps/config-users.svg
share/icons/gnome/scalable/apps/file-manager.svg
+share/icons/gnome/scalable/apps/fonts.svg
+share/icons/gnome/scalable/apps/gnome-calculator.svg
share/icons/gnome/scalable/apps/gnome-help.svg
share/icons/gnome/scalable/apps/gnome-mixer.svg
share/icons/gnome/scalable/apps/gnome-monitor.svg
+share/icons/gnome/scalable/apps/gnome-remote-desktop.svg
+share/icons/gnome/scalable/apps/gnome-settings-accessibility-technologies.svg
share/icons/gnome/scalable/apps/gnome-settings-background.svg
+share/icons/gnome/scalable/apps/gnome-settings-font.svg
+share/icons/gnome/scalable/apps/gnome-settings-keybindings.svg
+share/icons/gnome/scalable/apps/gnome-settings-theme.svg
+share/icons/gnome/scalable/apps/gnome-settings-ui-behavior.svg
share/icons/gnome/scalable/apps/gnome-shutdown.svg
share/icons/gnome/scalable/apps/gnome-terminal.svg
+share/icons/gnome/scalable/apps/gnome-window-manager.svg
share/icons/gnome/scalable/apps/gtk-help.svg
share/icons/gnome/scalable/apps/help-browser.svg
share/icons/gnome/scalable/apps/help.svg
@@ -4537,26 +4977,46 @@ share/icons/gnome/scalable/apps/im-jabber.svg
share/icons/gnome/scalable/apps/im-msn.svg
share/icons/gnome/scalable/apps/im-nov.svg
share/icons/gnome/scalable/apps/im-yahoo.svg
+share/icons/gnome/scalable/apps/kcalc.svg
+share/icons/gnome/scalable/apps/kcmkwm.svg
share/icons/gnome/scalable/apps/kcmsound.svg
share/icons/gnome/scalable/apps/kedit.svg
+share/icons/gnome/scalable/apps/key_bindings.svg
share/icons/gnome/scalable/apps/kfm.svg
share/icons/gnome/scalable/apps/khelpcenter.svg
share/icons/gnome/scalable/apps/konsole.svg
+share/icons/gnome/scalable/apps/krfb.svg
share/icons/gnome/scalable/apps/kscreensaver.svg
share/icons/gnome/scalable/apps/ksysguard.svg
+share/icons/gnome/scalable/apps/kuser.svg
+share/icons/gnome/scalable/apps/kwin.svg
+share/icons/gnome/scalable/apps/locale.svg
share/icons/gnome/scalable/apps/logviewer.svg
share/icons/gnome/scalable/apps/multimedia-volume-control.svg
share/icons/gnome/scalable/apps/multimedia.svg
share/icons/gnome/scalable/apps/openterm.svg
+share/icons/gnome/scalable/apps/preferences-desktop-accessibility.svg
+share/icons/gnome/scalable/apps/preferences-desktop-font.svg
+share/icons/gnome/scalable/apps/preferences-desktop-keyboard-shortcuts.svg
+share/icons/gnome/scalable/apps/preferences-desktop-keyboard.svg
+share/icons/gnome/scalable/apps/preferences-desktop-locale.svg
+share/icons/gnome/scalable/apps/preferences-desktop-remote-desktop.svg
share/icons/gnome/scalable/apps/preferences-desktop-screensaver.svg
+share/icons/gnome/scalable/apps/preferences-desktop-theme.svg
share/icons/gnome/scalable/apps/preferences-desktop-wallpaper.svg
+share/icons/gnome/scalable/apps/preferences-system-windows.svg
share/icons/gnome/scalable/apps/redhat-filemanager.svg
share/icons/gnome/scalable/apps/screensaver.svg
share/icons/gnome/scalable/apps/stock_help.svg
+share/icons/gnome/scalable/apps/style.svg
share/icons/gnome/scalable/apps/susehelpcenter.svg
+share/icons/gnome/scalable/apps/system-config-users.svg
share/icons/gnome/scalable/apps/system-file-manager.svg
+share/icons/gnome/scalable/apps/system-software-installer.svg
+share/icons/gnome/scalable/apps/system-users.svg
share/icons/gnome/scalable/apps/terminal.svg
share/icons/gnome/scalable/apps/text-editor.svg
+share/icons/gnome/scalable/apps/user-info.svg
share/icons/gnome/scalable/apps/utilities-system-monitor.svg
share/icons/gnome/scalable/apps/utilities-terminal.svg
share/icons/gnome/scalable/apps/volume-knob.svg
@@ -4566,34 +5026,67 @@ share/icons/gnome/scalable/apps/xfce-filemanager.svg
share/icons/gnome/scalable/apps/xfce-terminal.svg
share/icons/gnome/scalable/apps/xfce4-backdrop.svg
share/icons/gnome/scalable/apps/xfce4-mixer.svg
+share/icons/gnome/scalable/apps/xfwm4.svg
share/icons/gnome/scalable/apps/xscreensaver.svg
share/icons/gnome/scalable/categories/applications-accessories.svg
share/icons/gnome/scalable/categories/applications-development.svg
share/icons/gnome/scalable/categories/applications-games.svg
+share/icons/gnome/scalable/categories/applications-graphics.svg
share/icons/gnome/scalable/categories/applications-internet.svg
+share/icons/gnome/scalable/categories/applications-multimedia.svg
+share/icons/gnome/scalable/categories/applications-office.svg
+share/icons/gnome/scalable/categories/applications-other.svg
+share/icons/gnome/scalable/categories/applications-science.svg
+share/icons/gnome/scalable/categories/applications-system.svg
+share/icons/gnome/scalable/categories/gnome-applications.svg
+share/icons/gnome/scalable/categories/gnome-control-center.svg
share/icons/gnome/scalable/categories/gnome-devel.svg
share/icons/gnome/scalable/categories/gnome-globe.svg
+share/icons/gnome/scalable/categories/gnome-graphics.svg
share/icons/gnome/scalable/categories/gnome-joystick.svg
+share/icons/gnome/scalable/categories/gnome-multimedia.svg
+share/icons/gnome/scalable/categories/gnome-settings.svg
+share/icons/gnome/scalable/categories/gnome-system.svg
share/icons/gnome/scalable/categories/gnome-util.svg
+share/icons/gnome/scalable/categories/gtk-preferences.svg
+share/icons/gnome/scalable/categories/kcontrol.svg
share/icons/gnome/scalable/categories/package_development.svg
share/icons/gnome/scalable/categories/package_games.svg
+share/icons/gnome/scalable/categories/package_graphics.svg
+share/icons/gnome/scalable/categories/package_multimedia.svg
share/icons/gnome/scalable/categories/package_network.svg
+share/icons/gnome/scalable/categories/package_office.svg
share/icons/gnome/scalable/categories/package_settings.svg
+share/icons/gnome/scalable/categories/package_system.svg
share/icons/gnome/scalable/categories/package_utilities.svg
+share/icons/gnome/scalable/categories/preferences-desktop.svg
share/icons/gnome/scalable/categories/preferences-system.svg
share/icons/gnome/scalable/categories/redhat-accessories.svg
share/icons/gnome/scalable/categories/redhat-games.svg
+share/icons/gnome/scalable/categories/redhat-graphics.svg
share/icons/gnome/scalable/categories/redhat-internet.svg
+share/icons/gnome/scalable/categories/redhat-office.svg
+share/icons/gnome/scalable/categories/redhat-preferences.svg
share/icons/gnome/scalable/categories/redhat-programming.svg
+share/icons/gnome/scalable/categories/redhat-sound_video.svg
share/icons/gnome/scalable/categories/redhat-system_settings.svg
+share/icons/gnome/scalable/categories/redhat-system_tools.svg
share/icons/gnome/scalable/categories/stock_internet.svg
share/icons/gnome/scalable/categories/xfce-games.svg
+share/icons/gnome/scalable/categories/xfce-graphics.svg
share/icons/gnome/scalable/categories/xfce-internet.svg
+share/icons/gnome/scalable/categories/xfce-multimedia.svg
+share/icons/gnome/scalable/categories/xfce-office.svg
+share/icons/gnome/scalable/categories/xfce4-settings.svg
share/icons/gnome/scalable/categories/xfce-system-settings.svg
share/icons/gnome/scalable/categories/xfce-utils.svg
share/icons/gnome/scalable/devices/3floppy_unmount.svg
share/icons/gnome/scalable/devices/audio-input-microphone.svg
share/icons/gnome/scalable/devices/battery.svg
+share/icons/gnome/scalable/devices/camera-photo.svg
+share/icons/gnome/scalable/devices/camera-web.svg
+share/icons/gnome/scalable/devices/camera.svg
+share/icons/gnome/scalable/devices/camera_unmount.svg
share/icons/gnome/scalable/devices/cdrom_unmount.svg
share/icons/gnome/scalable/devices/cdwriter_unmount.svg
share/icons/gnome/scalable/devices/chardevice.svg
@@ -4633,6 +5126,7 @@ share/icons/gnome/scalable/devices/gnome-dev-removable-1394.svg
share/icons/gnome/scalable/devices/gnome-dev-removable-usb.svg
share/icons/gnome/scalable/devices/gnome-dev-removable.svg
share/icons/gnome/scalable/devices/gnome-fs-client.svg
+share/icons/gnome/scalable/devices/gnome-modem.svg
share/icons/gnome/scalable/devices/gnome-stock-mic.svg
share/icons/gnome/scalable/devices/gtk-cdrom.svg
share/icons/gnome/scalable/devices/gtk-floppy.svg
@@ -4641,6 +5135,7 @@ share/icons/gnome/scalable/devices/harddrive.svg
share/icons/gnome/scalable/devices/hdd_unmount.svg
share/icons/gnome/scalable/devices/input-keyboard.svg
share/icons/gnome/scalable/devices/input-mouse.svg
+share/icons/gnome/scalable/devices/input-tablet.svg
share/icons/gnome/scalable/devices/ipod_mount.svg
share/icons/gnome/scalable/devices/keyboard.svg
share/icons/gnome/scalable/devices/kjobviewer.svg
@@ -4649,6 +5144,8 @@ share/icons/gnome/scalable/devices/media-cdrom.svg
share/icons/gnome/scalable/devices/media-flash.svg
share/icons/gnome/scalable/devices/media-floppy.svg
share/icons/gnome/scalable/devices/media-optical.svg
+share/icons/gnome/scalable/devices/media-tape.svg
+share/icons/gnome/scalable/devices/modem.svg
share/icons/gnome/scalable/devices/mouse.svg
share/icons/gnome/scalable/devices/multimedia-player.svg
share/icons/gnome/scalable/devices/printer-remote.svg
@@ -4675,6 +5172,7 @@ share/icons/gnome/scalable/emblems/emblem-cvs-conflict.icon
share/icons/gnome/scalable/emblems/emblem-cvs-conflict.svg
share/icons/gnome/scalable/emblems/emblem-cvs-removed.icon
share/icons/gnome/scalable/emblems/emblem-cvs-removed.svg
+share/icons/gnome/scalable/emblems/emblem-default.svg
share/icons/gnome/scalable/emblems/emblem-favorite.icon
share/icons/gnome/scalable/emblems/emblem-favorite.svg
share/icons/gnome/scalable/emblems/emblem-generic.icon
@@ -4939,6 +5437,7 @@ share/icons/gnome/scalable/status/gtk-dialog-warning.svg
share/icons/gnome/scalable/status/image-loading.svg
share/icons/gnome/scalable/status/important.svg
share/icons/gnome/scalable/status/info.svg
+share/icons/gnome/scalable/status/mail-attachment.svg
share/icons/gnome/scalable/status/messagebox_critical.svg
share/icons/gnome/scalable/status/messagebox_info.svg
share/icons/gnome/scalable/status/messagebox_warning.svg
@@ -4952,6 +5451,7 @@ share/icons/gnome/scalable/status/nm-adhoc.svg
share/icons/gnome/scalable/status/nm-device-wired.svg
share/icons/gnome/scalable/status/nm-device-wireless.svg
share/icons/gnome/scalable/status/nm-no-connection.svg
+share/icons/gnome/scalable/status/printer-error.svg
share/icons/gnome/scalable/status/stock_appointment-reminder-excl.svg
share/icons/gnome/scalable/status/stock_appointment-reminder.svg
share/icons/gnome/scalable/status/stock_dialog-error.svg
@@ -5065,16 +5565,15 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
@dirrmtry share/icons/gnome/48x48/stock/data
@dirrmtry share/icons/gnome/48x48/stock/code
@dirrmtry share/icons/gnome/48x48/stock
-@dirrmtry share/icons/gnome/48x48/status
-@dirrmtry share/icons/gnome/48x48/places
@dirrmtry share/icons/gnome/48x48/filesystems
@dirrmtry share/icons/gnome/48x48/emblems
@dirrmtry share/icons/gnome/48x48/devices
-@dirrmtry share/icons/gnome/48x48/categories
@dirrmtry share/icons/gnome/48x48/apps
@dirrmtry share/icons/gnome/48x48/animations
@dirrmtry share/icons/gnome/48x48/actions
@dirrmtry share/icons/gnome/48x48
+@dirrmtry share/icons/gnome/32x32/stock/generic
+@dirrmtry share/icons/gnome/32x32/stock
@dirrmtry share/icons/gnome/32x32/status
@dirrmtry share/icons/gnome/32x32/places
@dirrmtry share/icons/gnome/32x32/mimetypes
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index ea66d06..a4579f7 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.31 2006/10/03 19:58:31 mezz Exp $
+# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.33 2007/03/13 00:11:38 marcus Exp $
#
PORTNAME= gnome-user-docs
-PORTVERSION= 2.16.1
+PORTVERSION= 2.18.0
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo
index 452d732..b4d4f7c 100644
--- a/misc/gnome-user-docs/distinfo
+++ b/misc/gnome-user-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-docs-2.16.1.tar.bz2) = 4b0abfe5e24438414c22083851bae19e
-SHA256 (gnome2/gnome-user-docs-2.16.1.tar.bz2) = 2ad18c2902969c81e0a8d5c510f27d6187ed83a748e8cabe33124c7f0862b354
-SIZE (gnome2/gnome-user-docs-2.16.1.tar.bz2) = 4005619
+MD5 (gnome2/gnome-user-docs-2.18.0.tar.bz2) = a2561b2c99325fa9f9fdf92c035ae2ad
+SHA256 (gnome2/gnome-user-docs-2.18.0.tar.bz2) = 81ac23b39c6f651c97501c5344c1bd7fb99dff53c5361da271ba59222a1af7c2
+SIZE (gnome2/gnome-user-docs-2.18.0.tar.bz2) = 5942980
diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist
index 0e7409a..3ea4189 100644
--- a/misc/gnome-user-docs/pkg-plist
+++ b/misc/gnome-user-docs/pkg-plist
@@ -33,6 +33,33 @@ share/gnome/help/gnome-access-guide/C/legal.xml
share/gnome/help/gnome-access-guide/C/preface.xml
share/gnome/help/gnome-access-guide/C/sysadmin.xml
share/gnome/help/gnome-access-guide/C/themes.xml
+share/gnome/help/gnome-access-guide/en_GB/figures/accessx.png
+share/gnome/help/gnome-access-guide/en_GB/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/en_GB/figures/button.png
+share/gnome/help/gnome-access-guide/en_GB/figures/check_box.png
+share/gnome/help/gnome-access-guide/en_GB/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/en_GB/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/en_GB/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/en_GB/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/en_GB/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/en_GB/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/en_GB/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/en_GB/figures/radio_button.png
+share/gnome/help/gnome-access-guide/en_GB/figures/slider.png
+share/gnome/help/gnome-access-guide/en_GB/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/en_GB/figures/spin_box.png
+share/gnome/help/gnome-access-guide/en_GB/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/en_GB/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/en_GB/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/en_GB/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/en_GB/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/en_GB/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/en_GB/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/en_GB/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/en_GB/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/en_GB/figures/text_box.png
+share/gnome/help/gnome-access-guide/en_GB/figures/tree.png
+share/gnome/help/gnome-access-guide/en_GB/gnome-access-guide.xml
share/gnome/help/gnome-access-guide/es/figures/accessx.png
share/gnome/help/gnome-access-guide/es/figures/bouncekeys.png
share/gnome/help/gnome-access-guide/es/figures/button.png
@@ -60,6 +87,33 @@ share/gnome/help/gnome-access-guide/es/figures/tabbed_section.png
share/gnome/help/gnome-access-guide/es/figures/text_box.png
share/gnome/help/gnome-access-guide/es/figures/tree.png
share/gnome/help/gnome-access-guide/es/gnome-access-guide.xml
+share/gnome/help/gnome-access-guide/fr/figures/accessx.png
+share/gnome/help/gnome-access-guide/fr/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/fr/figures/button.png
+share/gnome/help/gnome-access-guide/fr/figures/check_box.png
+share/gnome/help/gnome-access-guide/fr/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/fr/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/fr/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/fr/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/fr/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/fr/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/fr/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/fr/figures/radio_button.png
+share/gnome/help/gnome-access-guide/fr/figures/slider.png
+share/gnome/help/gnome-access-guide/fr/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/fr/figures/spin_box.png
+share/gnome/help/gnome-access-guide/fr/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/fr/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/fr/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/fr/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/fr/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/fr/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/fr/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/fr/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/fr/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/fr/figures/text_box.png
+share/gnome/help/gnome-access-guide/fr/figures/tree.png
+share/gnome/help/gnome-access-guide/fr/gnome-access-guide.xml
share/gnome/help/gnome-access-guide/it/figures/accessx.png
share/gnome/help/gnome-access-guide/it/figures/bouncekeys.png
share/gnome/help/gnome-access-guide/it/figures/button.png
@@ -130,7 +184,9 @@ share/gnome/help/system-admin-guide/C/sessions.xml
share/gnome/help/system-admin-guide/C/system-admin-guide.xml
share/gnome/help/system-admin-guide/C/themes.xml
share/gnome/help/system-admin-guide/es/system-admin-guide.xml
+share/gnome/help/system-admin-guide/fr/system-admin-guide.xml
share/gnome/help/system-admin-guide/it/system-admin-guide.xml
+share/gnome/help/system-admin-guide/pa/system-admin-guide.xml
share/gnome/help/system-admin-guide/sv/system-admin-guide.xml
share/gnome/help/user-guide/C/figures/ask_pointer.png
share/gnome/help/user-guide/C/figures/busy_pointer.png
@@ -210,6 +266,83 @@ share/gnome/help/user-guide/C/gosstartsession.xml
share/gnome/help/user-guide/C/gostools.xml
share/gnome/help/user-guide/C/legal.xml
share/gnome/help/user-guide/C/user-guide.xml
+share/gnome/help/user-guide/ar/figures/ask_pointer.png
+share/gnome/help/user-guide/ar/figures/busy_pointer.png
+share/gnome/help/user-guide/ar/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/ar/figures/copy_pointer.png
+share/gnome/help/user-guide/ar/figures/force_quit.png
+share/gnome/help/user-guide/ar/figures/four_hide_button.png
+share/gnome/help/user-guide/ar/figures/gedit_window.png
+share/gnome/help/user-guide/ar/figures/gnome_panel.png
+share/gnome/help/user-guide/ar/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/ar/figures/ibeam_pointer.png
+share/gnome/help/user-guide/ar/figures/link_pointer.png
+share/gnome/help/user-guide/ar/figures/lockscreen_icon.png
+share/gnome/help/user-guide/ar/figures/logout_icon.png
+share/gnome/help/user-guide/ar/figures/menu_bar_applet.png
+share/gnome/help/user-guide/ar/figures/menu_panel.png
+share/gnome/help/user-guide/ar/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/ar/figures/move_pointer.png
+share/gnome/help/user-guide/ar/figures/movewindow_pointer.png
+share/gnome/help/user-guide/ar/figures/naut_browser_mode.png
+share/gnome/help/user-guide/ar/figures/naut_button_bar.png
+share/gnome/help/user-guide/ar/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/ar/figures/naut_emblem.png
+share/gnome/help/user-guide/ar/figures/naut_go_to_location.png
+share/gnome/help/user-guide/ar/figures/naut_link_emblem.png
+share/gnome/help/user-guide/ar/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/ar/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/ar/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/ar/figures/naut_refine_search.png
+share/gnome/help/user-guide/ar/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/ar/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/ar/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/ar/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/ar/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/ar/figures/naut_search_bar.png
+share/gnome/help/user-guide/ar/figures/naut_search_results.png
+share/gnome/help/user-guide/ar/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/ar/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/ar/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/ar/figures/naut_spatial_view.png
+share/gnome/help/user-guide/ar/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/ar/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/ar/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/ar/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/ar/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/ar/figures/normal_pointer.png
+share/gnome/help/user-guide/ar/figures/not_available_pointer.png
+share/gnome/help/user-guide/ar/figures/notification_area_icon.png
+share/gnome/help/user-guide/ar/figures/open_drawer.png
+share/gnome/help/user-guide/ar/figures/openwindows_menu.png
+share/gnome/help/user-guide/ar/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/ar/figures/resize_pointer.png
+share/gnome/help/user-guide/ar/figures/run_button.png
+share/gnome/help/user-guide/ar/figures/sample_applet.png
+share/gnome/help/user-guide/ar/figures/screenshot_button.png
+share/gnome/help/user-guide/ar/figures/searchtool_button.png
+share/gnome/help/user-guide/ar/figures/show_desktop_button.png
+share/gnome/help/user-guide/ar/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/ar/figures/titlebar_window.png
+share/gnome/help/user-guide/ar/figures/typical_menu.png
+share/gnome/help/user-guide/ar/figures/window_list_applet.png
+share/gnome/help/user-guide/ar/figures/window_list_group_applet.png
+share/gnome/help/user-guide/ar/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/ar/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/ar/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/ar/figures/yelp_preferences.png
+share/gnome/help/user-guide/ar/figures/yelp_window.png
+share/gnome/help/user-guide/ar/glossary.xml
+share/gnome/help/user-guide/ar/gosbasic.xml
+share/gnome/help/user-guide/ar/goscustdesk.xml
+share/gnome/help/user-guide/ar/goseditmainmenu.xml
+share/gnome/help/user-guide/ar/gosfeedback.xml
+share/gnome/help/user-guide/ar/gosnautilus.xml
+share/gnome/help/user-guide/ar/gosoverview.xml
+share/gnome/help/user-guide/ar/gospanel.xml
+share/gnome/help/user-guide/ar/gosstartsession.xml
+share/gnome/help/user-guide/ar/gostools.xml
+share/gnome/help/user-guide/ar/user-guide.xml
share/gnome/help/user-guide/bg/figures/ask_pointer.png
share/gnome/help/user-guide/bg/figures/busy_pointer.png
share/gnome/help/user-guide/bg/figures/com_file_manager_menu.png
@@ -518,6 +651,83 @@ share/gnome/help/user-guide/it/gospanel.xml
share/gnome/help/user-guide/it/gosstartsession.xml
share/gnome/help/user-guide/it/gostools.xml
share/gnome/help/user-guide/it/user-guide.xml
+share/gnome/help/user-guide/pa/figures/ask_pointer.png
+share/gnome/help/user-guide/pa/figures/busy_pointer.png
+share/gnome/help/user-guide/pa/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/pa/figures/copy_pointer.png
+share/gnome/help/user-guide/pa/figures/force_quit.png
+share/gnome/help/user-guide/pa/figures/four_hide_button.png
+share/gnome/help/user-guide/pa/figures/gedit_window.png
+share/gnome/help/user-guide/pa/figures/gnome_panel.png
+share/gnome/help/user-guide/pa/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/pa/figures/ibeam_pointer.png
+share/gnome/help/user-guide/pa/figures/link_pointer.png
+share/gnome/help/user-guide/pa/figures/lockscreen_icon.png
+share/gnome/help/user-guide/pa/figures/logout_icon.png
+share/gnome/help/user-guide/pa/figures/menu_bar_applet.png
+share/gnome/help/user-guide/pa/figures/menu_panel.png
+share/gnome/help/user-guide/pa/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/pa/figures/move_pointer.png
+share/gnome/help/user-guide/pa/figures/movewindow_pointer.png
+share/gnome/help/user-guide/pa/figures/naut_browser_mode.png
+share/gnome/help/user-guide/pa/figures/naut_button_bar.png
+share/gnome/help/user-guide/pa/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/pa/figures/naut_emblem.png
+share/gnome/help/user-guide/pa/figures/naut_go_to_location.png
+share/gnome/help/user-guide/pa/figures/naut_link_emblem.png
+share/gnome/help/user-guide/pa/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/pa/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/pa/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/pa/figures/naut_refine_search.png
+share/gnome/help/user-guide/pa/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/pa/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/pa/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/pa/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/pa/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/pa/figures/naut_search_bar.png
+share/gnome/help/user-guide/pa/figures/naut_search_results.png
+share/gnome/help/user-guide/pa/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/pa/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/pa/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/pa/figures/naut_spatial_view.png
+share/gnome/help/user-guide/pa/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/pa/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/pa/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/pa/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/pa/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/pa/figures/normal_pointer.png
+share/gnome/help/user-guide/pa/figures/not_available_pointer.png
+share/gnome/help/user-guide/pa/figures/notification_area_icon.png
+share/gnome/help/user-guide/pa/figures/open_drawer.png
+share/gnome/help/user-guide/pa/figures/openwindows_menu.png
+share/gnome/help/user-guide/pa/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/pa/figures/resize_pointer.png
+share/gnome/help/user-guide/pa/figures/run_button.png
+share/gnome/help/user-guide/pa/figures/sample_applet.png
+share/gnome/help/user-guide/pa/figures/screenshot_button.png
+share/gnome/help/user-guide/pa/figures/searchtool_button.png
+share/gnome/help/user-guide/pa/figures/show_desktop_button.png
+share/gnome/help/user-guide/pa/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/pa/figures/titlebar_window.png
+share/gnome/help/user-guide/pa/figures/typical_menu.png
+share/gnome/help/user-guide/pa/figures/window_list_applet.png
+share/gnome/help/user-guide/pa/figures/window_list_group_applet.png
+share/gnome/help/user-guide/pa/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/pa/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/pa/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/pa/figures/yelp_preferences.png
+share/gnome/help/user-guide/pa/figures/yelp_window.png
+share/gnome/help/user-guide/pa/glossary.xml
+share/gnome/help/user-guide/pa/gosbasic.xml
+share/gnome/help/user-guide/pa/goscustdesk.xml
+share/gnome/help/user-guide/pa/goseditmainmenu.xml
+share/gnome/help/user-guide/pa/gosfeedback.xml
+share/gnome/help/user-guide/pa/gosnautilus.xml
+share/gnome/help/user-guide/pa/gosoverview.xml
+share/gnome/help/user-guide/pa/gospanel.xml
+share/gnome/help/user-guide/pa/gosstartsession.xml
+share/gnome/help/user-guide/pa/gostools.xml
+share/gnome/help/user-guide/pa/user-guide.xml
share/gnome/help/user-guide/pt_BR/figures/ask_pointer.png
share/gnome/help/user-guide/pt_BR/figures/busy_pointer.png
share/gnome/help/user-guide/pt_BR/figures/com_file_manager_menu.png
@@ -827,18 +1037,24 @@ share/gnome/help/user-guide/zh_CN/gosstartsession.xml
share/gnome/help/user-guide/zh_CN/gostools.xml
share/gnome/help/user-guide/zh_CN/user-guide.xml
share/gnome/omf/gnome-access-guide/gnome-access-guide-C.omf
+share/gnome/omf/gnome-access-guide/gnome-access-guide-en_GB.omf
share/gnome/omf/gnome-access-guide/gnome-access-guide-es.omf
+share/gnome/omf/gnome-access-guide/gnome-access-guide-fr.omf
share/gnome/omf/gnome-access-guide/gnome-access-guide-it.omf
share/gnome/omf/gnome-access-guide/gnome-access-guide-sv.omf
share/gnome/omf/system-admin-guide/system-admin-guide-C.omf
share/gnome/omf/system-admin-guide/system-admin-guide-es.omf
+share/gnome/omf/system-admin-guide/system-admin-guide-fr.omf
share/gnome/omf/system-admin-guide/system-admin-guide-it.omf
+share/gnome/omf/system-admin-guide/system-admin-guide-pa.omf
share/gnome/omf/system-admin-guide/system-admin-guide-sv.omf
share/gnome/omf/user-guide/user-guide-C.omf
+share/gnome/omf/user-guide/user-guide-ar.omf
share/gnome/omf/user-guide/user-guide-bg.omf
share/gnome/omf/user-guide/user-guide-es.omf
share/gnome/omf/user-guide/user-guide-fr.omf
share/gnome/omf/user-guide/user-guide-it.omf
+share/gnome/omf/user-guide/user-guide-pa.omf
share/gnome/omf/user-guide/user-guide-pt_BR.omf
share/gnome/omf/user-guide/user-guide-ru.omf
share/gnome/omf/user-guide/user-guide-sv.omf
@@ -854,6 +1070,8 @@ share/gnome/omf/user-guide/user-guide-zh_CN.omf
@dirrm share/gnome/help/user-guide/ru
@dirrm share/gnome/help/user-guide/pt_BR/figures
@dirrm share/gnome/help/user-guide/pt_BR
+@dirrm share/gnome/help/user-guide/pa/figures
+@dirrm share/gnome/help/user-guide/pa
@dirrm share/gnome/help/user-guide/it/figures
@dirrm share/gnome/help/user-guide/it
@dirrm share/gnome/help/user-guide/fr/figures
@@ -862,11 +1080,15 @@ share/gnome/omf/user-guide/user-guide-zh_CN.omf
@dirrm share/gnome/help/user-guide/es
@dirrm share/gnome/help/user-guide/bg/figures
@dirrm share/gnome/help/user-guide/bg
+@dirrm share/gnome/help/user-guide/ar/figures
+@dirrm share/gnome/help/user-guide/ar
@dirrm share/gnome/help/user-guide/C/figures
@dirrm share/gnome/help/user-guide/C
@dirrm share/gnome/help/user-guide
@dirrm share/gnome/help/system-admin-guide/sv
+@dirrm share/gnome/help/system-admin-guide/pa
@dirrm share/gnome/help/system-admin-guide/it
+@dirrm share/gnome/help/system-admin-guide/fr
@dirrm share/gnome/help/system-admin-guide/es
@dirrm share/gnome/help/system-admin-guide/C
@dirrm share/gnome/help/system-admin-guide
@@ -874,8 +1096,12 @@ share/gnome/omf/user-guide/user-guide-zh_CN.omf
@dirrm share/gnome/help/gnome-access-guide/sv
@dirrm share/gnome/help/gnome-access-guide/it/figures
@dirrm share/gnome/help/gnome-access-guide/it
+@dirrm share/gnome/help/gnome-access-guide/fr/figures
+@dirrm share/gnome/help/gnome-access-guide/fr
@dirrm share/gnome/help/gnome-access-guide/es/figures
@dirrm share/gnome/help/gnome-access-guide/es
+@dirrm share/gnome/help/gnome-access-guide/en_GB/figures
+@dirrm share/gnome/help/gnome-access-guide/en_GB
@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/hicolor-icon-theme/Makefile b/misc/hicolor-icon-theme/Makefile
index d47d3ab..b6b2220 100644
--- a/misc/hicolor-icon-theme/Makefile
+++ b/misc/hicolor-icon-theme/Makefile
@@ -3,12 +3,12 @@
# Whom: marcus@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/misc/hicolor-icon-theme/Makefile,v 1.4 2006/08/12 13:55:16 ahze Exp $
+# $MCom: ports/misc/hicolor-icon-theme/Makefile,v 1.7 2006/12/07 07:33:37 marcus Exp $
#
PORTNAME= hicolor-icon-theme
-PORTVERSION= 0.9
-PORTREVISION= 2
+PORTVERSION= 0.10
+PORTREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= http://icon-theme.freedesktop.org/releases/
@@ -27,7 +27,8 @@ PLIST= ${WRKDIR}/pkg-plist
# Update the below from Makefile.in each release
ICON_SIZES= 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 \
128x128 192x192 scalable
-ICON_CONTEXTS= actions apps devices filesystems mimetypes stock emblems
+ICON_CONTEXTS= actions animations apps categories devices emblems emotes \
+ filesystems intl mimetypes places status stock
STOCK_SUBS= chart code data form image io media navigation net object table text
SUB_LIST= ICON_SIZES="${ICON_SIZES}" ICON_CONTEXTS="${ICON_CONTEXTS}" \
diff --git a/misc/hicolor-icon-theme/distinfo b/misc/hicolor-icon-theme/distinfo
index c94e7a0..4b7c999 100644
--- a/misc/hicolor-icon-theme/distinfo
+++ b/misc/hicolor-icon-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (hicolor-icon-theme-0.9.tar.gz) = 1d0821cb80d394eac30bd8cec5b0b60c
-SHA256 (hicolor-icon-theme-0.9.tar.gz) = a6abad5dd62f12870ff5b32ae414e0c611f0922b905aeab6db2676b607bb1643
-SIZE (hicolor-icon-theme-0.9.tar.gz) = 32574
+MD5 (hicolor-icon-theme-0.10.tar.gz) = 3534f7b8e59785c7d5bfa923e85510a7
+SHA256 (hicolor-icon-theme-0.10.tar.gz) = 9d73af8f61240fbb3c522321582cd693c5b81ef344067a3949f0aa624610adee
+SIZE (hicolor-icon-theme-0.10.tar.gz) = 33616
diff --git a/misc/hicolor-icon-theme/files/pkg-install.in b/misc/hicolor-icon-theme/files/pkg-install.in
index 5b985a4..d8fd041 100644
--- a/misc/hicolor-icon-theme/files/pkg-install.in
+++ b/misc/hicolor-icon-theme/files/pkg-install.in
@@ -1,6 +1,6 @@
#!/bin/sh
# $FreeBSD$
-# $MCom: ports/misc/hicolor-icon-theme/files/pkg-install.in,v 1.1 2006/08/11 01:19:11 ahze Exp $
+# $MCom: ports/misc/hicolor-icon-theme/files/pkg-install.in,v 1.4 2007/02/16 18:14:25 mezz Exp $
PATH=/bin:/usr/bin:/usr/sbin
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 67c7547..b23df99 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -223,7 +223,7 @@
SUBDIR += tkxanim
SUBDIR += tosvcd
SUBDIR += totem
- SUBDIR += totem-gstreamer
+ SUBDIR += totem-xine
SUBDIR += tovid
SUBDIR += toxine
SUBDIR += transcode
diff --git a/multimedia/totem-gstreamer/Makefile b/multimedia/totem-gstreamer/Makefile
deleted file mode 100644
index 7f7cd3f..0000000
--- a/multimedia/totem-gstreamer/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for: totem-gstreamer
-# Date created: 04 December 2004
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/multimedia/totem-gstreamer/Makefile,v 1.13 2006/03/01 04:32:55 marcus Exp $
-#
-
-PORTREVISION= 0
-PKGNAMESUFFIX= -gstreamer
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= A Gstreamer-based video player for the GNOME 2 desktop
-
-MASTERDIR= ${.CURDIR}/../totem
-
-OPTIONS= MOZILLA_PLUGIN "Totem mozilla plugin" off
-WITH_GSTREAMER= yes
-
-CONFLICTS= totem-[0-9]*
-
-.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/totem-xine/Makefile b/multimedia/totem-xine/Makefile
new file mode 100644
index 0000000..e54cf17
--- /dev/null
+++ b/multimedia/totem-xine/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: totem-xine
+# Date created: March 2, 2007
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/multimedia/totem-xine/Makefile,v 1.1 2007/03/15 14:29:57 ahze Exp $
+
+PORTREVISION= 0
+PKGNAMESUFFIX= -xine
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A XINE-based video player for the GNOME 2 desktop
+
+MASTERDIR= ${.CURDIR}/../totem
+
+WITH_TOTEM_XINE= yes
+
+CONFLICTS= totem-[0-9]* totem-gstreamer-[0-9]*
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index a3d9787..a841a17 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -3,17 +3,18 @@
# Whom: Hendrik Scholz <hendrik@scholz.net>
#
# $FreeBSD$
+# $MCom: ports/multimedia/totem/Makefile,v 1.77 2007/03/11 05:25:07 mezz Exp $
#
PORTNAME= totem
-PORTVERSION= 2.16.5
-PORTREVISION?= 1
+PORTVERSION= 2.18.0
+PORTREVISION?= 0
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER?= gnome@FreeBSD.org
-COMMENT?= A Xine-based video player for the GNOME 2 Desktop
+COMMENT?= A gstreamer-based video player for the GNOME 2 Desktop
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
LIB_DEPENDS= musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
@@ -36,27 +37,23 @@ PKGMESSAGE= ${WRKDIR}/pkg-message
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXrandr"
-OPTIONS?= DVDNAV "Enable DVD support" on \
- GSTREAMER "Use Gstreamer instead of Xine" off \
- MOZILLA_PLUGIN "Totem mozilla plugin" off
-
-MAN1= totem.1 totem-video-thumbnailer.1
+MAN1= totem.1 totem-video-thumbnailer.1
GCONF_SCHEMAS= totem-handlers.schemas totem-video-thumbnail.schemas \
totem.schemas
-CONFLICTS?= totem-gstreamer-[0-9]*
+CONFLICTS?= totem-gstreamer-[0-9]* totem-xine-[0-9]*
.include <bsd.port.pre.mk>
-.if defined(WITH_MOZILLA_PLUGIN)
-USE_GECKO= firefox mozilla seamonkey xulrunner<->firefox firefox15<->firefox
+.if defined(WITH_MOZILLA_PLUGIN) && ${SLAVE_PORT:L}=="yes"
+USE_GECKO= firefox mozilla seamonkey xulrunner<->firefox firefox-devel<->firefox
.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
-PLIST_SUB+= MOZILLA=""
CONFIGURE_ARGS+=--with-mozilla=${GECKO} \
--enable-gmp-plugin \
--enable-complex-plugin \
--enable-narrowspace-plugin
+BUILD_WRKSRC= ${WRKSRC}/browser-plugin
+INSTALL_WRKSRC= ${WRKSRC}/browser-plugin
.else
-PLIST_SUB+= MOZILLA="@comment "
CONFIGURE_ARGS+=--without-mozilla \
--disable-browser-plugins \
--disable-mozilla \
@@ -66,13 +63,13 @@ CONFIGURE_ARGS+=--without-mozilla \
--disable-narrowspace-plugin
.endif
-.if defined(WITH_GSTREAMER)
+.if !defined(WITH_TOTEM_XINE) || ${SLAVE_PORT}=="no"
CONFIGURE_ARGS+=--enable-gstreamer=yes
USE_GSTREAMER+= gnomevfs core gconf hal good mpeg2dec ugly
WITHOUT_DVDNAV= yes
PLIST_SUB+= GSTREAMER=""
.else
-LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS+= xine.16:${PORTSDIR}/multimedia/libxine
PLIST_SUB+= GSTREAMER="@comment "
.endif
@@ -101,6 +98,8 @@ post-patch:
s|mozilla/plugins|browser_plugins|' \
${WRKSRC}/browser-plugin/Makefile.in \
${WRKSRC}/browser-plugin/idl/Makefile.in
+ @${REINPLACE_CMD} -e 's|dbus >= 0.61|dbus-1 >= 0.61|g' \
+ ${WRKSRC}/configure
.if defined(WITH_GSTREAMER)
@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
${WRKSRC}/src/backend/bacon-video-widget-gst-0.10.c
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 6ef9be0..e04ea7f 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-2.16.5.tar.bz2) = fa8eb90b52d70d876e1d42ec43cf8448
-SHA256 (gnome2/totem-2.16.5.tar.bz2) = 7dab6a72cbf9d242a8eb13e4fce70aa3e730f7f74dad84181034022edfbb37df
-SIZE (gnome2/totem-2.16.5.tar.bz2) = 1820880
+MD5 (gnome2/totem-2.18.0.tar.bz2) = 1a3bfeaac6297b259967f5d79896b0e7
+SHA256 (gnome2/totem-2.18.0.tar.bz2) = 5f5228c64865b3caf928caada2eca8868abc04d939ac0f03a1069f7815584fca
+SIZE (gnome2/totem-2.18.0.tar.bz2) = 2050182
diff --git a/multimedia/totem/files/patch-browser-plugin_Makefile.in b/multimedia/totem/files/patch-browser-plugin_Makefile.in
new file mode 100644
index 0000000..2dd84be
--- /dev/null
+++ b/multimedia/totem/files/patch-browser-plugin_Makefile.in
@@ -0,0 +1,110 @@
+--- browser-plugin/Makefile.in.orig Fri Mar 2 07:22:29 2007
++++ browser-plugin/Makefile.in Fri Mar 2 07:24:05 2007
+@@ -72,7 +72,7 @@
+ pluginLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(noinst_LTLIBRARIES) $(plugin_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-@ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_DEPENDENCIES = \
+ @ENABLE_BASIC_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_BASIC_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \
+ @ENABLE_BASIC_PLUGIN_TRUE@ $(am__DEPENDENCIES_1)
+@@ -88,7 +88,7 @@
+ $(am_libtotem_basic_plugin_la_OBJECTS)
+ @ENABLE_BASIC_PLUGIN_TRUE@am_libtotem_basic_plugin_la_rpath = -rpath \
+ @ENABLE_BASIC_PLUGIN_TRUE@ $(plugindir)
+-@ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_DEPENDENCIES = \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ $(am__DEPENDENCIES_1)
+@@ -104,7 +104,7 @@
+ $(am_libtotem_complex_plugin_la_OBJECTS)
+ @ENABLE_COMPLEX_PLUGIN_TRUE@am_libtotem_complex_plugin_la_rpath = \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ -rpath $(plugindir)
+-@ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_DEPENDENCIES = \
+ @ENABLE_GMP_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_GMP_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \
+ @ENABLE_GMP_PLUGIN_TRUE@ $(am__DEPENDENCIES_1)
+@@ -124,7 +124,7 @@
+ libtotem_gmp_plugin_la_OBJECTS = $(am_libtotem_gmp_plugin_la_OBJECTS)
+ @ENABLE_GMP_PLUGIN_TRUE@am_libtotem_gmp_plugin_la_rpath = -rpath \
+ @ENABLE_GMP_PLUGIN_TRUE@ $(plugindir)
+-@ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_DEPENDENCIES = \
+ @ENABLE_MULLY_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_MULLY_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \
+ @ENABLE_MULLY_PLUGIN_TRUE@ $(am__DEPENDENCIES_1)
+@@ -140,7 +140,7 @@
+ $(am_libtotem_mully_plugin_la_OBJECTS)
+ @ENABLE_MULLY_PLUGIN_TRUE@am_libtotem_mully_plugin_la_rpath = -rpath \
+ @ENABLE_MULLY_PLUGIN_TRUE@ $(plugindir)
+-@ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_DEPENDENCIES = \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(am__DEPENDENCIES_1)
+@@ -360,7 +360,7 @@
+ MOZILLA_LIBDIR = @MOZILLA_LIBDIR@
+ MOZILLA_NOT_LINKED_CFLAGS = @MOZILLA_NOT_LINKED_CFLAGS@
+ MOZILLA_NOT_LINKED_LIBS = @MOZILLA_NOT_LINKED_LIBS@
+-MOZILLA_PLUGINDIR = @MOZILLA_PLUGINDIR@
++MOZILLA_PLUGINDIR = /var/tmp/totem/lib/browser_plugins
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MOZILLA_XPCOM_CFLAGS = @MOZILLA_XPCOM_CFLAGS@
+ MOZILLA_XPIDL = @MOZILLA_XPIDL@
+@@ -464,7 +464,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = idl
+-plugindir = $(libdir)/mozilla/plugins
++plugindir = $(libdir)/browser_plugins
+ plugin_LTLIBRARIES = $(am__append_1) $(am__append_2) $(am__append_3) \
+ $(am__append_4) $(am__append_5)
+ BUILT_SOURCES = $(libtotempluginviewer_marshal_la_SOURCES) \
+@@ -581,7 +581,7 @@
+ @ENABLE_BASIC_PLUGIN_TRUE@ $(AM_CXXFLAGS)
+
+ @ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_LIBADD = \
+-@ENABLE_BASIC_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_BASIC_PLUGIN_TRUE@ -ltotem-plparser \
+ @ENABLE_BASIC_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_BASIC_PLUGIN_TRUE@ $(DBUS_LIBS) \
+ @ENABLE_BASIC_PLUGIN_TRUE@ $(MOZILLA_LIBS) \
+@@ -641,7 +641,7 @@
+ @ENABLE_GMP_PLUGIN_TRUE@ $(AM_CXXFLAGS)
+
+ @ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_LIBADD = \
+-@ENABLE_GMP_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_GMP_PLUGIN_TRUE@ -ltotem-plparser \
+ @ENABLE_GMP_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_GMP_PLUGIN_TRUE@ $(DBUS_LIBS) \
+ @ENABLE_GMP_PLUGIN_TRUE@ $(MOZILLA_LIBS) \
+@@ -695,7 +695,7 @@
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ $(AM_CXXFLAGS)
+
+ @ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_LIBADD = \
+-@ENABLE_COMPLEX_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_COMPLEX_PLUGIN_TRUE@ -ltotem-plparser \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ $(DBUS_LIBS) \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ $(MOZILLA_LIBS) \
+@@ -749,7 +749,7 @@
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(AM_CXXFLAGS)
+
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_LIBADD = \
+-@ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@ -ltotem-plparser \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(DBUS_LIBS) \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(MOZILLA_LIBS) \
+@@ -803,7 +803,7 @@
+ @ENABLE_MULLY_PLUGIN_TRUE@ $(AM_CXXFLAGS)
+
+ @ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_LIBADD = \
+-@ENABLE_MULLY_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_MULLY_PLUGIN_TRUE@ -ltotem-plparser \
+ @ENABLE_MULLY_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_MULLY_PLUGIN_TRUE@ $(DBUS_LIBS) \
+ @ENABLE_MULLY_PLUGIN_TRUE@ $(MOZILLA_LIBS) \
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 6dd28c0..a0e9701 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -1,29 +1,10 @@
bin/totem
+bin/totem-video-indexer
bin/totem-video-thumbnailer
include/totem/1/plparser/totem-disc.h
include/totem/1/plparser/totem-pl-parser-builtins.h
include/totem/1/plparser/totem-pl-parser-features.h
include/totem/1/plparser/totem-pl-parser.h
-%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.a
-%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.la
-%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.so
-%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.xpt
-%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.a
-%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.la
-%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.so
-%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.xpt
-%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.a
-%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.la
-%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.so
-%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.xpt
-%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.a
-%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.la
-%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.so
-%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.xpt
-%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.a
-%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.la
-%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.so
-%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.xpt
lib/libtotem-plparser.a
lib/libtotem-plparser.la
lib/libtotem-plparser.so
@@ -32,7 +13,6 @@ lib/nautilus/extensions-1.0/libtotem-properties-page.a
lib/nautilus/extensions-1.0/libtotem-properties-page.la
lib/nautilus/extensions-1.0/libtotem-properties-page.so
libdata/pkgconfig/totem-plparser.pc
-%%MOZILLA%%libexec/totem-mozilla-viewer
share/gnome/applications/totem.desktop
share/gnome/help/totem/C/figures/totem_next_button.png
share/gnome/help/totem/C/figures/totem_pause_button.png
@@ -55,7 +35,6 @@ share/gnome/help/totem/de/figures/totem_show_playlist_button.png
share/gnome/help/totem/de/figures/totem_start_window.png
share/gnome/help/totem/de/figures/totem_volume_maximum_button.png
share/gnome/help/totem/de/figures/totem_volume_mute_button.png
-share/gnome/help/totem/de/legal.xml
share/gnome/help/totem/de/totem.xml
share/gnome/help/totem/es/figures/totem_next_button.png
share/gnome/help/totem/es/figures/totem_pause_button.png
@@ -65,7 +44,6 @@ share/gnome/help/totem/es/figures/totem_show_playlist_button.png
share/gnome/help/totem/es/figures/totem_start_window.png
share/gnome/help/totem/es/figures/totem_volume_maximum_button.png
share/gnome/help/totem/es/figures/totem_volume_mute_button.png
-share/gnome/help/totem/es/legal.xml
share/gnome/help/totem/es/totem.xml
share/gnome/help/totem/fr/figures/totem_next_button.png
share/gnome/help/totem/fr/figures/totem_pause_button.png
@@ -75,12 +53,43 @@ share/gnome/help/totem/fr/figures/totem_show_playlist_button.png
share/gnome/help/totem/fr/figures/totem_start_window.png
share/gnome/help/totem/fr/figures/totem_volume_maximum_button.png
share/gnome/help/totem/fr/figures/totem_volume_mute_button.png
-share/gnome/help/totem/fr/legal.xml
share/gnome/help/totem/fr/totem.xml
-share/gnome/help/totem/ru/figures/totem_screenshot.png
+share/gnome/help/totem/pa/figures/totem_next_button.png
+share/gnome/help/totem/pa/figures/totem_pause_button.png
+share/gnome/help/totem/pa/figures/totem_play_button.png
+share/gnome/help/totem/pa/figures/totem_previous_button.png
+share/gnome/help/totem/pa/figures/totem_show_playlist_button.png
+share/gnome/help/totem/pa/figures/totem_start_window.png
+share/gnome/help/totem/pa/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/pa/figures/totem_volume_mute_button.png
+share/gnome/help/totem/pa/totem.xml
+share/gnome/help/totem/pt_BR/figures/totem_next_button.png
+share/gnome/help/totem/pt_BR/figures/totem_pause_button.png
+share/gnome/help/totem/pt_BR/figures/totem_play_button.png
+share/gnome/help/totem/pt_BR/figures/totem_previous_button.png
+share/gnome/help/totem/pt_BR/figures/totem_show_playlist_button.png
+share/gnome/help/totem/pt_BR/figures/totem_start_window.png
+share/gnome/help/totem/pt_BR/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/pt_BR/figures/totem_volume_mute_button.png
+share/gnome/help/totem/pt_BR/totem.xml
+share/gnome/help/totem/ru/figures/totem_next_button.png
+share/gnome/help/totem/ru/figures/totem_pause_button.png
+share/gnome/help/totem/ru/figures/totem_play_button.png
+share/gnome/help/totem/ru/figures/totem_previous_button.png
+share/gnome/help/totem/ru/figures/totem_show_playlist_button.png
share/gnome/help/totem/ru/figures/totem_start_window.png
-share/gnome/help/totem/ru/legal.xml
+share/gnome/help/totem/ru/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/ru/figures/totem_volume_mute_button.png
share/gnome/help/totem/ru/totem.xml
+share/gnome/help/totem/sv/figures/totem_next_button.png
+share/gnome/help/totem/sv/figures/totem_pause_button.png
+share/gnome/help/totem/sv/figures/totem_play_button.png
+share/gnome/help/totem/sv/figures/totem_previous_button.png
+share/gnome/help/totem/sv/figures/totem_show_playlist_button.png
+share/gnome/help/totem/sv/figures/totem_start_window.png
+share/gnome/help/totem/sv/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/sv/figures/totem_volume_mute_button.png
+share/gnome/help/totem/sv/totem.xml
share/gnome/help/totem/uk/figures/totem_next_button.png
share/gnome/help/totem/uk/figures/totem_pause_button.png
share/gnome/help/totem/uk/figures/totem_play_button.png
@@ -96,32 +105,23 @@ share/gnome/omf/totem/totem-bg.omf
share/gnome/omf/totem/totem-de.omf
share/gnome/omf/totem/totem-es.omf
share/gnome/omf/totem/totem-fr.omf
+share/gnome/omf/totem/totem-pa.omf
+share/gnome/omf/totem/totem-pt_BR.omf
share/gnome/omf/totem/totem-ru.omf
+share/gnome/omf/totem/totem-sv.omf
share/gnome/omf/totem/totem-uk.omf
share/gnome/pixmaps/vanity.png
-%%MOZILLA%%share/gnome/totem/doc/totemIBasicPlayer.html
-%%MOZILLA%%share/gnome/totem/doc/totemIComplexPlayer.html
-%%MOZILLA%%share/gnome/totem/doc/totemIGMPControls.html
-%%MOZILLA%%share/gnome/totem/doc/totemIGMPPlayer.html
-%%MOZILLA%%share/gnome/totem/doc/totemIMullYPlayer.html
-%%MOZILLA%%share/gnome/totem/doc/totemINarrowSpacePlayer.html
share/gnome/totem/filmholes-big-left.png
share/gnome/totem/filmholes-big-right.png
share/gnome/totem/filmholes.png
share/gnome/totem/mozilla-viewer.glade
-share/gnome/totem/playlist-playing.png
+share/gnome/totem/playlist-ui.xml
share/gnome/totem/playlist.glade
-share/gnome/totem/popup.glade
share/gnome/totem/properties.glade
-share/gnome/totem/rhythmbox-volume-max.png
-share/gnome/totem/rhythmbox-volume-zero.png
share/gnome/totem/screenshot.glade
share/gnome/totem/skip_to.glade
share/gnome/totem/stock-tool-brightness-contrast-22.png
-share/gnome/totem/stock_media_next.png
-share/gnome/totem/stock_media_pause.png
-share/gnome/totem/stock_media_play.png
-share/gnome/totem/stock_media_previous.png
+share/gnome/totem/totem-ui.xml
share/gnome/totem/totem.glade
share/gnome/totem/totem_logo.png
share/gnome/totem/uri.glade
@@ -166,11 +166,11 @@ share/locale/id/LC_MESSAGES/totem.mo
share/locale/is/LC_MESSAGES/totem.mo
share/locale/it/LC_MESSAGES/totem.mo
share/locale/ja/LC_MESSAGES/totem.mo
-share/locale/ka/LC_MESSAGES/totem.mo
share/locale/ko/LC_MESSAGES/totem.mo
share/locale/ku/LC_MESSAGES/totem.mo
share/locale/lt/LC_MESSAGES/totem.mo
share/locale/lv/LC_MESSAGES/totem.mo
+share/locale/ka/LC_MESSAGES/totem.mo
share/locale/mg/LC_MESSAGES/totem.mo
share/locale/mk/LC_MESSAGES/totem.mo
share/locale/ml/LC_MESSAGES/totem.mo
@@ -206,13 +206,18 @@ share/locale/xh/LC_MESSAGES/totem.mo
share/locale/zh_CN/LC_MESSAGES/totem.mo
share/locale/zh_HK/LC_MESSAGES/totem.mo
share/locale/zh_TW/LC_MESSAGES/totem.mo
-@dirrm share/gnome/totem/doc
@dirrm share/gnome/totem
@dirrm share/gnome/omf/totem
@dirrm share/gnome/help/totem/uk/figures
@dirrm share/gnome/help/totem/uk
+@dirrm share/gnome/help/totem/sv/figures
+@dirrm share/gnome/help/totem/sv
@dirrm share/gnome/help/totem/ru/figures
@dirrm share/gnome/help/totem/ru
+@dirrm share/gnome/help/totem/pt_BR/figures
+@dirrm share/gnome/help/totem/pt_BR
+@dirrm share/gnome/help/totem/pa/figures
+@dirrm share/gnome/help/totem/pa
@dirrm share/gnome/help/totem/fr/figures
@dirrm share/gnome/help/totem/fr
@dirrm share/gnome/help/totem/es/figures
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 570b655..2438480 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gaim
PORTVERSION= 1.5.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES?= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -73,7 +73,7 @@ LIB_DEPENDS+= nss3:${PORTSDIR}/security/nss
CONFIGURE_ARGS+= --with-nspr-includes=${LOCALBASE}/include/nspr \
--with-nspr-libs=${LOCALBASE}/lib \
--with-nss-includes=${LOCALBASE}/include/nss/nss \
- --with-nss-libs=${LOCALBASE}/lib
+ --with-nss-libs=${LOCALBASE}/lib/nss
.else
CONFIGURE_ARGS+= --disable-nss
.endif
diff --git a/net-im/libgaim/Makefile b/net-im/libgaim/Makefile
index 641784c..31a3424 100644
--- a/net-im/libgaim/Makefile
+++ b/net-im/libgaim/Makefile
@@ -3,12 +3,12 @@
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/net-im/libgaim/Makefile,v 1.4 2006/10/29 18:55:28 marcus Exp $
+# $MCom: ports/net-im/libgaim/Makefile,v 1.10 2007/03/11 06:36:56 marcus Exp $
#
PORTNAME= gaim
PORTVERSION= 2.0.0.b6
-PORTREVISION?= 6
+PORTREVISION?= 7
CATEGORIES?= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -121,7 +121,7 @@ CONFIGURE_ARGS+= --enable-nss=yes \
--with-nspr-includes=${LOCALBASE}/include/nspr \
--with-nspr-libs=${LOCALBASE}/lib \
--with-nss-includes=${LOCALBASE}/include/nss/nss \
- --with-nss-libs=${LOCALBASE}/lib
+ --with-nss-libs=${LOCALBASE}/lib/nss
.else
CONFIGURE_ARGS+= --enable-nss=no
.endif
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 641784c..31a3424 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -3,12 +3,12 @@
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/net-im/libgaim/Makefile,v 1.4 2006/10/29 18:55:28 marcus Exp $
+# $MCom: ports/net-im/libgaim/Makefile,v 1.10 2007/03/11 06:36:56 marcus Exp $
#
PORTNAME= gaim
PORTVERSION= 2.0.0.b6
-PORTREVISION?= 6
+PORTREVISION?= 7
CATEGORIES?= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -121,7 +121,7 @@ CONFIGURE_ARGS+= --enable-nss=yes \
--with-nspr-includes=${LOCALBASE}/include/nspr \
--with-nspr-libs=${LOCALBASE}/lib \
--with-nss-includes=${LOCALBASE}/include/nss/nss \
- --with-nss-libs=${LOCALBASE}/lib
+ --with-nss-libs=${LOCALBASE}/lib/nss
.else
CONFIGURE_ARGS+= --enable-nss=no
.endif
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 5dbad65..c4fcab4 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/gnome-nettool/Makefile,v 1.32 2006/09/05 07:41:18 marcus Exp $
+# $MCom: ports/net/gnome-nettool/Makefile,v 1.35 2007/03/13 12:41:51 ahze Exp $
#
PORTNAME= gnome-nettool
-PORTVERSION= 2.16.0
+PORTVERSION= 2.18.0
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index c310ad7..9adbfe2 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-nettool-2.16.0.tar.bz2) = 58d9171efdf368910934fb71194763eb
-SHA256 (gnome2/gnome-nettool-2.16.0.tar.bz2) = 6e3d1f1ff86622ef4e39c99a470e03ab316a76eb0f66f953eebd12c2621f4be7
-SIZE (gnome2/gnome-nettool-2.16.0.tar.bz2) = 501870
+MD5 (gnome2/gnome-nettool-2.18.0.tar.bz2) = 596616cf631b5bc9ec0c873208ccfce9
+SHA256 (gnome2/gnome-nettool-2.18.0.tar.bz2) = 348b6c0f0c7d58df1514f87956e6987fcccc418d1cfea98a1f3a1b84e4d60e57
+SIZE (gnome2/gnome-nettool-2.18.0.tar.bz2) = 511010
diff --git a/net/gnome-nettool/files/patch-src_info.c b/net/gnome-nettool/files/patch-src_info.c
index 7faf5e4..74eb698 100644
--- a/net/gnome-nettool/files/patch-src_info.c
+++ b/net/gnome-nettool/files/patch-src_info.c
@@ -1,5 +1,5 @@
---- src/info.c.orig Mon Apr 3 15:41:33 2006
-+++ src/info.c Sun Apr 23 21:57:39 2006
+--- src/info.c.orig Fri Dec 1 10:36:15 2006
++++ src/info.c Mon Dec 18 17:32:19 2006
@@ -20,6 +20,10 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
@@ -76,7 +76,7 @@
(*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 +260,87 @@ info_nic_update_stats (gpointer data)
+@@ -218,38 +261,87 @@ info_nic_update_stats (gpointer data)
gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10];
*/
gchar iface[30]; /*, flags[30]; */
@@ -170,7 +170,7 @@
if (g_ascii_strcasecmp (iface, text) == 0) {
/*
-@@ -276,7 +368,9 @@ info_nic_update_stats (gpointer data)
+@@ -277,7 +369,9 @@ info_nic_update_stats (gpointer data)
}
g_io_channel_unref (io);
@@ -181,10 +181,10 @@
return TRUE;
}
-@@ -405,8 +499,20 @@ info_get_nic_information (const gchar *n
- InfoIpAddr *ip;
- gint flags;
+@@ -425,8 +519,19 @@ info_get_nic_information (const gchar *n
+ #ifdef __linux__
mii_data_result data;
+ #endif
+#ifdef __FreeBSD__
+ gint hwmib[6];
+ size_t hwlen;
@@ -199,21 +199,10 @@
+ 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 +558,9 @@ info_get_nic_information (const gchar *n
- ifc.ifc_req = (struct ifreq *) buf;
- ioctl (sockfd, SIOCGIFCONF, &ifc);
-
-+#if defined(__linux__)
- data = mii_get_basic (nic);
-+#endif /* defined(__linux__) */
-
- for (ptr = buf; ptr < buf + ifc.ifc_len;) {
- ifr = (struct ifreq *) ptr;
-@@ -483,6 +591,45 @@ info_get_nic_information (const gchar *n
+@@ -510,6 +615,45 @@ info_get_nic_information (const gchar *n
(int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3],
(int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4],
(int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]);
@@ -259,7 +248,7 @@
#else
g_sprintf (dst, NOT_AVAILABLE);
#endif /* SIOCGIFHWADDR */
-@@ -595,6 +742,8 @@ info_get_nic_information (const gchar *n
+@@ -625,6 +769,8 @@ info_get_nic_information (const gchar *n
}
freeifaddrs (ifa0);
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index 468d8c4..c9ab108 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -10,7 +10,13 @@ share/gnome/gnome-nettool/pixmaps/network.png
share/gnome/gnome-nettool/pixmaps/wavelan-16.png
share/gnome/help/gnome-nettool/C/gnome-nettool.xml
share/gnome/help/gnome-nettool/C/legal.xml
+share/gnome/help/gnome-nettool/fr/gnome-nettool.xml
+share/gnome/help/gnome-nettool/pa/gnome-nettool.xml
+share/gnome/help/gnome-nettool/sv/gnome-nettool.xml
share/gnome/omf/gnome-nettool/gnome-nettool-C.omf
+share/gnome/omf/gnome-nettool/gnome-nettool-fr.omf
+share/gnome/omf/gnome-nettool/gnome-nettool-pa.omf
+share/gnome/omf/gnome-nettool/gnome-nettool-sv.omf
share/gnome/pixmaps/gnome-nettool.png
share/icons/hicolor/48x48/apps/gnome-nettool.png
share/locale/ar/LC_MESSAGES/gnome-nettool.mo
@@ -46,6 +52,7 @@ 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/ku/LC_MESSAGES/gnome-nettool.mo
share/locale/lt/LC_MESSAGES/gnome-nettool.mo
share/locale/lv/LC_MESSAGES/gnome-nettool.mo
share/locale/mg/LC_MESSAGES/gnome-nettool.mo
@@ -80,12 +87,6 @@ share/locale/xh/LC_MESSAGES/gnome-nettool.mo
share/locale/zh_CN/LC_MESSAGES/gnome-nettool.mo
share/locale/zh_HK/LC_MESSAGES/gnome-nettool.mo
share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo
-@dirrm share/gnome/omf/gnome-nettool
-@dirrm share/gnome/help/gnome-nettool/C
-@dirrm share/gnome/help/gnome-nettool
-@dirrm share/gnome/gnome-nettool/pixmaps
-@dirrm share/gnome/gnome-nettool/dialogs
-@dirrm share/gnome/gnome-nettool
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -114,6 +115,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo
@dirrmtry share/locale/ne
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrmtry share/locale/ko/LC_MESSAGES
@dirrmtry share/locale/ko
@dirrmtry share/locale/gl/LC_MESSAGES
@@ -130,3 +133,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrm share/gnome/omf/gnome-nettool
+@dirrm share/gnome/help/gnome-nettool/sv
+@dirrm share/gnome/help/gnome-nettool/pa
+@dirrm share/gnome/help/gnome-nettool/fr
+@dirrm share/gnome/help/gnome-nettool/C
+@dirrm share/gnome/help/gnome-nettool
+@dirrm share/gnome/gnome-nettool/pixmaps
+@dirrm share/gnome/gnome-nettool/dialogs
+@dirrm share/gnome/gnome-nettool
diff --git a/net/vino/Makefile b/net/vino/Makefile
index d378c42..c56835e 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,12 +3,11 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $MCom: ports/net/vino/Makefile,v 1.31 2006/10/05 18:17:10 mezz Exp $
+# $MCom: ports/net/vino/Makefile,v 1.37 2007/03/12 13:41:32 ahze Exp $
#
PORTNAME= vino
-PORTVERSION= 2.16.0
-PORTREVISION= 2
+PORTVERSION= 2.18.0
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 351477f..b393999 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,3 +1,3 @@
-MD5 (vino-2.16.0.tar.bz2) = 89937e6d6cd8f658d037da0a7cfd3f4e
-SHA256 (vino-2.16.0.tar.bz2) = bcf62f1121fe704a019363467f9182e29931ee6779f3b65e996171f4caa11369
-SIZE (vino-2.16.0.tar.bz2) = 593224
+MD5 (vino-2.18.0.tar.bz2) = 8378156f78289c2f0d3bd5c483101a40
+SHA256 (vino-2.18.0.tar.bz2) = 85b45f5e42f4c8748eff638aeac0b0b8716b382b4f61e03818528851cfde4b0a
+SIZE (vino-2.18.0.tar.bz2) = 632635
diff --git a/net/vino/files/patch-server_vino-prefs.c b/net/vino/files/patch-server_vino-prefs.c
deleted file mode 100644
index 4abd2b3..0000000
--- a/net/vino/files/patch-server_vino-prefs.c
+++ /dev/null
@@ -1,15 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/vino/server/vino-prefs.c,v
-retrieving revision 1.2
-retrieving revision 1.2.2.1
-diff -u -r1.2 -r1.2.2.1
---- server/vino-prefs.c 2006/10/05 12:55:37 1.2
-+++ server/vino-prefs.c 2006/10/10 10:42:38 1.2.2.1
-@@ -306,7 +306,6 @@
- VINO_PREFS_VNC_PASSWORD,
- NULL);
- dprintf (PREFS, "Encoded password: %s\n", vino_vnc_password ? vino_vnc_password : "(null)");
-- g_free (vino_vnc_password);
-
- vino_listeners [i] =
- gconf_client_notify_add (vino_client,
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index f13669b..41270b8 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -3,15 +3,15 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/print/libgnomeprint/Makefile,v 1.57 2006/09/10 00:51:12 mezz Exp $
+# $MCom: ports/print/libgnomeprint/Makefile,v 1.64 2007/03/13 12:57:41 ahze Exp $
#
PORTNAME= libgnomeprint
-PORTVERSION= 2.12.1
-PORTREVISION?= 3
+PORTVERSION= 2.18.0
+PORTREVISION?= 0
CATEGORIES= print 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
@@ -31,7 +31,7 @@ USE_GNOME= gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \
USE_GETTEXT= yes
USE_XLIB= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 1a85a86..66f9c02 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeprint-2.12.1.tar.bz2) = ea729d4968fe2169c84efb12ace5f6cc
-SHA256 (gnome2/libgnomeprint-2.12.1.tar.bz2) = f7b8c74faf6eaa145de94791e1d87233ccce5a068de0b8ff5c6fb4c66919295d
-SIZE (gnome2/libgnomeprint-2.12.1.tar.bz2) = 787980
+MD5 (gnome2/libgnomeprint-2.18.0.tar.bz2) = 5bfc42d67cae1148d1faf238185cbf4d
+SHA256 (gnome2/libgnomeprint-2.18.0.tar.bz2) = 2063836aa4d3de6251d3c38350dd41468cf89afde3ed0ae62b7875eb0661cb00
+SIZE (gnome2/libgnomeprint-2.18.0.tar.bz2) = 830629
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 9fef39e..6b4b5a7 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -39,9 +39,6 @@ lib/libgnomeprint-2-2.a
lib/libgnomeprint-2-2.la
lib/libgnomeprint-2-2.so
lib/libgnomeprint-2-2.so.0
-%%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.a
-%%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.la
-%%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.so
lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-clip.a
lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-clip.la
lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-clip.so
@@ -60,6 +57,9 @@ lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-position.so
lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-reorder.a
lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-reorder.la
lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-reorder.so
+lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-reverse.a
+lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-reverse.la
+lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-reverse.so
lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-rotate.a
lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-rotate.la
lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-rotate.so
@@ -69,6 +69,9 @@ lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-select.so
lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-zoom.a
lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-zoom.la
lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-zoom.so
+%%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.a
+%%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.la
+%%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.so
lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintlpd.a
lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintlpd.la
lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintlpd.so
@@ -95,12 +98,14 @@ share/locale/az/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/be/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/bg/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/bn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/bn_IN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/bs/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/ca/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/cs/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/cy/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/da/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/de/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/dz/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/el/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/en_CA/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/en_GB/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
@@ -121,7 +126,9 @@ share/locale/id/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/is/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/it/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/ja/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ka/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/ko/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ky/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/lt/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/lv/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/mk/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
@@ -133,7 +140,7 @@ share/locale/nb/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/ne/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/nl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/nn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
-share/locale/no/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/or/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/pa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/pl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/pt/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
@@ -156,6 +163,7 @@ share/locale/vi/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/wa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/xh/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/zh_HK/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
@dirrm share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled
@dirrm share/gnome/libgnomeprint/%%VERSION%%/printers
@@ -175,6 +183,8 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
@dirrm etc/gnome/libgnomeprint-2.0
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/zh_CN/LC_MESSAGES
@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@@ -197,14 +207,14 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
@dirrmtry share/locale/pt
@dirrmtry share/locale/pl/LC_MESSAGES
@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
@dirrmtry share/locale/nn/LC_MESSAGES
@dirrmtry share/locale/nn
@dirrmtry share/locale/ne/LC_MESSAGES
@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
@dirrmtry share/locale/ko/LC_MESSAGES
@dirrmtry share/locale/ko
@dirrmtry share/locale/gl/LC_MESSAGES
@@ -213,9 +223,13 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
@dirrmtry share/locale/fi
@dirrmtry share/locale/el/LC_MESSAGES
@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
diff --git a/security/gaim-encryption/Makefile b/security/gaim-encryption/Makefile
index 62f652b..60ec2c9 100644
--- a/security/gaim-encryption/Makefile
+++ b/security/gaim-encryption/Makefile
@@ -7,6 +7,7 @@
PORTNAME= encryption
PORTVERSION= 2.39
+PORTREVISION= 1
CATEGORIES= security net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
@@ -29,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
CONFIGURE_ARGS= --with-nspr-includes=${LOCALBASE}/include/nspr \
--with-nspr-libs=${LOCALBASE}/lib \
--with-nss-includes=${LOCALBASE}/include/nss/nss \
- --with-nss-libs=${LOCALBASE}/lib
+ --with-nss-libs=${LOCALBASE}/lib/nss
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index b6d29bb..8455df9 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/security/gnome-keyring-manager/Makefile,v 1.24 2006/10/02 05:07:37 bland Exp $
+# $MCom: ports/security/gnome-keyring-manager/Makefile,v 1.27 2007/03/13 12:35:40 ahze Exp $
#
PORTNAME= gnome-keyring-manager
-PORTVERSION= 2.16.0
+PORTVERSION= 2.18.0
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/security/gnome-keyring-manager/distinfo b/security/gnome-keyring-manager/distinfo
index 7232f84..128a495 100644
--- a/security/gnome-keyring-manager/distinfo
+++ b/security/gnome-keyring-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-manager-2.16.0.tar.bz2) = d63bfa5e9cfe334694438a74c157344c
-SHA256 (gnome2/gnome-keyring-manager-2.16.0.tar.bz2) = 23f0449af7cba89f4ae26c8e67f1d09bc45389f9dcd7349d2e6540620571051c
-SIZE (gnome2/gnome-keyring-manager-2.16.0.tar.bz2) = 454066
+MD5 (gnome2/gnome-keyring-manager-2.18.0.tar.bz2) = 05183cdea9d933cb1e9a8f4202c6ffc0
+SHA256 (gnome2/gnome-keyring-manager-2.18.0.tar.bz2) = a8d90a900a137434467a3d5c9f618249f1520ec3a86a998e62f648235f0ae611
+SIZE (gnome2/gnome-keyring-manager-2.18.0.tar.bz2) = 455431
diff --git a/security/gnome-keyring-manager/pkg-plist b/security/gnome-keyring-manager/pkg-plist
index d813124..ea05047 100644
--- a/security/gnome-keyring-manager/pkg-plist
+++ b/security/gnome-keyring-manager/pkg-plist
@@ -8,15 +8,21 @@ 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/da/gnome-keyring-manager.xml
+share/gnome/help/gnome-keyring-manager/en_GB/gnome-keyring-manager.xml
share/gnome/help/gnome-keyring-manager/es/gnome-keyring-manager.xml
share/gnome/help/gnome-keyring-manager/fr/gnome-keyring-manager.xml
share/gnome/help/gnome-keyring-manager/sv/gnome-keyring-manager.xml
share/gnome/help/gnome-keyring-manager/uk/gnome-keyring-manager.xml
share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf
+share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-da.omf
+share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-en_GB.omf
share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-es.omf
share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-fr.omf
share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-sv.omf
share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf
+share/locale/ar/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/be/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/bn/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/bn_IN/LC_MESSAGES/gnome-keyring-manager.mo
@@ -77,14 +83,6 @@ 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
-@dirrm share/gnome/omf/gnome-keyring-manager
-@dirrm share/gnome/help/gnome-keyring-manager/uk
-@dirrm share/gnome/help/gnome-keyring-manager/sv
-@dirrm share/gnome/help/gnome-keyring-manager/fr
-@dirrm share/gnome/help/gnome-keyring-manager/es
-@dirrm share/gnome/help/gnome-keyring-manager/C
-@dirrm share/gnome/help/gnome-keyring-manager
-@dirrm share/gnome/gnome-keyring-manager
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -131,3 +129,15 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
+@dirrm share/gnome/omf/gnome-keyring-manager
+@dirrm share/gnome/help/gnome-keyring-manager/uk
+@dirrm share/gnome/help/gnome-keyring-manager/sv
+@dirrm share/gnome/help/gnome-keyring-manager/fr
+@dirrm share/gnome/help/gnome-keyring-manager/es
+@dirrm share/gnome/help/gnome-keyring-manager/en_GB
+@dirrm share/gnome/help/gnome-keyring-manager/da
+@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/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 8165fcb..84fd88d 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,10 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/security/gnome-keyring/Makefile,v 1.31 2007/03/12 19:28:27 mezz Exp $
#
PORTNAME= gnome-keyring
-PORTVERSION= 0.6.0
+PORTVERSION= 0.8
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,6 +17,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A program that keeps passwords and other secrets
+LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
+
USE_BZIP2= yes
USE_GNOME= gnomehack gtk20
USE_GMAKE= yes
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index cc9681a..62ba04d 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-0.6.0.tar.bz2) = 1e3a3a12b19fc5ebe95363658c2256d8
-SHA256 (gnome2/gnome-keyring-0.6.0.tar.bz2) = 649f2a0d5298b896781d0ac563b8ea1be7f3fe07fd17ea43b0ec0562be47769f
-SIZE (gnome2/gnome-keyring-0.6.0.tar.bz2) = 476280
+MD5 (gnome2/gnome-keyring-0.8.tar.bz2) = 9dfbe4da53f229a5b096e1ba71029f01
+SHA256 (gnome2/gnome-keyring-0.8.tar.bz2) = bfc3ea64e7393cfe644b4fe9fcde2d921b71d276f2617b161c2c070940855a41
+SIZE (gnome2/gnome-keyring-0.8.tar.bz2) = 446811
diff --git a/security/gnome-keyring/files/patch-gnome-keyring.c b/security/gnome-keyring/files/patch-gnome-keyring.c
deleted file mode 100644
index 27a981e..0000000
--- a/security/gnome-keyring/files/patch-gnome-keyring.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- gnome-keyring.c.orig Mon Apr 24 06:21:29 2006
-+++ gnome-keyring.c Mon Jun 12 14:24:47 2006
-@@ -275,9 +275,9 @@ write_credentials_byte_sync (int socket)
- msg.msg_control = (caddr_t) &cmsg;
- msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
- memset (&cmsg, 0, sizeof (cmsg));
-- cmsg->cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
-- cmsg->cmsg_level = SOL_SOCKET;
-- cmsg->cmsg_type = SCM_CREDS;
-+ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
-+ cmsg.hdr.cmsg_level = SOL_SOCKET;
-+ cmsg.hdr.cmsg_type = SCM_CREDS;
- #endif
-
- again:
-@@ -324,10 +324,10 @@ write_credentials_byte (GnomeKeyringOper
-
- msg.msg_control = (caddr_t) &cmsg;
- msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
-- memset (cmsg, 0, sizeof (cmsg));
-- cmsg->cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
-- cmsg->cmsg_level = SOL_SOCKET;
-- cmsg->cmsg_type = SCM_CREDS;
-+ memset (&cmsg, 0, sizeof (cmsg));
-+ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
-+ cmsg.hdr.cmsg_level = SOL_SOCKET;
-+ cmsg.hdr.cmsg_type = SCM_CREDS;
- #endif
-
- again:
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 470fb7c..ce9beab 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -18,6 +18,7 @@ libexec/gnome-keyring-ask
%%DOCSDIR%%/up.png
share/locale/ar/LC_MESSAGES/gnome-keyring.mo
share/locale/az/LC_MESSAGES/gnome-keyring.mo
+share/locale/be/LC_MESSAGES/gnome-keyring.mo
share/locale/bg/LC_MESSAGES/gnome-keyring.mo
share/locale/bn/LC_MESSAGES/gnome-keyring.mo
share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo
@@ -77,6 +78,7 @@ share/locale/ta/LC_MESSAGES/gnome-keyring.mo
share/locale/th/LC_MESSAGES/gnome-keyring.mo
share/locale/tr/LC_MESSAGES/gnome-keyring.mo
share/locale/uk/LC_MESSAGES/gnome-keyring.mo
+share/locale/vi/LC_MESSAGES/gnome-keyring.mo
share/locale/xh/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
@@ -129,3 +131,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/security/nss/Makefile b/security/nss/Makefile
index fd577e8..4af25df 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -3,10 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/security/nss/Makefile,v 1.6 2006/12/17 21:46:42 marcus Exp $
PORTNAME= nss
-PORTVERSION= 3.11.4
+PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH}
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
@@ -17,9 +18,13 @@ COMMENT= Libraries to support development of security-enabled applications
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr
+_MAJOR= 3
+_MINOR= 11
+_PATCH= 4
+
WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla/security/nss
-USE_LDCONFIG= yes
+USE_LDCONFIG= ${PREFIX}/lib/nss
USE_GMAKE= yes
USE_PERL5_BUILD=yes
MAKE_ENV= BSD_LDOPTS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
@@ -39,12 +44,13 @@ EXTERNALS= CVS dbm security/nss/cmd/zlib nsprpub security/dbm
EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
${EXTERNALS:C,^,--exclude ${DISTNAME}/mozilla/,}
-post-patch:
- @${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \
- ${WRKSRC:H:H}/security/coreconf/FreeBSD.mk
-
BINS=${DIST}/${OPSYS}${OSREL}_OPT.OBJ
+INSTALL_BINS= certcgi certutil checkcert cmsutil crlutil derdump makepqg \
+ mangle modutil ocspclnt oidcalc p7content p7env p7sign \
+ p7verify pk12util rsaperf shlibsign signtool signver \
+ ssltap strsclnt symkeyutil vfychain vfyserv
+
test:
cd ${WRKSRC}/tests; \
${SETENV} PATH="${BINS}/bin:${PATH}" \
@@ -58,18 +64,35 @@ test:
echo "All tests succeeded. Good news."; \
fi
+post-patch:
+ @${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \
+ ${WRKSRC:H:H}/security/coreconf/FreeBSD.mk
+ @${SED} -e 's|@exec_prefix@|${PREFIX}|; \
+ s|@includedir@|${PREFIX}/include/nss|; \
+ s|@libdir@|${PREFIX}/lib/nss|; \
+ s|@prefix@|${PREFIX}|' \
+ ${FILESDIR}/nss-config.in >${WRKDIR}/nss-config
+ @${SED} -e 's|@PREFIX@|${PREFIX}|; s|@PORTVERSION@|${PORTVERSION}|' \
+ ${FILESDIR}/nss.pc.in >${WRKDIR}/nss.pc
+.for i in MAJOR MINOR PATCH
+ @${SED} -i.${i} -e 's|@${i}@|${_${i}}|' ${WRKDIR}/nss-config
+.endfor
+
do-install:
- ${MKDIR} ${PREFIX}/include/nss
+ ${MKDIR} ${PREFIX}/include/nss ${PREFIX}/lib/nss
${TAR} -C ${DIST}/public --dereference -cf - . | \
${TAR} -C ${PREFIX}/include/nss -xf -
${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/*.so.1 \
- ${PREFIX}/lib
+ ${PREFIX}/lib/nss
${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/libcrmf.a \
- ${PREFIX}/lib
- ${INSTALL_PROGRAM} `${SED} \
- -e 's|^bin/|${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/bin/|' \
- -e t -e d ${PLIST}` ${PREFIX}/bin/
+ ${PREFIX}/lib/nss
+.for bin in ${INSTALL_BINS}
+ ${INSTALL_PROGRAM} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/bin/${bin} \
+ ${PREFIX}/bin
+.endfor
cd ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib && \
- ${TAR} -cf - *.so | ${TAR} --unlink -C ${PREFIX}/lib -xf -
+ ${TAR} -cf - *.so | ${TAR} --unlink -C ${PREFIX}/lib/nss -xf -
+ ${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKDIR}/nss.pc ${PREFIX}/libdata/pkgconfig
.include <bsd.port.post.mk>
diff --git a/security/nss/files/nss-config.in b/security/nss/files/nss-config.in
new file mode 100644
index 0000000..d2605fe
--- /dev/null
+++ b/security/nss/files/nss-config.in
@@ -0,0 +1,137 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MAJOR@
+minor_version=@MINOR@
+patch_version=@PATCH@
+
+usage()
+{
+ cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+ [--prefix[=DIR]]
+ [--exec-prefix[=DIR]]
+ [--includedir[=DIR]]
+ [--libdir[=DIR]]
+ [--version]
+ [--libs]
+ [--cflags]
+Dynamic Libraries:
+ nss
+ ssl
+ smime
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case $1 in
+ --prefix=*)
+ prefix=$optarg
+ ;;
+ --prefix)
+ echo_prefix=yes
+ ;;
+ --exec-prefix=*)
+ exec_prefix=$optarg
+ ;;
+ --exec-prefix)
+ echo_exec_prefix=yes
+ ;;
+ --includedir=*)
+ includedir=$optarg
+ ;;
+ --includedir)
+ echo_includedir=yes
+ ;;
+ --libdir=*)
+ libdir=$optarg
+ ;;
+ --libdir)
+ echo_libdir=yes
+ ;;
+ --version)
+ echo ${major_version}.${minor_version}.${patch_version}
+ ;;
+ --cflags)
+ echo_cflags=yes
+ ;;
+ --libs)
+ echo_libs=yes
+ ;;
+ ssl)
+ lib_ssl=yes
+ ;;
+ smime)
+ lib_smime=yes
+ ;;
+ nss)
+ lib_nss=yes
+ ;;
+ *)
+ usage 1 1>&2
+ ;;
+ esac
+ shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+ exec_prefix=@exec_prefix@
+fi
+if test -z "$includedir"; then
+ includedir=@includedir@
+fi
+if test -z "$libdir"; then
+ libdir=@libdir@
+fi
+
+if test "$echo_prefix" = "yes"; then
+ echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+ echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+ echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+ echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+ echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+ libdirs="-Wl,-R$libdir -L$libdir"
+ if test -n "$lib_ssl"; then
+ libdirs="$libdirs -lssl${major_version}"
+ fi
+ if test -n "$lib_smime"; then
+ libdirs="$libdirs -lsmime${major_version}"
+ fi
+ if test -n "$lib_nss"; then
+ libdirs="$libdirs -lnss${major_version}"
+ fi
+ echo $libdirs
+fi
+
diff --git a/security/nss/files/nss.pc.in b/security/nss/files/nss.pc.in
new file mode 100644
index 0000000..7b17143
--- /dev/null
+++ b/security/nss/files/nss.pc.in
@@ -0,0 +1,11 @@
+prefix=@PREFIX@
+exec_prefix=@PREFIX@
+libdir=@PREFIX@/lib/nss
+includedir=@PREFIX@/include
+
+Name: NSS
+Description: Mozilla Network Security Services
+Version: @PORTVERSION@
+Requires: nspr
+Libs: -L${libdir} -lnss3 -lsmime3 -lssl3
+Cflags: -I${includedir}/nss -I${includedir}/nss/nss
diff --git a/security/nss/files/patch-..::coreconf::command.mk b/security/nss/files/patch-..::coreconf::command.mk
index 1a5bae0..1e3de66 100644
--- a/security/nss/files/patch-..::coreconf::command.mk
+++ b/security/nss/files/patch-..::coreconf::command.mk
@@ -1,5 +1,3 @@
-$FreeBSD$
-
--- ../coreconf/command.mk Mon Oct 10 19:46:12 2005
+++ ../coreconf/command.mk Wed Jan 18 17:23:28 2006
@@ -46,5 +46,5 @@
diff --git a/security/nss/files/patch-..::coreconf::rules.mk b/security/nss/files/patch-..::coreconf::rules.mk
index 42663ca..59178ff 100644
--- a/security/nss/files/patch-..::coreconf::rules.mk
+++ b/security/nss/files/patch-..::coreconf::rules.mk
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- ../coreconf/rules.mk.orig Thu Apr 3 16:48:00 2003
+++ ../coreconf/rules.mk Fri Apr 11 01:01:50 2003
@@ -110,6 +110,7 @@
diff --git a/security/nss/files/patch-cmd::platlibs.mk b/security/nss/files/patch-cmd::platlibs.mk
index 635107c..4ac01e3 100644
--- a/security/nss/files/patch-cmd::platlibs.mk
+++ b/security/nss/files/patch-cmd::platlibs.mk
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- cmd/platlibs.mk Wed Apr 6 17:35:41 2005
+++ cmd/platlibs.mk Wed Jul 27 22:22:59 2005
@@ -72,5 +72,4 @@
diff --git a/security/nss/pkg-plist b/security/nss/pkg-plist
index dc892d0..cc12145 100644
--- a/security/nss/pkg-plist
+++ b/security/nss/pkg-plist
@@ -7,6 +7,7 @@ bin/derdump
bin/makepqg
bin/mangle
bin/modutil
+bin/nss-config
bin/ocspclnt
bin/oidcalc
bin/p7content
@@ -113,18 +114,20 @@ include/nss/nss/sslerr.h
include/nss/nss/sslproto.h
include/nss/nss/sslt.h
include/nss/nss/watcomfx.h
-lib/libcrmf.a
-lib/libfreebl3.so
-lib/libfreebl3.so.1
-lib/libnss3.so
-lib/libnss3.so.1
-lib/libnssckbi.so
-lib/libnssckbi.so.1
-lib/libsmime3.so
-lib/libsmime3.so.1
-lib/libsoftokn3.so
-lib/libsoftokn3.so.1
-lib/libssl3.so
-lib/libssl3.so.1
+lib/nss/libcrmf.a
+lib/nss/libfreebl3.so
+lib/nss/libfreebl3.so.1
+lib/nss/libnss3.so
+lib/nss/libnss3.so.1
+lib/nss/libnssckbi.so
+lib/nss/libnssckbi.so.1
+lib/nss/libsmime3.so
+lib/nss/libsmime3.so.1
+lib/nss/libsoftokn3.so
+lib/nss/libsoftokn3.so.1
+lib/nss/libssl3.so
+lib/nss/libssl3.so.1
+libdata/pkgconfig/nss.pc
+@dirrm lib/nss
@dirrm include/nss/nss
@dirrm include/nss
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 62f652b..60ec2c9 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -7,6 +7,7 @@
PORTNAME= encryption
PORTVERSION= 2.39
+PORTREVISION= 1
CATEGORIES= security net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
@@ -29,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
CONFIGURE_ARGS= --with-nspr-includes=${LOCALBASE}/include/nspr \
--with-nspr-libs=${LOCALBASE}/lib \
--with-nss-includes=${LOCALBASE}/include/nss/nss \
- --with-nss-libs=${LOCALBASE}/lib
+ --with-nss-libs=${LOCALBASE}/lib/nss
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index bf1c955..31459f3 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,47 +3,56 @@
# Whom: Dave McKay <dave@mu.org>
#
# $FreeBSD$
-# $MCom: ports/security/seahorse/Makefile,v 1.18 2006/10/01 01:56:57 ahze Exp $
+# $MCom: ports/security/seahorse/Makefile,v 1.31 2007/03/15 16:34:55 marcus Exp $
#
PORTNAME= seahorse
-PORTVERSION= 0.8.2
-PORTREVISION= 3
-CATEGORIES= security
+PORTVERSION= 1.0
+PORTREVISION= 1
+CATEGORIES= security gnome
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= A front end for GnuPG
BUILD_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1
-RUN_DEPENDS= ${BUILD_DEPENDS}
-LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme
+RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1
+LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
USE_LDCONFIG= yes
USE_BZIP2= yes
USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GECKO= firefox xulrunner firefox-devel<->firefox
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
-CONFIGURE_ARGS= --disable-gpg-check
+INSTALLS_ICONS= yes
+CONFIGURE_ARGS= --with-gecko=${GECKO}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= seahorse.schemas
+MAN1= seahorse-agent.1 seahorse-daemon.1 seahorse-tool.1
OPTIONS= NAUTILUS "Enable the Nautilus component" on \
LDAP "Enable LDAP support" on \
- HKP "Enable HKP keyserver interface" on
-# GEDIT "Enable GEdit plug-in support" on
+ HKP "Enable HKP keyserver interface" on \
+ GEDIT "Enable GEdit plug-in support" on \
+ NOTIFY "Enable libnotify support" on \
+ APPLET "Enable clipboard encryption applet" on \
+ KEYRING "Enable GNOME Keyring support" on \
+ MDNS "Enable mDNS key sharing" on
+# EPIPHANY "Enable Epiphany plug-in support" on
+## BROKEN
+WITHOUT_EPIPHANY= yes
.include <bsd.port.pre.mk>
-# Gedit not working right now..
-WITHOUT_GEDIT= yes
.if !defined(WITHOUT_GEDIT)
BUILD_DEPENDS+= gedit:${PORTSDIR}/editors/gedit
RUN_DEPENDS+= gedit:${PORTSDIR}/editors/gedit
@@ -74,7 +83,43 @@ LIB_DEPENDS+= soup-2.2.8:${PORTSDIR}/devel/libsoup
CONFIGURE_ARGS+=--disable-hkp
.endif
+.if !defined(WITHOUT_NOTIFY)
+LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify
+.else
+CONFIGURE_ARGS+=--disable-libnotify
+.endif
+
+.if !defined(WITHOUT_EPIPHANY)
+BUILD_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany
+RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany
+PLIST_SUB+= EPHY="" EPHY_VERSION="2.18"
+.else
+CONFIGURE_ARGS+=--disable-epiphany
+PLIST_SUB+= EPHY="@comment "
+.endif
+
+.if !defined(WITHOUT_APPLET)
+USE_GNOME+= gnomepanel
+PLIST_SUB+= APPLET=""
+.else
+CONFIGURE_ARGS+=--disable-applet
+PLIST_SUB+= APPLET="@comment "
+.endif
+
+.if !defined(WITHOUT_KEYRING)
+LIB_DEPENDS+= gnome-keyring:${PORTSDIR}/security/gnome-keyring
+.else
+CONFIGURE_ARGS+=--disable-gnome-keyring
+.endif
+
+.if !defined(WITHOUT_MDNS)
+LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi
+.else
+CONFIGURE_ARGS+=--disable-sharing
+.endif
+
post-install:
-@update-desktop-database
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
.include <bsd.port.post.mk>
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 13f59f8..47541d9 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-0.8.2.tar.bz2) = 24d9a8c3564700d105847934020920bd
-SHA256 (gnome2/seahorse-0.8.2.tar.bz2) = 350f1a1cc5010bb81f08c6c124a24f2560a9dffea16c8a5a62e9cdeebb03c68e
-SIZE (gnome2/seahorse-0.8.2.tar.bz2) = 990284
+MD5 (gnome2/seahorse-1.0.tar.bz2) = 7afcb9b40aaa0c232ce8a9e0909fe757
+SHA256 (gnome2/seahorse-1.0.tar.bz2) = 76bcfeed3843b2357f5ecc1694a471fc45a810aa17fd0baed60f1d32142d0746
+SIZE (gnome2/seahorse-1.0.tar.bz2) = 1871080
diff --git a/security/seahorse/files/patch-agent_seahorse-agent.c b/security/seahorse/files/patch-agent_seahorse-agent.c
deleted file mode 100644
index 8ee1d83..0000000
--- a/security/seahorse/files/patch-agent_seahorse-agent.c
+++ /dev/null
@@ -1,40 +0,0 @@
---- agent/seahorse-agent.c.orig Sun Aug 13 14:50:35 2006
-+++ agent/seahorse-agent.c Wed Aug 16 02:08:05 2006
-@@ -280,7 +280,6 @@ main (int argc, char **argv)
- GnomeProgram *program = NULL;
- GnomeClient *client = NULL;
-
-- secmem_init (65536);
-
- /* We need to drop privileges completely for security */
- #if defined(HAVE_SETRESUID) && defined(HAVE_SETRESGID)
-@@ -288,10 +287,12 @@ main (int argc, char **argv)
- /* Not in header files for all OSs, even where present */
- int setresuid(uid_t ruid, uid_t euid, uid_t suid);
- int setresgid(gid_t rgid, gid_t egid, gid_t sgid);
-+ secmem_init (65536);
-
- if (setresuid (getuid (), getuid (), getuid ()) == -1 ||
- setresgid (getgid (), getgid (), getgid ()) == -1)
- #else
-+ secmem_init (65536);
- if (setuid (getuid ()) == -1 || setgid (getgid ()) == -1)
- #endif
- err (1, _("couldn't drop privileges properly"));
-@@ -313,7 +314,6 @@ main (int argc, char **argv)
- * All functions after this point have to print messages
- * nicely and not just called exit()
- */
-- daemonize (sockname);
-
- /* Handle some signals */
- signal (SIGINT, on_quit);
-@@ -329,6 +329,8 @@ main (int argc, char **argv)
- /* Initialize our sub systems */
- seahorse_agent_actions_init ();
- seahorse_agent_cache_init ();
-+
-+ daemonize (sockname);
-
- if (seahorse_agent_io_init () == -1)
- return 1; /* message already printed */
diff --git a/security/seahorse/files/patch-configure b/security/seahorse/files/patch-configure
new file mode 100644
index 0000000..b77fe2d
--- /dev/null
+++ b/security/seahorse/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig Sun Dec 3 23:18:17 2006
++++ configure Sun Dec 3 23:18:57 2006
+@@ -30954,7 +30954,7 @@ fi
+
+
+
+-if test "$enable_ssh" == "yes"; then
++if test "$enable_ssh" = "yes"; then
+ WITH_SSH_TRUE=
+ WITH_SSH_FALSE='#'
+ else
+@@ -31014,7 +31014,7 @@ fi
+
+
+
+-if test "$enable_tests" == "yes"; then
++if test "$enable_tests" = "yes"; then
+ WITH_TESTS_TRUE=
+ WITH_TESTS_FALSE='#'
+ else
diff --git a/security/seahorse/files/patch-libseahorse_seahorse-key-store.c b/security/seahorse/files/patch-libseahorse_seahorse-key-store.c
deleted file mode 100644
index fc8b7af..0000000
--- a/security/seahorse/files/patch-libseahorse_seahorse-key-store.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- libseahorse/seahorse-key-store.c.orig Wed Dec 22 15:18:27 2004
-+++ libseahorse/seahorse-key-store.c Wed Dec 22 15:19:48 2004
-@@ -184,6 +184,8 @@
- {
- GObject* obj = G_OBJECT_CLASS (parent_class)->constructor (type, n_props, props);
- SeahorseKeyStore* skstore = SEAHORSE_KEY_STORE (obj);
-+ guint cols;
-+ GType* types;
-
- /* init private vars */
- skstore->priv = g_new0 (SeahorseKeyStorePriv, 1);
-@@ -191,8 +193,8 @@
- NULL, (GDestroyNotify)seahorse_key_row_free);
-
- /* Setup the store */
-- guint cols = SEAHORSE_KEY_STORE_GET_CLASS (skstore)->n_columns;
-- GType* types = (GType*)SEAHORSE_KEY_STORE_GET_CLASS (skstore)->col_types;
-+ cols = SEAHORSE_KEY_STORE_GET_CLASS (skstore)->n_columns;
-+ types = (GType*)SEAHORSE_KEY_STORE_GET_CLASS (skstore)->col_types;
- gtk_tree_store_set_column_types (GTK_TREE_STORE (obj), cols, types);
-
- /* Setup the sort and filter */
diff --git a/security/seahorse/files/patch-libseahorse_seahorse-server-source.c b/security/seahorse/files/patch-libseahorse_seahorse-server-source.c
deleted file mode 100644
index d7422de..0000000
--- a/security/seahorse/files/patch-libseahorse_seahorse-server-source.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libseahorse/seahorse-server-source.c.orig Fri Mar 11 22:17:43 2005
-+++ libseahorse/seahorse-server-source.c Fri Mar 11 22:17:55 2005
-@@ -518,11 +518,11 @@
- seahorse_server_source_get_state (SeahorseKeySource *src)
- {
- SeahorseServerSource *ssrc;
-+ guint state = SEAHORSE_KEY_SOURCE_REMOTE;
-
- g_return_val_if_fail (SEAHORSE_IS_SERVER_SOURCE (src), 0);
- ssrc = SEAHORSE_SERVER_SOURCE (src);
-
-- guint state = SEAHORSE_KEY_SOURCE_REMOTE;
- if (!seahorse_operation_is_done (ssrc->priv->operation))
- state |= SEAHORSE_KEY_SOURCE_LOADING;
- return state;
diff --git a/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c b/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c
new file mode 100644
index 0000000..e7a7e4f
--- /dev/null
+++ b/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c
@@ -0,0 +1,10 @@
+--- libseahorse/seahorse-ssh-operation.c.orig Sun Dec 3 23:21:01 2006
++++ libseahorse/seahorse-ssh-operation.c Sun Dec 3 23:21:10 2006
+@@ -24,6 +24,7 @@
+ #include <sys/socket.h>
+ #include <gnome.h>
+ #include <fcntl.h>
++#include <signal.h>
+
+ #include "seahorse-ssh-operation.h"
+ #include "seahorse-util.h"
diff --git a/security/seahorse/files/patch-src_seahorse-generate-druid.c b/security/seahorse/files/patch-src_seahorse-generate-druid.c
deleted file mode 100644
index 9e356ed..0000000
--- a/security/seahorse/files/patch-src_seahorse-generate-druid.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/seahorse-generate-druid.c.orig Wed Dec 22 15:22:02 2004
-+++ src/seahorse-generate-druid.c Wed Dec 22 15:22:22 2004
-@@ -173,8 +173,9 @@
- gboolean
- on_druidpagestandard4_next (GnomeDruidPage *gnomedruidpage, GtkWidget *widget, SeahorseWidget *swidget)
- {
-+ GtkWidget *druidpage;
- g_print("go to finish\n");
-- GtkWidget *druidpage = glade_xml_get_widget (swidget->xml, "druidpagefinish1");
-+ druidpage = glade_xml_get_widget (swidget->xml, "druidpagefinish1");
-
- gnome_druid_page_prepare (GNOME_DRUID_PAGE(druidpage));
- gtk_widget_show (druidpage);
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index 363cf20..46a2d24 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -1,24 +1,45 @@
bin/seahorse
bin/seahorse-agent
-bin/seahorse-pgp-preferences
+bin/seahorse-daemon
+bin/seahorse-preferences
+bin/seahorse-tool
+include/libcryptui/cryptui-key-chooser.h
+include/libcryptui/cryptui-key-combo.h
+include/libcryptui/cryptui-key-list.h
+include/libcryptui/cryptui-key-store.h
+include/libcryptui/cryptui-keyset.h
+include/libcryptui/cryptui.h
+%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.a
+%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.la
+%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.so
+%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/seahorse.ephy-extension
%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.a
%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.la
%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.so
%%GEDIT%%lib/gedit-2/plugins/seahorse-pgp.gedit-plugin
-lib/libseahorse-internal.a
-lib/libseahorse-internal.la
-lib/libseahorse-internal.so
-lib/libseahorse-internal.so.0
+lib/libcryptui.a
+lib/libcryptui.la
+lib/libcryptui.so
+lib/libcryptui.so.0
%%NAUTILUS%%lib/nautilus/extensions-1.0/libnautilus-seahorse.a
%%NAUTILUS%%lib/nautilus/extensions-1.0/libnautilus-seahorse.la
%%NAUTILUS%%lib/nautilus/extensions-1.0/libnautilus-seahorse.so
+%%APPLET%%lib/seahorse/seahorse-applet
+lib/seahorse/seahorse-ssh-askpass
+lib/seahorse/xloadimage
+%%APPLET%%libdata/bonobo/servers/GNOME_SeahorseApplet.server
+libdata/pkgconfig/cryptui-0.0.pc
+share/dbus-1/services/org.gnome.seahorse.service
share/gnome/applications/seahorse-pgp-preferences.desktop
share/gnome/applications/seahorse.desktop
share/gnome/applications/seahorse-pgp-encrypted.desktop
share/gnome/applications/seahorse-pgp-keys.desktop
share/gnome/applications/seahorse-pgp-signature.desktop
share/gnome/control-center-2.0/capplets/seahorse-pgp-preferences.desktop
+%%APPLET%%share/gnome/gnome-2.0/ui/GNOME_SeahorseApplet.xml
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+%%APPLET%%share/gnome/help/seahorse-applet/C/legal.xml
+%%APPLET%%share/gnome/help/seahorse-applet/C/seahorse-applet.xml
share/gnome/help/seahorse/C/figures/export.png
share/gnome/help/seahorse/C/figures/file-manager.png
share/gnome/help/seahorse/C/figures/generate.png
@@ -28,59 +49,197 @@ share/gnome/help/seahorse/C/figures/key-properties.png
share/gnome/help/seahorse/C/figures/passphrase.png
share/gnome/help/seahorse/C/figures/preferences.png
share/gnome/help/seahorse/C/figures/recipients.png
+share/gnome/help/seahorse/C/figures/seahorse-window.png
share/gnome/help/seahorse/C/figures/signature.png
share/gnome/help/seahorse/C/figures/text-editor.png
share/gnome/help/seahorse/C/legal.xml
share/gnome/help/seahorse/C/seahorse.xml
-share/gnome/mime-info/seahorse.keys
-share/gnome/mime-info/seahorse.mime
+share/gnome/help/seahorse/en_GB/figures/export.png
+share/gnome/help/seahorse/en_GB/figures/file-manager.png
+share/gnome/help/seahorse/en_GB/figures/generate.png
+share/gnome/help/seahorse/en_GB/figures/import.png
+share/gnome/help/seahorse/en_GB/figures/key-manager.png
+share/gnome/help/seahorse/en_GB/figures/key-properties.png
+share/gnome/help/seahorse/en_GB/figures/passphrase.png
+share/gnome/help/seahorse/en_GB/figures/preferences.png
+share/gnome/help/seahorse/en_GB/figures/recipients.png
+share/gnome/help/seahorse/en_GB/figures/seahorse-window.png
+share/gnome/help/seahorse/en_GB/figures/signature.png
+share/gnome/help/seahorse/en_GB/figures/text-editor.png
+share/gnome/help/seahorse/en_GB/seahorse.xml
+share/gnome/help/seahorse/es/figures/export.png
+share/gnome/help/seahorse/es/figures/file-manager.png
+share/gnome/help/seahorse/es/figures/generate.png
+share/gnome/help/seahorse/es/figures/import.png
+share/gnome/help/seahorse/es/figures/key-manager.png
+share/gnome/help/seahorse/es/figures/key-properties.png
+share/gnome/help/seahorse/es/figures/passphrase.png
+share/gnome/help/seahorse/es/figures/preferences.png
+share/gnome/help/seahorse/es/figures/recipients.png
+share/gnome/help/seahorse/es/figures/seahorse-window.png
+share/gnome/help/seahorse/es/figures/signature.png
+share/gnome/help/seahorse/es/figures/text-editor.png
+share/gnome/help/seahorse/es/seahorse.xml
+share/gnome/help/seahorse/fr/figures/export.png
+share/gnome/help/seahorse/fr/figures/file-manager.png
+share/gnome/help/seahorse/fr/figures/generate.png
+share/gnome/help/seahorse/fr/figures/import.png
+share/gnome/help/seahorse/fr/figures/key-manager.png
+share/gnome/help/seahorse/fr/figures/key-properties.png
+share/gnome/help/seahorse/fr/figures/passphrase.png
+share/gnome/help/seahorse/fr/figures/preferences.png
+share/gnome/help/seahorse/fr/figures/recipients.png
+share/gnome/help/seahorse/fr/figures/seahorse-window.png
+share/gnome/help/seahorse/fr/figures/signature.png
+share/gnome/help/seahorse/fr/figures/text-editor.png
+share/gnome/help/seahorse/fr/seahorse.xml
+share/gnome/help/seahorse/it/figures/export.png
+share/gnome/help/seahorse/it/figures/file-manager.png
+share/gnome/help/seahorse/it/figures/generate.png
+share/gnome/help/seahorse/it/figures/import.png
+share/gnome/help/seahorse/it/figures/key-manager.png
+share/gnome/help/seahorse/it/figures/key-properties.png
+share/gnome/help/seahorse/it/figures/passphrase.png
+share/gnome/help/seahorse/it/figures/preferences.png
+share/gnome/help/seahorse/it/figures/recipients.png
+share/gnome/help/seahorse/it/figures/seahorse-window.png
+share/gnome/help/seahorse/it/figures/signature.png
+share/gnome/help/seahorse/it/figures/text-editor.png
+share/gnome/help/seahorse/it/seahorse.xml
+share/gnome/help/seahorse/sv/figures/export.png
+share/gnome/help/seahorse/sv/figures/file-manager.png
+share/gnome/help/seahorse/sv/figures/generate.png
+share/gnome/help/seahorse/sv/figures/import.png
+share/gnome/help/seahorse/sv/figures/key-manager.png
+share/gnome/help/seahorse/sv/figures/key-properties.png
+share/gnome/help/seahorse/sv/figures/passphrase.png
+share/gnome/help/seahorse/sv/figures/preferences.png
+share/gnome/help/seahorse/sv/figures/recipients.png
+share/gnome/help/seahorse/sv/figures/seahorse-window.png
+share/gnome/help/seahorse/sv/figures/signature.png
+share/gnome/help/seahorse/sv/figures/text-editor.png
+share/gnome/help/seahorse/sv/seahorse.xml
+%%APPLET%%share/gnome/omf/seahorse-applet/seahorse-applet-C.omf
share/gnome/omf/seahorse/seahorse-C.omf
-share/gnome/pixmaps/seahorse-key.png
-share/gnome/pixmaps/seahorse-secret.png
+share/gnome/omf/seahorse/seahorse-en_GB.omf
+share/gnome/omf/seahorse/seahorse-es.omf
+share/gnome/omf/seahorse/seahorse-fr.omf
+share/gnome/omf/seahorse/seahorse-it.omf
+share/gnome/omf/seahorse/seahorse-sv.omf
+share/gnome/pixmaps/seahorse-applet.svg
+share/gnome/pixmaps/seahorse-preferences.png
share/gnome/pixmaps/seahorse.png
+share/gnome/pixmaps/seahorse/22x22/seahorse-applet-encrypted.png
+share/gnome/pixmaps/seahorse/22x22/seahorse-applet-key.png
+share/gnome/pixmaps/seahorse/22x22/seahorse-applet-signed.png
+share/gnome/pixmaps/seahorse/22x22/seahorse-applet-text.png
+share/gnome/pixmaps/seahorse/22x22/seahorse-applet-unknown.png
+share/gnome/pixmaps/seahorse/22x22/seahorse-key-personal.png
+share/gnome/pixmaps/seahorse/22x22/seahorse-key-ssh.png
+share/gnome/pixmaps/seahorse/22x22/seahorse-key.png
+share/gnome/pixmaps/seahorse/22x22/seahorse-preferences.png
+share/gnome/pixmaps/seahorse/22x22/seahorse-share-keys.png
+share/gnome/pixmaps/seahorse/22x22/seahorse-sign-bad.png
+share/gnome/pixmaps/seahorse/22x22/seahorse-sign-ok.png
+share/gnome/pixmaps/seahorse/22x22/seahorse.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-applet-encrypted.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-applet-key.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-applet-signed.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-applet-text.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-applet-unknown.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-applet.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-key-personal.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-key-ssh.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-key.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-person.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-preferences.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-share-keys.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-sign-bad.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-sign-ok.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-sign-unknown.png
+share/gnome/pixmaps/seahorse/48x48/seahorse-sign.png
+share/gnome/pixmaps/seahorse/48x48/seahorse.png
+share/gnome/pixmaps/seahorse/scalable/seahorse-applet-encrypted.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-applet-key.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-applet-signed.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-applet-text.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-applet-unknown.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-applet.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-key-personal.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-key-ssh.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-key.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-person.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-preferences.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-share-keys.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-sign-bad.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-sign-ok.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-sign-unknown.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse-sign.svg
+share/gnome/pixmaps/seahorse/scalable/seahorse.svg
share/gnome/seahorse/glade/seahorse-add-keyserver.glade
share/gnome/seahorse/glade/seahorse-add-subkey.glade
share/gnome/seahorse/glade/seahorse-add-uid.glade
share/gnome/seahorse/glade/seahorse-agent-cache.glade
+%%APPLET%%share/gnome/seahorse/glade/seahorse-applet-preferences.glade
share/gnome/seahorse/glade/seahorse-change-passphrase.glade
share/gnome/seahorse/glade/seahorse-expires.glade
-share/gnome/seahorse/glade/seahorse-generate-adv.glade
-share/gnome/seahorse/glade/seahorse-generate-druid.glade
share/gnome/seahorse/glade/seahorse-generate-select.glade
+share/gnome/seahorse/glade/seahorse-gkeyring-item-properties.glade
share/gnome/seahorse/glade/seahorse-key-manager.glade
share/gnome/seahorse/glade/seahorse-key-manager.ui
-share/gnome/seahorse/glade/seahorse-key-properties.glade
share/gnome/seahorse/glade/seahorse-keyserver-results.glade
share/gnome/seahorse/glade/seahorse-keyserver-results.ui
share/gnome/seahorse/glade/seahorse-keyserver-search.glade
share/gnome/seahorse/glade/seahorse-keyserver-sync.glade
share/gnome/seahorse/glade/seahorse-multi-encrypt.glade
-share/gnome/seahorse/glade/seahorse-passphrase.glade
+share/gnome/seahorse/glade/seahorse-notify.glade
+share/gnome/seahorse/glade/seahorse-pgp-generate.glade
+share/gnome/seahorse/glade/seahorse-pgp-private-key-properties.glade
+share/gnome/seahorse/glade/seahorse-pgp-public-key-properties.glade
share/gnome/seahorse/glade/seahorse-prefs.glade
-share/gnome/seahorse/glade/seahorse-preferences.glade
share/gnome/seahorse/glade/seahorse-progress.glade
-share/gnome/seahorse/glade/seahorse-recipients.glade
share/gnome/seahorse/glade/seahorse-revoke.glade
share/gnome/seahorse/glade/seahorse-sign.glade
-share/gnome/seahorse/glade/seahorse-signatures.glade
share/gnome/seahorse/glade/seahorse-signer.glade
+share/gnome/seahorse/glade/seahorse-ssh-generate.glade
+share/gnome/seahorse/glade/seahorse-ssh-key-properties.glade
+share/gnome/seahorse/glade/seahorse-ssh-upload.glade
+share/icons/hicolor/22x22/apps/seahorse-preferences.svg
+share/icons/hicolor/22x22/apps/seahorse.svg
+share/icons/hicolor/48x48/apps/seahorse-applet.png
+share/icons/hicolor/48x48/apps/seahorse-preferences.png
+share/icons/hicolor/48x48/apps/seahorse.png
+share/icons/hicolor/scalable/apps/seahorse-applet.svg
+share/icons/hicolor/scalable/apps/seahorse-preferences.svg
+share/icons/hicolor/scalable/apps/seahorse.svg
share/mime/packages/seahorse.xml
+share/locale/ar/LC_MESSAGES/seahorse.mo
share/locale/az/LC_MESSAGES/seahorse.mo
share/locale/bg/LC_MESSAGES/seahorse.mo
+share/locale/bn_IN/LC_MESSAGES/seahorse.mo
share/locale/ca/LC_MESSAGES/seahorse.mo
share/locale/cs/LC_MESSAGES/seahorse.mo
share/locale/da/LC_MESSAGES/seahorse.mo
share/locale/de/LC_MESSAGES/seahorse.mo
+share/locale/dz/LC_MESSAGES/seahorse.mo
+share/locale/el/LC_MESSAGES/seahorse.mo
share/locale/en_CA/LC_MESSAGES/seahorse.mo
share/locale/en_GB/LC_MESSAGES/seahorse.mo
share/locale/es/LC_MESSAGES/seahorse.mo
+share/locale/et/LC_MESSAGES/seahorse.mo
share/locale/eu/LC_MESSAGES/seahorse.mo
share/locale/fi/LC_MESSAGES/seahorse.mo
+share/locale/gl/LC_MESSAGES/seahorse.mo
+share/locale/gu/LC_MESSAGES/seahorse.mo
share/locale/fr/LC_MESSAGES/seahorse.mo
+share/locale/he/LC_MESSAGES/seahorse.mo
share/locale/hr/LC_MESSAGES/seahorse.mo
share/locale/hu/LC_MESSAGES/seahorse.mo
share/locale/it/LC_MESSAGES/seahorse.mo
share/locale/ja/LC_MESSAGES/seahorse.mo
+share/locale/ko/LC_MESSAGES/seahorse.mo
+share/locale/lt/LC_MESSAGES/seahorse.mo
+share/locale/mk/LC_MESSAGES/seahorse.mo
share/locale/ml/LC_MESSAGES/seahorse.mo
share/locale/ms/LC_MESSAGES/seahorse.mo
share/locale/nb/LC_MESSAGES/seahorse.mo
@@ -98,22 +257,48 @@ share/locale/sq/LC_MESSAGES/seahorse.mo
share/locale/sr/LC_MESSAGES/seahorse.mo
share/locale/sr@Latn/LC_MESSAGES/seahorse.mo
share/locale/sv/LC_MESSAGES/seahorse.mo
+share/locale/th/LC_MESSAGES/seahorse.mo
share/locale/tr/LC_MESSAGES/seahorse.mo
-share/locale/vi/LC_MESSAGES/seahorse.mo
share/locale/uk/LC_MESSAGES/seahorse.mo
+share/locale/vi/LC_MESSAGES/seahorse.mo
share/locale/zh_CN/LC_MESSAGES/seahorse.mo
+share/locale/zh_HK/LC_MESSAGES/seahorse.mo
share/locale/zh_TW/LC_MESSAGES/seahorse.mo
+@dirrm share/gnome/pixmaps/seahorse/scalable
+@dirrm share/gnome/pixmaps/seahorse/48x48
+@dirrm share/gnome/pixmaps/seahorse/22x22
+@dirrm share/gnome/pixmaps/seahorse
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/C
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet
+@dirrm share/gnome/help/seahorse/sv/figures
+@dirrm share/gnome/help/seahorse/sv
+@dirrm share/gnome/help/seahorse/it/figures
+@dirrm share/gnome/help/seahorse/it
+@dirrm share/gnome/help/seahorse/fr/figures
+@dirrm share/gnome/help/seahorse/fr
+@dirrm share/gnome/help/seahorse/es/figures
+@dirrm share/gnome/help/seahorse/es
+@dirrm share/gnome/help/seahorse/en_GB/figures
+@dirrm share/gnome/help/seahorse/en_GB
@dirrm share/gnome/help/seahorse/C/figures
@dirrm share/gnome/help/seahorse/C
@dirrm share/gnome/help/seahorse
+%%APPLET%%@dirrm share/gnome/omf/seahorse-applet
@dirrm share/gnome/omf/seahorse
@dirrm share/gnome/seahorse/glade
@dirrm share/gnome/seahorse
+@dirrm lib/seahorse
+%%EPHY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%%/extensions
+%%EPHY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%%
+%%EPHY%%@dirrmtry lib/epiphany
+@dirrm include/libcryptui
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/zh_CN/LC_MESSAGES
@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/uk/LC_MESSAGES
@@ -132,9 +317,21 @@ share/locale/zh_TW/LC_MESSAGES/seahorse.mo
@dirrmtry share/locale/pl
@dirrmtry share/locale/ne/LC_MESSAGES
@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
@dirrmtry share/locale/fi/LC_MESSAGES
@dirrmtry share/locale/fi
+@dirrmtry share/locale/et/LC_MESSAGES
+@dirrmtry share/locale/et
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index f0b39a1..dd5f670 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/brasero/Makefile,v 1.11 2006/09/08 00:44:18 ahze Exp $
+# $MCom: ports/sysutils/brasero/Makefile,v 1.15 2007/03/04 22:46:49 ahze Exp $
PORTNAME= brasero
-PORTVERSION= 0.4.90
+PORTVERSION= 0.5.1
PORTREVISION= 1
CATEGORIES= sysutils audio multimedia gnome
MASTER_SITES= SOURCEFORGE
@@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= CD/DVD mastering tool for the GNOME desktop
LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \
- totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer
+ totem-plparser.1:${PORTSDIR}/multimedia/totem
USE_GETTEXT= yes
USE_BZIP2= yes
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
index 60101bc..25a1ec7 100644
--- a/sysutils/brasero/distinfo
+++ b/sysutils/brasero/distinfo
@@ -1,3 +1,3 @@
-MD5 (brasero-0.4.90.tar.bz2) = 172a8feb5bf0e68bb3cb94d97583cdbd
-SHA256 (brasero-0.4.90.tar.bz2) = 484e2cfa3b0d94aa5674be86d4aeb6da5cc59dad71682d428e0f0c92a84f57a7
-SIZE (brasero-0.4.90.tar.bz2) = 842349
+MD5 (brasero-0.5.1.tar.bz2) = f578d2aaf6b434f91beb935f112728e2
+SHA256 (brasero-0.5.1.tar.bz2) = 6224c274b82622f2ebff1607067e8577a26f594a8a968a30cc66e9e5ac64d20d
+SIZE (brasero-0.5.1.tar.bz2) = 847034
diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist
index ccb87a7..235bdc2 100644
--- a/sysutils/brasero/pkg-plist
+++ b/sysutils/brasero/pkg-plist
@@ -1,5 +1,8 @@
bin/brasero
share/applications/brasero.desktop
+%%DATADIR%%/brasero.png
+%%DATADIR%%/cd-action-burn-16.png
+%%DATADIR%%/cd-action-burn.png
%%DATADIR%%/disc-00.png
%%DATADIR%%/disc-05.png
%%DATADIR%%/disc-10.png
@@ -21,26 +24,22 @@ share/applications/brasero.desktop
%%DATADIR%%/disc-85.png
%%DATADIR%%/disc-90.png
%%DATADIR%%/disc-95.png
-%%DATADIR%%/icon-final-128x128.png
-%%DATADIR%%/icon-final-256x256.png
-%%DATADIR%%/icon-final-48x48.png
%%DATADIR%%/logo.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-brasero.png
+share/icons/hicolor/16x16/apps/brasero.png
+share/icons/hicolor/24x24/apps/brasero.png
+share/icons/hicolor/scalable/apps/brasero.svg
share/locale/ca/LC_MESSAGES/brasero.mo
share/locale/de/LC_MESSAGES/brasero.mo
share/locale/es/LC_MESSAGES/brasero.mo
share/locale/fr/LC_MESSAGES/brasero.mo
+share/locale/hu/LC_MESSAGES/brasero.mo
share/locale/it/LC_MESSAGES/brasero.mo
share/locale/ja/LC_MESSAGES/brasero.mo
+share/locale/lt/LC_MESSAGES/brasero.mo
share/locale/pl/LC_MESSAGES/brasero.mo
share/locale/pt_BR/LC_MESSAGES/brasero.mo
+share/locale/sv/LC_MESSAGES/brasero.mo
share/mime/packages/brasero.xml
-share/pixmaps/brasero.png
-@dirrmtry share/pixmaps
-@dirrm share/icons/gnome/48x48/mimetypes
-@dirrm share/icons/gnome/48x48
-@dirrm share/icons/gnome
-@dirrm share/icons
@dirrm %%DATADIR%%
@dirrmtry share/applications
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 7c1a2d3..1f224eb 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.56 2006/09/05 00:53:22 ahze Exp $
+# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.59 2007/03/13 12:30:40 ahze Exp $
#
PORTNAME= gconf-editor
-PORTVERSION= 2.16.0
+PORTVERSION= 2.18.0
PORTEPOCH= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index 7b6a548..d02ed43 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconf-editor-2.16.0.tar.bz2) = e52b3177ef6ebd1fcf2c84acbe90a663
-SHA256 (gnome2/gconf-editor-2.16.0.tar.bz2) = efee1e2e65e280abe30b94b20b59d24d2c71e55e5ad26cb3041966a32b436786
-SIZE (gnome2/gconf-editor-2.16.0.tar.bz2) = 528644
+MD5 (gnome2/gconf-editor-2.18.0.tar.bz2) = cbaefa1ff8a548a3d381c67aed426fb7
+SHA256 (gnome2/gconf-editor-2.18.0.tar.bz2) = ffd3d8ef4637ead6ebd7469c1e4283e3c1044351a243e81e6f242194e07fa057
+SIZE (gnome2/gconf-editor-2.18.0.tar.bz2) = 694449
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index a2ee10c..641ccff 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -3,7 +3,16 @@ share/gnome/applications/gconf-editor.desktop
share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/C/gconf-editor.xml
share/gnome/help/gconf-editor/C/legal.xml
+share/gnome/help/gconf-editor/fr/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/fr/gconf-editor.xml
+share/gnome/help/gconf-editor/it/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/it/gconf-editor.xml
+share/gnome/help/gconf-editor/sv/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/sv/gconf-editor.xml
share/gnome/omf/gconf-editor/gconf-editor-C.omf
+share/gnome/omf/gconf-editor/gconf-editor-fr.omf
+share/gnome/omf/gconf-editor/gconf-editor-it.omf
+share/gnome/omf/gconf-editor/gconf-editor-sv.omf
share/gnome/pixmaps/gconf-editor/entry-blank.png
share/gnome/pixmaps/gconf-editor/entry-bool.png
share/gnome/pixmaps/gconf-editor/entry-list.png
@@ -17,6 +26,7 @@ share/locale/am/LC_MESSAGES/gconf-editor.mo
share/locale/ar/LC_MESSAGES/gconf-editor.mo
share/locale/az/LC_MESSAGES/gconf-editor.mo
share/locale/be/LC_MESSAGES/gconf-editor.mo
+share/locale/be@latin/LC_MESSAGES/gconf-editor.mo
share/locale/bg/LC_MESSAGES/gconf-editor.mo
share/locale/bn/LC_MESSAGES/gconf-editor.mo
share/locale/bn_IN/LC_MESSAGES/gconf-editor.mo
@@ -90,6 +100,12 @@ share/locale/zh_HK/LC_MESSAGES/gconf-editor.mo
share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
@dirrm share/gnome/pixmaps/gconf-editor
@dirrm share/gnome/omf/gconf-editor
+@dirrm share/gnome/help/gconf-editor/sv/figures
+@dirrm share/gnome/help/gconf-editor/sv
+@dirrm share/gnome/help/gconf-editor/it/figures
+@dirrm share/gnome/help/gconf-editor/it
+@dirrm share/gnome/help/gconf-editor/fr/figures
+@dirrm share/gnome/help/gconf-editor/fr
@dirrm share/gnome/help/gconf-editor/C/figures
@dirrm share/gnome/help/gconf-editor/C
@dirrm share/gnome/help/gconf-editor
@@ -147,5 +163,7 @@ share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index fe250e8..0829a1f 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.120 2006/10/03 00:02:39 ahze Exp $
+# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.132 2007/03/12 22:05:56 marcus Exp $
#
PORTNAME= gnome-control-center
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -27,7 +27,7 @@ GNOME_DESKTOP_VERSION=2
USE_GSTREAMER= good
WANT_GNOME= yes
USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \
- gnomemenus desktopfileutils nautilus2
+ gnomemenus desktopfileutils libgnomekbd gnomepanel
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
@@ -39,8 +39,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \
apps_gnome_settings_daemon_keybindings.schemas \
apps_gnome_settings_daemon_screensaver.schemas \
+ control-center.schemas \
desktop_gnome_font_rendering.schemas \
- desktop_gnome_peripherals_keyboard_xkb.schemas \
fontilus.schemas themus.schemas
.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 428041b..f6b4fab 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/control-center-2.16.3.tar.bz2) = 75ec00d864a69684abc561546fb762bb
-SHA256 (gnome2/control-center-2.16.3.tar.bz2) = 6bffec96f9014b3742df80f193b68877e31b26b2a1cc0ba961fcba15a22af9d9
-SIZE (gnome2/control-center-2.16.3.tar.bz2) = 2025478
+MD5 (gnome2/control-center-2.18.0.tar.bz2) = e5251c30c45577b78770beb2df59df5d
+SHA256 (gnome2/control-center-2.18.0.tar.bz2) = 5879c85775c2ba659174c506def2f0db11cad4215c956415c5e13908c5d06611
+SIZE (gnome2/control-center-2.18.0.tar.bz2) = 2138980
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 94466c8..6527e67 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,28 +1,10 @@
---- configure.orig Thu Jul 13 12:02:50 2006
-+++ configure Thu Jul 13 12:04:24 2006
-@@ -22229,6 +22229,7 @@ echo $ECHO_N "checking for $ac_func... $
- if eval "test \"\${$as_ac_var+set}\" = set"; then
+--- configure.orig Tue Feb 13 07:51:47 2007
++++ configure Tue Feb 13 07:51:47 2007
+@@ -22302,6 +22302,7 @@
+ if test "${gt_cv_func_ngettext_libc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
+ LIBS="-lintl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28440,7 +28441,7 @@ BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG
-
-
- # dbus directory
--DBUS_SERVICES_DIR='$(datadir)'"/dbus-1/services"
-+DBUS_SERVICES_DIR='$(prefix)'"/share/dbus-1/services"
-
-
- cat >>confdefs.h <<_ACEOF
-@@ -29126,7 +29127,7 @@ fi
-
-
- cat >>confdefs.h <<_ACEOF
--#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
-+#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
- _ACEOF
-
-
diff --git a/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c b/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c
new file mode 100644
index 0000000..86acdbe
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c
@@ -0,0 +1,9 @@
+--- libslab/directory-tile.c.orig Mon Mar 12 16:33:35 2007
++++ libslab/directory-tile.c Mon Mar 12 16:35:48 2007
+@@ -644,5 +644,5 @@ static void
+ disown_spawned_child (gpointer user_data)
+ {
+ setsid ();
+- setpgrp ();
++ setpgrp (0, 0);
+ }
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index f37dab7..9552441 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -21,9 +21,29 @@ bin/gnome-window-properties
bin/themus-theme-applier
etc/gnome-vfs-2.0/modules/font-method.conf
etc/gnome-vfs-2.0/modules/theme-method.conf
+etc/xdg/menus/gnomecc.menu
include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
include/gnome-window-settings-2.0/gnome-window-manager.h
include/gnome-window-settings-2.0/gnome-wm-manager.h
+include/slab/app-resizer.h
+include/slab/app-shell-startup.h
+include/slab/app-shell.h
+include/slab/application-tile.h
+include/slab/directory-tile.h
+include/slab/document-tile.h
+include/slab/gnome-utils.h
+include/slab/nameplate-tile.h
+include/slab/nld-marshal.c
+include/slab/nld-marshal.h
+include/slab/search-bar.h
+include/slab/search-context-picker.h
+include/slab/search-entry-watermark.h
+include/slab/search-entry.h
+include/slab/shell-window.h
+include/slab/slab-gnome-util.h
+include/slab/slab-section.h
+include/slab/system-tile.h
+include/slab/tile.h
lib/gnome-vfs-2.0/modules/libfont-method.a
lib/gnome-vfs-2.0/modules/libfont-method.la
lib/gnome-vfs-2.0/modules/libfont-method.so
@@ -34,6 +54,10 @@ lib/libgnome-window-settings.a
lib/libgnome-window-settings.la
lib/libgnome-window-settings.so
lib/libgnome-window-settings.so.1
+lib/libslab.a
+lib/libslab.la
+lib/libslab.so
+lib/libslab.so.0
lib/nautilus/extensions-1.0/libnautilus-fontilus.a
lib/nautilus/extensions-1.0/libnautilus-fontilus.la
lib/nautilus/extensions-1.0/libnautilus-fontilus.so
@@ -45,6 +69,7 @@ lib/window-manager-settings/libmetacity.la
lib/window-manager-settings/libmetacity.so
libdata/pkgconfig/gnome-settings-daemon.pc
libdata/pkgconfig/gnome-window-settings-2.0.pc
+libdata/pkgconfig/libslab.pc
libexec/gnome-settings-daemon
share/dbus-1/services/org.gnome.SettingsDaemon.service
share/gnome/applications/accessibility-keyboard.desktop
@@ -58,6 +83,7 @@ share/gnome/applications/gnome-font-viewer.desktop
share/gnome/applications/gnome-network-preferences.desktop
share/gnome/applications/gnome-settings-mouse.desktop
share/gnome/applications/gnome-settings-sound.desktop
+share/gnome/applications/gnome-theme-installer.desktop
share/gnome/applications/gnome-ui-properties.desktop
share/gnome/applications/gnomecc.desktop
share/gnome/applications/gtk-theme-selector.desktop
@@ -65,73 +91,72 @@ share/gnome/applications/keybinding.desktop
share/gnome/applications/keyboard.desktop
share/gnome/applications/themus-theme-applier.desktop
share/gnome/applications/window-properties.desktop
-share/gnome/control-center-2.0/icons/display-capplet.png
-share/gnome/control-center-2.0/interfaces/acme.glade
-share/gnome/control-center-2.0/interfaces/apply-font.glade
-share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade
-share/gnome/control-center-2.0/interfaces/font-properties.glade
-%%ABOUTME%%share/gnome/control-center-2.0/interfaces/gnome-about-me.glade
-share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-keybinding-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade
-share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
-share/gnome/control-center-2.0/interfaces/modmap-dialog.glade
-share/gnome/control-center-2.0/interfaces/sound-properties.glade
-share/gnome/control-center-2.0/interfaces/theme-properties.glade
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png
-share/gnome/control-center-2.0/pixmaps/acme-eject.png
-share/gnome/control-center-2.0/pixmaps/at-startup.png
-share/gnome/control-center-2.0/pixmaps/at-support.png
-share/gnome/control-center-2.0/pixmaps/bar-disabled.png
-share/gnome/control-center-2.0/pixmaps/bar-green.png
-share/gnome/control-center-2.0/pixmaps/bar-red.png
-share/gnome/control-center-2.0/pixmaps/bar.png
-share/gnome/control-center-2.0/pixmaps/double-click-maybe.png
-share/gnome/control-center-2.0/pixmaps/double-click-off.png
-share/gnome/control-center-2.0/pixmaps/double-click-on.png
-%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-lock-open.png
-%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-lock.png
-share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png
-share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png
-share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
-share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png
-share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
-share/gnome/control-center-2.0/pixmaps/keyboard-volume.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-normal-large.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-normal.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png
-share/gnome/control-center-2.0/pixmaps/mouse-left.png
-share/gnome/control-center-2.0/pixmaps/mouse-right.png
-share/gnome/control-center-2.0/pixmaps/ocean-stripes.png
-share/gnome/control-center-2.0/pixmaps/stop.png
-share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png
-share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png
-share/gnome/control-center-2.0/pixmaps/subpixel-vbgr.png
-share/gnome/control-center-2.0/pixmaps/subpixel-vrgb.png
-share/gnome/control-center-2.0/pixmaps/theme-thumbnailing.png
-share/gnome/control-center-2.0/pixmaps/visual-bell.png
-share/gnome/control-center-2.0/xrdb/Editres.ad
-share/gnome/control-center-2.0/xrdb/Emacs.ad
-share/gnome/control-center-2.0/xrdb/General.ad
-share/gnome/control-center-2.0/xrdb/Motif.ad
-share/gnome/control-center-2.0/xrdb/Tk.ad
-share/gnome/control-center-2.0/xrdb/Xaw.ad
+share/gnome/control-center/glade/acme.glade
+share/gnome/control-center/glade/apply-font.glade
+share/gnome/control-center/glade/at-enable-dialog.glade
+share/gnome/control-center/glade/font-properties.glade
+%%ABOUTME%%share/gnome/control-center/glade/gnome-about-me.glade
+share/gnome/control-center/glade/gnome-accessibility-keyboard-properties.glade
+share/gnome/control-center/glade/gnome-background-properties.glade
+share/gnome/control-center/glade/gnome-default-applications-properties.glade
+share/gnome/control-center/glade/gnome-keybinding-properties.glade
+share/gnome/control-center/glade/gnome-keyboard-properties.glade
+share/gnome/control-center/glade/gnome-mouse-properties.glade
+share/gnome/control-center/glade/gnome-network-preferences.glade
+share/gnome/control-center/glade/gnome-ui-properties.glade
+share/gnome/control-center/glade/gnome-window-properties.glade
+share/gnome/control-center/glade/modmap-dialog.glade
+share/gnome/control-center/glade/sound-properties.glade
+share/gnome/control-center/glade/theme-properties.glade
+share/gnome/control-center/gnome-default-applications.xml
+share/gnome/control-center/icons/display-capplet.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-bouncekey.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-mousekey.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-slowkey.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-stickykey.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-togglekey.png
+share/gnome/control-center/pixmaps/acme-eject.png
+share/gnome/control-center/pixmaps/at-startup.png
+share/gnome/control-center/pixmaps/at-support.png
+share/gnome/control-center/pixmaps/bar-disabled.png
+share/gnome/control-center/pixmaps/bar-green.png
+share/gnome/control-center/pixmaps/bar-red.png
+share/gnome/control-center/pixmaps/bar.png
+share/gnome/control-center/pixmaps/double-click-maybe.png
+share/gnome/control-center/pixmaps/double-click-off.png
+share/gnome/control-center/pixmaps/double-click-on.png
+%%ABOUTME%%share/gnome/control-center/pixmaps/gnome-about-me-lock-open.png
+%%ABOUTME%%share/gnome/control-center/pixmaps/gnome-about-me-lock.png
+share/gnome/control-center/pixmaps/keyboard-bell.png
+share/gnome/control-center/pixmaps/keyboard-cursor.png
+share/gnome/control-center/pixmaps/keyboard-repeat.png
+share/gnome/control-center/pixmaps/keyboard-volume.png
+share/gnome/control-center/pixmaps/mouse-cursor-normal-large.png
+share/gnome/control-center/pixmaps/mouse-cursor-normal.png
+share/gnome/control-center/pixmaps/mouse-cursor-white-large.png
+share/gnome/control-center/pixmaps/mouse-cursor-white.png
+share/gnome/control-center/pixmaps/mouse-left.png
+share/gnome/control-center/pixmaps/mouse-right.png
+share/gnome/control-center/pixmaps/ocean-stripes.png
+share/gnome/control-center/pixmaps/stop.png
+share/gnome/control-center/pixmaps/subpixel-bgr.png
+share/gnome/control-center/pixmaps/subpixel-rgb.png
+share/gnome/control-center/pixmaps/subpixel-vbgr.png
+share/gnome/control-center/pixmaps/subpixel-vrgb.png
+share/gnome/control-center/pixmaps/theme-thumbnailing.png
+share/gnome/control-center/pixmaps/visual-bell.png
+share/gnome/control-center/xrdb/Editres.ad
+share/gnome/control-center/xrdb/Emacs.ad
+share/gnome/control-center/xrdb/General.ad
+share/gnome/control-center/xrdb/Motif.ad
+share/gnome/control-center/xrdb/Tk.ad
+share/gnome/control-center/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/gnomecc.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
@@ -147,21 +172,26 @@ 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/en_GB/control-center.xml
share/gnome/help/control-center/es/control-center.xml
share/gnome/help/control-center/fr/control-center.xml
+share/gnome/help/control-center/pa/control-center.xml
share/gnome/help/control-center/ru/control-center.xml
share/gnome/help/control-center/sv/control-center.xml
+share/gnome/help/control-center/uk/control-center.xml
share/gnome/help/control-center/zh_CN/control-center.xml
-share/gnome/idl/ConfigArchiver.idl
-share/gnome/idl/GNOME_SettingsDaemon.idl
share/gnome/omf/control-center/control-center-C.omf
+share/gnome/omf/control-center/control-center-en_GB.omf
share/gnome/omf/control-center/control-center-es.omf
share/gnome/omf/control-center/control-center-fr.omf
+share/gnome/omf/control-center/control-center-pa.omf
share/gnome/omf/control-center/control-center-ru.omf
share/gnome/omf/control-center/control-center-sv.omf
+share/gnome/omf/control-center/control-center-uk.omf
share/gnome/omf/control-center/control-center-zh_CN.omf
share/gnome/pixmaps/display-capplet.png
-share/icons/hicolor/48x48/apps/gnome-control-center.png
+share/icons/hicolor/48x48/apps/typing-monitor.png
+share/icons/hicolor/scalable/apps/typing-monitor.svg
share/locale/af/LC_MESSAGES/control-center-2.0.mo
share/locale/am/LC_MESSAGES/control-center-2.0.mo
share/locale/ar/LC_MESSAGES/control-center-2.0.mo
@@ -240,28 +270,8 @@ 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
-@dirrm share/gnome/omf/control-center
-@dirrm share/gnome/help/control-center/zh_CN
-@dirrm share/gnome/help/control-center/sv
-@dirrm share/gnome/help/control-center/ru
-@dirrm share/gnome/help/control-center/fr
-@dirrm share/gnome/help/control-center/es
-@dirrm share/gnome/help/control-center/C
-@dirrm share/gnome/help/control-center
-@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
-@dirrm share/gnome/control-center-2.0/interfaces
-@dirrmtry share/gnome/control-center-2.0/icons
-@dirrm lib/window-manager-settings
-@dirrm include/gnome-window-settings-2.0
-@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
-@dirrm include/gnome-settings-daemon-2.0
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+share/mime/application/x-gnome-theme-package.xml
+share/mime/packages/gnome-theme-package.xml
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@@ -320,3 +330,30 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
+@dirrm share/gnome/omf/control-center
+@dirrm share/gnome/help/control-center/zh_CN
+@dirrm share/gnome/help/control-center/uk
+@dirrm share/gnome/help/control-center/sv
+@dirrm share/gnome/help/control-center/ru
+@dirrm share/gnome/help/control-center/pa
+@dirrm share/gnome/help/control-center/fr
+@dirrm share/gnome/help/control-center/es
+@dirrm share/gnome/help/control-center/en_GB
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
+@dirrmtry share/gnome/gnome-background-properties
+@dirrm share/gnome/desktop-directories
+@dirrm share/gnome/cursor-fonts
+@dirrm share/gnome/control-center/xrdb
+@dirrm share/gnome/control-center/pixmaps
+@dirrmtry share/gnome/control-center/icons
+@dirrm share/gnome/control-center/glade
+@dirrm lib/window-manager-settings
+@dirrm include/slab
+@dirrm include/gnome-window-settings-2.0
+@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
+@dirrm include/gnome-settings-daemon-2.0
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index 64cdda7..6be9c4a 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -3,19 +3,20 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-mount/Makefile,v 1.4 2006/10/05 07:37:38 mezz Exp $
+# $MCom: ports/sysutils/gnome-mount/Makefile,v 1.13 2007/02/11 06:03:50 marcus Exp $
#
PORTNAME= gnome-mount
-PORTVERSION= 0.4
-PORTREVISION= 2
+PORTVERSION= 0.5
+PORTREVISION= 6
CATEGORIES= sysutils gnome
MASTER_SITES= http://people.freedesktop.org/~david/dist/
MAINTAINER= gnome@FreeBSD.org
COMMENT= A front-end to mount, umount, and eject using HAL
-LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \
+ notify.1:${PORTSDIR}/devel/libnotify
USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack nautilus2
@@ -27,8 +28,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= gnome-mount.schemas
+MAN1= gnome-mount.1
-post-extract:
- @${CP} -f ${FILESDIR}/mntent.h ${WRKSRC}/src
+post-patch:
+ @${REINPLACE_CMD} -e 's|0.5.8.1|0.5.8|g' \
+ ${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/sysutils/gnome-mount/distinfo b/sysutils/gnome-mount/distinfo
index 656c038..fa1d481 100644
--- a/sysutils/gnome-mount/distinfo
+++ b/sysutils/gnome-mount/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-mount-0.4.tar.gz) = 75f260ea6b0ec3c5e0af3c722fbd9568
-SHA256 (gnome-mount-0.4.tar.gz) = fa9456c0cd1adeda962721fed955914bdc23723a403bebf31bd95a1f54211dd8
-SIZE (gnome-mount-0.4.tar.gz) = 364546
+MD5 (gnome-mount-0.5.tar.gz) = 76622ff9af0131fc44687aed7204f84f
+SHA256 (gnome-mount-0.5.tar.gz) = f705a44a2534acdae8bae752c54066eb3fc85ce082b3a25a50310f4ad377019b
+SIZE (gnome-mount-0.5.tar.gz) = 408472
diff --git a/sysutils/gnome-mount/files/mntent.h b/sysutils/gnome-mount/files/mntent.h
deleted file mode 100644
index 078b246..0000000
--- a/sysutils/gnome-mount/files/mntent.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * mntent
- * mntent.h - compatability header for FreeBSD
- *
- * Copyright (c) 2001 David Rufino <daverufino@btinternet.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(HAVE_MNTENT_H)
-#include <mntent.h>
-#else
-#ifndef _MNTENT_H
-#define _MNTENT_H
-#include <stdio.h>
-
-#define MOUNTED "dummy"
-
-#define MNTTYPE_NFS "nfs"
-
-struct mntent {
- char *mnt_fsname;
- char *mnt_dir;
- char *mnt_type;
- char *mnt_opts;
- int mnt_freq;
- int mnt_passno;
-};
-
-#define setmntent(x,y) ((FILE *)0x1)
-struct mntent *getmntent __P ((FILE *fp));
-char *hasmntopt __P ((const struct mntent *mnt, const char *option));
-#define endmntent(x) ((int)1)
-
-#endif /* _MNTENT_H */
-#endif /* HAVE_MNTENT_H */
diff --git a/sysutils/gnome-mount/files/patch-gnome-mount.schemas.in b/sysutils/gnome-mount/files/patch-gnome-mount.schemas.in
new file mode 100644
index 0000000..d4a0961
--- /dev/null
+++ b/sysutils/gnome-mount/files/patch-gnome-mount.schemas.in
@@ -0,0 +1,38 @@
+--- gnome-mount.schemas.in.orig Wed Jun 21 22:45:53 2006
++++ gnome-mount.schemas.in Sun Dec 31 15:38:28 2006
+@@ -6,7 +6,7 @@
+ <applyto>/system/storage/default_options/vfat/mount_options</applyto>
+ <type>list</type>
+ <list_type>string</list_type>
+- <default>[shortname=winnt,uid=]</default>
++ <default>[longnames,-u=]</default>
+ <locale name="C">
+ <short>Default mount options for vfat fs</short>
+ <long>A list of default mount options for volumes formatted with the vfat file system.</long>
+@@ -18,7 +18,7 @@
+ <applyto>/system/storage/default_options/iso9660/mount_options</applyto>
+ <type>list</type>
+ <list_type>string</list_type>
+- <default>[uid=]</default>
++ <default>[]</default>
+ <locale name="C">
+ <short>Default mount options for iso9660 fs</short>
+ <long>A list of default mount options for volumes formatted with the iso9660 file system.</long>
+@@ -30,7 +30,7 @@
+ <applyto>/system/storage/default_options/udf/mount_options</applyto>
+ <type>list</type>
+ <list_type>string</list_type>
+- <default>[uid=]</default>
++ <default>[]</default>
+ <locale name="C">
+ <short>Default mount options for udf fs</short>
+ <long>A list of default mount options for volumes formatted with the udf file system.</long>
+@@ -42,7 +42,7 @@
+ <applyto>/system/storage/default_options/ntfs/mount_options</applyto>
+ <type>list</type>
+ <list_type>string</list_type>
+- <default>[umask=222]</default>
++ <default>[-m=222]</default>
+ <locale name="C">
+ <short>Default mount options for ntfs fs</short>
+ <long>A list of default mount options for volumes formatted with the ntfs file system.</long>
diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c b/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c
index e33d84f..481e828 100644
--- a/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c
+++ b/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c
@@ -1,10 +1,81 @@
---- src/gnome-mount-properties-view.c.orig Sun Dec 3 02:24:16 2006
-+++ src/gnome-mount-properties-view.c Sun Dec 3 02:25:20 2006
-@@ -30,6 +30,7 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- #include <glade/glade.h>
-+#include <libgnomevfs/gnome-vfs-utils.h>
- #include <time.h>
+--- src/gnome-mount-properties-view.c.orig Mon Aug 14 00:17:22 2006
++++ src/gnome-mount-properties-view.c Sun Dec 3 02:38:08 2006
+@@ -34,6 +34,7 @@
#include <sys/time.h>
#include <string.h>
+ #include <gconf/gconf-client.h>
++#include <libgnomevfs/gnome-vfs-utils.h>
+
+ #ifdef __FreeBSD__
+ #include <fstab.h>
+@@ -59,6 +60,35 @@ struct _GnomeMountPropertiesViewClass {
+ GtkVBoxClass base_class;
+ };
+
++#ifdef __FreeBSD__
++static struct opt {
++ int o_opt;
++ const char *o_name;
++} optnames[] = {
++ { MNT_ASYNC, "asynchronous" },
++ { MNT_EXPORTED, "NFS exported" },
++ { MNT_LOCAL, "local" },
++ { MNT_NOATIME, "noatime" },
++ { MNT_NOEXEC, "noexec" },
++ { MNT_NOSUID, "nosuid" },
++ { MNT_NOSYMFOLLOW, "nosymfollow" },
++ { MNT_QUOTA, "with quotas" },
++ { MNT_RDONLY, "read-only" },
++ { MNT_SYNCHRONOUS, "synchronous" },
++ { MNT_UNION, "union" },
++ { MNT_NOCLUSTERR, "noclusterr" },
++ { MNT_NOCLUSTERW, "noclusterw" },
++ { MNT_SUIDDIR, "suiddir" },
++ { MNT_SOFTDEP, "soft-updates" },
++ { MNT_MULTILABEL, "multilabel" },
++ { MNT_ACLS, "acls" },
++#ifdef MNT_GJOURNAL
++ { MNT_GJOURNAL, "gjournal" },
++#endif
++ { 0, NULL }
++};
++#endif
++
+ G_DEFINE_TYPE (GnomeMountPropertiesView, gm_properties_view, GTK_TYPE_VBOX)
+
+ static void
+@@ -445,13 +475,29 @@ static gboolean
+ mtab_next (gpointer handle, char **device_file, char **mount_options, char **mount_fstype)
+ {
+ #ifdef __FreeBSD__
+-#error FIXME TODO XXX fix this up for FreeBSD. Thanks.
+ struct mtab_handle *mtab = handle;
+
+- if (mtab->iter < mtab->n_mounts)
+- return mtab->mounts[mtab->iter++].f_mntfromname;
+- else
+- return NULL;
++ if (mtab->iter < mtab->n_mounts) {
++ struct opt *o;
++ int flags;
++ GString *optstr;
++
++ optstr = g_string_new("");
++ flags = mtab->mounts[mtab->iter].f_flags & MNT_VISFLAGMASK;
++
++ for (o = optnames; flags && o->o_opt; o++) {
++ if (flags & o->o_opt) {
++ g_string_append_printf(optstr, ", %s", o->o_name);
++ flags &= ~o->o_opt;
++ }
++ }
++ *device_file = mtab->mounts[mtab->iter].f_mntfromname;
++ *mount_options = g_string_free(optstr, FALSE);
++ *mount_fstype = mtab->mounts[mtab->iter++].f_fstypename;
++ return TRUE;
++ } else {
++ return FALSE;
++ }
+ #else
+ struct mntent *mnt;
+
diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount-properties.c b/sysutils/gnome-mount/files/patch-src_gnome-mount-properties.c
index ad32f4a..1f36b12 100644
--- a/sysutils/gnome-mount/files/patch-src_gnome-mount-properties.c
+++ b/sysutils/gnome-mount/files/patch-src_gnome-mount-properties.c
@@ -1,5 +1,5 @@
---- src/gnome-mount-properties.c.orig Sun Dec 3 02:25:59 2006
-+++ src/gnome-mount-properties.c Sun Dec 3 02:30:25 2006
+--- src/gnome-mount-properties.c.orig Sun Dec 3 02:38:14 2006
++++ src/gnome-mount-properties.c Sun Dec 3 02:39:27 2006
@@ -27,6 +27,8 @@
#include <libhal.h>
#include <libhal-storage.h>
diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount.c b/sysutils/gnome-mount/files/patch-src_gnome-mount.c
index eb78bab..19de73c 100644
--- a/sysutils/gnome-mount/files/patch-src_gnome-mount.c
+++ b/sysutils/gnome-mount/files/patch-src_gnome-mount.c
@@ -1,29 +1,118 @@
---- src/gnome-mount.c.orig Mon Sep 4 21:41:09 2006
-+++ src/gnome-mount.c Mon Sep 4 21:45:53 2006
-@@ -42,7 +42,7 @@
+--- src/gnome-mount.c.orig Sun Sep 17 01:17:54 2006
++++ src/gnome-mount.c Sun Feb 11 01:03:16 2007
+@@ -51,9 +51,14 @@
#include <libhal.h>
#include <libhal-storage.h>
--#include <mntent.h>
-+#include "mntent.h"
+-#ifndef sun
++#if !defined(sun) && !defined(__FreeBSD__)
+ #include <mntent.h>
+-#else
++#elif defined(__FreeBSD__)
++#include <fstab.h>
++#include <sys/param.h>
++#include <sys/ucred.h>
++#include <sys/mount.h>
++#elif defined(sun)
+ #include <sys/mnttab.h>
+ #endif
- static DBusConnection *dbus_connection;
- static LibHalContext *hal_ctx;
-@@ -477,7 +477,7 @@
+@@ -380,7 +385,7 @@ show_error_dialog_mount (LibHalVolume *v
+ } else if (strcmp (error_name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted") == 0) {
- mount_point = NULL;
- device_file = get_dev_file (volume, drive);
--
-+#ifdef __linux__
- if (device_file != NULL) {
- FILE *f;
- struct mntent mnt;
-@@ -497,7 +497,7 @@
- endmntent (f);
- }
+ /* don't show any dialog for this */
+- gtk_widget_unref (w);
++ gtk_widget_destroy (w);
+ w = NULL;
+
+ #if 0
+@@ -399,7 +404,7 @@ show_error_dialog_mount (LibHalVolume *v
+ *
+ * Don't show any dialog for this.
+ */
+- gtk_widget_unref (w);
++ gtk_widget_destroy (w);
+ w = NULL;
+
+ } else {
+@@ -582,19 +587,24 @@ static char *
+ get_mntent_mount_point(const char *device_file)
+ {
+ char *mount_point;
++#if! defined(sun) && !defined(__FreeBSD__)
+ FILE *f;
+-#ifndef sun
+ struct mntent mnt;
+ struct mntent *mnte;
+ char buf[512];
+-#else
++#elif defined(__FreeBSD__)
++ struct statfs *mounts;
++ int n_mounts;
++ int i;
++#elif defined(sun)
++ FILE *f;
+ struct mnttab mnt;
+ struct mnttab mpref = { NULL, NULL, NULL, NULL, NULL };
+ #endif
+
+ mount_point = NULL;
+
+-#ifndef sun
++#if !defined(sun) && !defined(__FreeBSD__)
+ if ((f = setmntent ("/proc/mounts", "r")) != NULL) {
+
+ while ((mnte = getmntent_r (f, &mnt, buf, sizeof(buf))) != NULL) {
+@@ -608,7 +618,7 @@ get_mntent_mount_point(const char *devic
+ endmntent (f);
+ }
+
+-#else /* sun */
++#elif defined(sun) /* sun */
+
+ if ((f = fopen(MNTTAB, "r")) != NULL) {
+ mpref.mnt_special = (char *)device_file;
+@@ -617,8 +627,13 @@ get_mntent_mount_point(const char *devic
}
+ fclose(f);
+ }
-
+-#endif /* sun */
++#elif defined(__FreeBSD__)
++ n_mounts = getmntinfo(&mounts, MNT_NOWAIT);
++ for (i = 0; i < n_mounts; i++) {
++ if (!strcmp(mounts[i].f_mntfromname, device_file))
++ mount_point = g_strdup (mounts[i].f_mntonname);
++ }
++#endif /* sun && __FreeBSD__ */
+
+ out:
+ return (mount_point);
+@@ -1322,7 +1337,11 @@ volume_mount (const char *udi, LibHalVol
+ if (volume == NULL && (mount_options->len == 0)) {
+ /* volume from a non-pollable drive, just set uid.. */
+
++#ifndef __FreeBSD__
+ snprintf (uidbuf, sizeof (uidbuf) - 1, "uid=%u", getuid ());
++#else
++ snprintf (uidbuf, sizeof (uidbuf) - 1, "-u=%u", getuid ());
+#endif
- g_print (_("Mounted %s at \"%s\"\n"), device_file, mount_point);
- g_free (mount_point);
- }
+ g_ptr_array_add (mount_options, uidbuf);
+
+ } else if (((fstype_override != NULL) || (fstype != NULL)) && (mount_options->len == 0)) {
+@@ -1349,9 +1368,15 @@ volume_mount (const char *udi, LibHalVol
+ g_debug ("read default option '%s' from gconf strlist key %s", option, key);
+
+ /* special workaround to replace "uid=" with "uid=<actual uid of caller>" */
++#ifndef __FreeBSD__
+ if (strcmp (option, "uid=") == 0) {
+ g_free (option);
+ option = g_strdup_printf ("uid=%u", getuid ());
++#else
++ if (strcmp (option, "-u=") == 0) {
++ g_free (option);
++ option = g_strdup_printf ("-u=%u", getuid ());
++#endif
+ }
+ g_ptr_array_add (mount_options, option);
+
diff --git a/sysutils/gnome-mount/pkg-plist b/sysutils/gnome-mount/pkg-plist
index 0ae3f40..685e8a4 100644
--- a/sysutils/gnome-mount/pkg-plist
+++ b/sysutils/gnome-mount/pkg-plist
@@ -6,7 +6,13 @@ lib/nautilus/extensions-1.0/libgnome-mount.la
lib/nautilus/extensions-1.0/libgnome-mount.so
libdata/pkgconfig/gnome-mount.pc
share/gnome/gnome-mount/gnome-mount-properties.glade
+share/locale/en_GB/LC_MESSAGES/gnome-mount.mo
+share/locale/es/LC_MESSAGES/gnome-mount.mo
share/locale/it/LC_MESSAGES/gnome-mount.mo
share/locale/ja/LC_MESSAGES/gnome-mount.mo
+share/locale/mk/LC_MESSAGES/gnome-mount.mo
share/locale/nb/LC_MESSAGES/gnome-mount.mo
+share/locale/ru/LC_MESSAGES/gnome-mount.mo
+share/locale/sv/LC_MESSAGES/gnome-mount.mo
+share/locale/vi/LC_MESSAGES/gnome-mount.mo
@dirrm share/gnome/gnome-mount
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index f4b0544..26edbc3 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.13 2006/09/29 23:25:32 marcus Exp $
+# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.23 2007/03/13 00:33:21 mezz Exp $
#
PORTNAME= gnome-power-manager
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,6 +16,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Power management system for the GNOME Desktop
+BUILD_DEPENDS= docbook2html:${PORTSDIR}/textproc/docbook-utils \
+ ${LOCALBASE}/share/sgml/docbook/4.1/catalog:${PORTSDIR}/textproc/docbook-410
LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \
notify.1:${PORTSDIR}/devel/libnotify
@@ -27,18 +29,19 @@ INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libwnck \
- gnomedocutils
+ gnomedocutils gnomepanel
CONFIGURE_ARGS= --disable-icon-framing \
--with-doc-dir=${PREFIX}/share/doc \
- --disable-docbook-docs \
- --mandir=${PREFIX}/man
+ --disable-docbook-docs
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= gnome-power-manager.schemas
+MAN1= gnome-power-manager.1 gnome-power-preferences.1
+
post-patch:
- @${REINPLACE_CMD} -e 's|-lresolv||' \
- ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|-lresolv|| ; s|-Werror||g' \
+ ${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo
index 9cee6e4..2c01771 100644
--- a/sysutils/gnome-power-manager/distinfo
+++ b/sysutils/gnome-power-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-power-manager-2.16.3.tar.bz2) = 48166c6aaf41f2225090517ae655d05d
-SHA256 (gnome2/gnome-power-manager-2.16.3.tar.bz2) = e19f473e4ed4d36607a8f92ac730026526951c6fedb93181e0badc9f07bb98b5
-SIZE (gnome2/gnome-power-manager-2.16.3.tar.bz2) = 1858954
+MD5 (gnome2/gnome-power-manager-2.18.0.tar.bz2) = 089cfb86af712cacce16ac9617ab2b1c
+SHA256 (gnome2/gnome-power-manager-2.18.0.tar.bz2) = 6ae1d7c6c417c30bcde7985c80ea0690a73ba5c6709e100a12b657b8e872026c
+SIZE (gnome2/gnome-power-manager-2.18.0.tar.bz2) = 1961914
diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist
index 5ad8c3f..2761cbe 100644
--- a/sysutils/gnome-power-manager/pkg-plist
+++ b/sysutils/gnome-power-manager/pkg-plist
@@ -1,66 +1,118 @@
-bin/gnome-power-inhibit-test
+bin/gnome-brightness-applet
+bin/gnome-inhibit-applet
+bin/gnome-power-bugreport.sh
+bin/gnome-power-cmd.sh
bin/gnome-power-manager
bin/gnome-power-preferences
+bin/gnome-power-statistics
etc/dbus-1/system.d/gnome-power-manager.conf
+libdata/bonobo/servers/GNOME_BrightnessApplet.server
+libdata/bonobo/servers/GNOME_InhibitApplet.server
share/dbus-1/services/gnome-power-manager.service
share/gnome/applications/gnome-power-preferences.desktop
+share/gnome/applications/gnome-power-statistics.desktop
share/gnome/autostart/gnome-power-manager.desktop
+share/gnome/gnome-2.0/ui/GNOME_BrightnessApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_InhibitApplet.xml
+share/gnome/gnome-power-manager/gpm-critical-power.wav
share/gnome/gnome-power-manager/gpm-feedback-widget.glade
-share/gnome/gnome-power-manager/gpm-info.glade
+share/gnome/gnome-power-manager/gpm-graph.glade
share/gnome/gnome-power-manager/gpm-inhibit-test.glade
share/gnome/gnome-power-manager/gpm-prefs.glade
+share/gnome/gnome-power-manager/gpm-suspend-failure.wav
+share/gnome/gnome-power-manager/gpm-unplugged.wav
+share/gnome/help/gnome-power-manager/C/figures/gpm-cell-capacity.png
share/gnome/help/gnome-power-manager/C/figures/gpm-charged.png
share/gnome/help/gnome-power-manager/C/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-info-devices.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-info-event-log.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-info-percentage.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-info-rate.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-info-time.png
share/gnome/help/gnome-power-manager/C/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-options.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-stats-graph.png
share/gnome/help/gnome-power-manager/C/figures/gpm-suspend-problem.png
share/gnome/help/gnome-power-manager/C/figures/gpm-unplugged.png
share/gnome/help/gnome-power-manager/C/figures/gs-prefs.png
share/gnome/help/gnome-power-manager/C/gnome-power-manager.xml
share/gnome/help/gnome-power-manager/C/legal.xml
+share/gnome/help/gnome-power-manager/es/figures/gpm-cell-capacity.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-stats-graph.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/es/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/es/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/fr/figures/gpm-cell-capacity.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-stats-graph.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/fr/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/fr/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/hu/figures/gpm-cell-capacity.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-stats-graph.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/hu/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/hu/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/pa/figures/gpm-cell-capacity.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-stats-graph.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/pa/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/pa/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/ru/figures/gpm-cell-capacity.png
share/gnome/help/gnome-power-manager/ru/figures/gpm-charged.png
share/gnome/help/gnome-power-manager/ru/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-info-devices.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-info-event-log.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-info-percentage.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-info-rate.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-info-time.png
share/gnome/help/gnome-power-manager/ru/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-options.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-stats-graph.png
share/gnome/help/gnome-power-manager/ru/figures/gpm-suspend-problem.png
share/gnome/help/gnome-power-manager/ru/figures/gpm-unplugged.png
share/gnome/help/gnome-power-manager/ru/figures/gs-prefs.png
share/gnome/help/gnome-power-manager/ru/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/sv/figures/gpm-cell-capacity.png
share/gnome/help/gnome-power-manager/sv/figures/gpm-charged.png
share/gnome/help/gnome-power-manager/sv/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-info-devices.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-info-event-log.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-info-percentage.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-info-rate.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-info-time.png
share/gnome/help/gnome-power-manager/sv/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-options.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-stats-graph.png
share/gnome/help/gnome-power-manager/sv/figures/gpm-suspend-problem.png
share/gnome/help/gnome-power-manager/sv/figures/gpm-unplugged.png
share/gnome/help/gnome-power-manager/sv/figures/gs-prefs.png
share/gnome/help/gnome-power-manager/sv/gnome-power-manager.xml
share/gnome/omf/gnome-power-manager/gnome-power-manager-C.omf
+share/gnome/omf/gnome-power-manager/gnome-power-manager-es.omf
+share/gnome/omf/gnome-power-manager/gnome-power-manager-fr.omf
+share/gnome/omf/gnome-power-manager/gnome-power-manager-hu.omf
+share/gnome/omf/gnome-power-manager/gnome-power-manager-pa.omf
share/gnome/omf/gnome-power-manager/gnome-power-manager-ru.omf
share/gnome/omf/gnome-power-manager/gnome-power-manager-sv.omf
share/icons/hicolor/16x16/apps/gpm-ac-adapter.png
-share/icons/hicolor/16x16/apps/gpm-brightness.png
+share/icons/hicolor/16x16/apps/gpm-brightness-kbd-disabled.png
+share/icons/hicolor/16x16/apps/gpm-brightness-kbd.png
+share/icons/hicolor/16x16/apps/gpm-brightness-lcd-disabled.png
+share/icons/hicolor/16x16/apps/gpm-brightness-lcd.png
share/icons/hicolor/16x16/apps/gpm-hibernate.png
+share/icons/hicolor/16x16/apps/gpm-inhibit.png
share/icons/hicolor/16x16/apps/gpm-keyboard-000.png
share/icons/hicolor/16x16/apps/gpm-keyboard-030.png
share/icons/hicolor/16x16/apps/gpm-keyboard-060.png
@@ -83,6 +135,7 @@ share/icons/hicolor/16x16/apps/gpm-primary-100-charging.png
share/icons/hicolor/16x16/apps/gpm-primary-100.png
share/icons/hicolor/16x16/apps/gpm-primary-charged.png
share/icons/hicolor/16x16/apps/gpm-primary-missing.png
+share/icons/hicolor/16x16/apps/gpm-statistics.png
share/icons/hicolor/16x16/apps/gpm-suspend.png
share/icons/hicolor/16x16/apps/gpm-ups-000-charging.png
share/icons/hicolor/16x16/apps/gpm-ups-000.png
@@ -99,8 +152,12 @@ share/icons/hicolor/16x16/apps/gpm-ups-100.png
share/icons/hicolor/16x16/apps/gpm-ups-charged.png
share/icons/hicolor/16x16/apps/gpm-ups-missing.png
share/icons/hicolor/22x22/apps/gpm-ac-adapter.png
-share/icons/hicolor/22x22/apps/gpm-brightness.png
+share/icons/hicolor/22x22/apps/gpm-brightness-kbd-disabled.png
+share/icons/hicolor/22x22/apps/gpm-brightness-kbd.png
+share/icons/hicolor/22x22/apps/gpm-brightness-lcd-disabled.png
+share/icons/hicolor/22x22/apps/gpm-brightness-lcd.png
share/icons/hicolor/22x22/apps/gpm-hibernate.png
+share/icons/hicolor/22x22/apps/gpm-inhibit.png
share/icons/hicolor/22x22/apps/gpm-keyboard-000.png
share/icons/hicolor/22x22/apps/gpm-keyboard-030.png
share/icons/hicolor/22x22/apps/gpm-keyboard-060.png
@@ -123,6 +180,7 @@ share/icons/hicolor/22x22/apps/gpm-primary-100-charging.png
share/icons/hicolor/22x22/apps/gpm-primary-100.png
share/icons/hicolor/22x22/apps/gpm-primary-charged.png
share/icons/hicolor/22x22/apps/gpm-primary-missing.png
+share/icons/hicolor/22x22/apps/gpm-statistics.png
share/icons/hicolor/22x22/apps/gpm-suspend.png
share/icons/hicolor/22x22/apps/gpm-ups-000-charging.png
share/icons/hicolor/22x22/apps/gpm-ups-000.png
@@ -139,8 +197,12 @@ share/icons/hicolor/22x22/apps/gpm-ups-100.png
share/icons/hicolor/22x22/apps/gpm-ups-charged.png
share/icons/hicolor/22x22/apps/gpm-ups-missing.png
share/icons/hicolor/24x24/apps/gpm-ac-adapter.png
-share/icons/hicolor/24x24/apps/gpm-brightness.png
+share/icons/hicolor/24x24/apps/gpm-brightness-kbd-disabled.png
+share/icons/hicolor/24x24/apps/gpm-brightness-kbd.png
+share/icons/hicolor/24x24/apps/gpm-brightness-lcd-disabled.png
+share/icons/hicolor/24x24/apps/gpm-brightness-lcd.png
share/icons/hicolor/24x24/apps/gpm-hibernate.png
+share/icons/hicolor/24x24/apps/gpm-inhibit.png
share/icons/hicolor/24x24/apps/gpm-keyboard-000.png
share/icons/hicolor/24x24/apps/gpm-keyboard-030.png
share/icons/hicolor/24x24/apps/gpm-keyboard-060.png
@@ -163,6 +225,7 @@ share/icons/hicolor/24x24/apps/gpm-primary-100-charging.png
share/icons/hicolor/24x24/apps/gpm-primary-100.png
share/icons/hicolor/24x24/apps/gpm-primary-charged.png
share/icons/hicolor/24x24/apps/gpm-primary-missing.png
+share/icons/hicolor/24x24/apps/gpm-statistics.png
share/icons/hicolor/24x24/apps/gpm-suspend.png
share/icons/hicolor/24x24/apps/gpm-ups-000-charging.png
share/icons/hicolor/24x24/apps/gpm-ups-000.png
@@ -179,8 +242,12 @@ share/icons/hicolor/24x24/apps/gpm-ups-100.png
share/icons/hicolor/24x24/apps/gpm-ups-charged.png
share/icons/hicolor/24x24/apps/gpm-ups-missing.png
share/icons/hicolor/scalable/apps/gpm-ac-adapter.svg
-share/icons/hicolor/scalable/apps/gpm-brightness.svg
+share/icons/hicolor/scalable/apps/gpm-brightness-kbd-disabled.svg
+share/icons/hicolor/scalable/apps/gpm-brightness-kbd.svg
+share/icons/hicolor/scalable/apps/gpm-brightness-lcd-disabled.svg
+share/icons/hicolor/scalable/apps/gpm-brightness-lcd.svg
share/icons/hicolor/scalable/apps/gpm-hibernate.svg
+share/icons/hicolor/scalable/apps/gpm-inhibit.svg
share/icons/hicolor/scalable/apps/gpm-keyboard-000.svg
share/icons/hicolor/scalable/apps/gpm-keyboard-030.svg
share/icons/hicolor/scalable/apps/gpm-keyboard-060.svg
@@ -203,6 +270,7 @@ share/icons/hicolor/scalable/apps/gpm-primary-100-charging.svg
share/icons/hicolor/scalable/apps/gpm-primary-100.svg
share/icons/hicolor/scalable/apps/gpm-primary-charged.svg
share/icons/hicolor/scalable/apps/gpm-primary-missing.svg
+share/icons/hicolor/scalable/apps/gpm-statistics.svg
share/icons/hicolor/scalable/apps/gpm-suspend.svg
share/icons/hicolor/scalable/apps/gpm-ups-000-charging.svg
share/icons/hicolor/scalable/apps/gpm-ups-000.svg
@@ -253,7 +321,6 @@ share/locale/mk/LC_MESSAGES/gnome-power-manager.mo
share/locale/ml/LC_MESSAGES/gnome-power-manager.mo
share/locale/nb/LC_MESSAGES/gnome-power-manager.mo
share/locale/nl/LC_MESSAGES/gnome-power-manager.mo
-share/locale/or/LC_MESSAGES/gnome-power-manager.mo
share/locale/pa/LC_MESSAGES/gnome-power-manager.mo
share/locale/pl/LC_MESSAGES/gnome-power-manager.mo
share/locale/pt/LC_MESSAGES/gnome-power-manager.mo
@@ -276,6 +343,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-power-manager.mo
@dirrm share/gnome/help/gnome-power-manager/sv
@dirrm share/gnome/help/gnome-power-manager/ru/figures
@dirrm share/gnome/help/gnome-power-manager/ru
+@dirrm share/gnome/help/gnome-power-manager/pa/figures
+@dirrm share/gnome/help/gnome-power-manager/pa
+@dirrm share/gnome/help/gnome-power-manager/hu/figures
+@dirrm share/gnome/help/gnome-power-manager/hu
+@dirrm share/gnome/help/gnome-power-manager/fr/figures
+@dirrm share/gnome/help/gnome-power-manager/fr
+@dirrm share/gnome/help/gnome-power-manager/es/figures
+@dirrm share/gnome/help/gnome-power-manager/es
@dirrm share/gnome/help/gnome-power-manager/C/figures
@dirrm share/gnome/help/gnome-power-manager/C
@dirrm share/gnome/help/gnome-power-manager
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 536b338..3702dd4 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.76 2006/10/02 23:31:11 ahze Exp $
+# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.95 2007/03/12 23:11:28 marcus Exp $
#
PORTNAME= gnome-system-monitor
-PORTVERSION= 2.16.1
-PORTREVISION= 1
+PORTVERSION= 2.18.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,14 +17,17 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 system monitor program
-LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
+ pcre.0:${PORTSDIR}/devel/pcre
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
USE_BZIP2= yes
USE_GETTEXT= yes
USE_XLIB= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libwnck
+USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lutil"
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 8a66b02..c347039 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 37b44e0e84865fc0aba8bfd4bbdf2338
-SHA256 (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 1be70e1ae696e3607dfeda186298e7034cca4e0c8020bf92c7485b8c6450504c
-SIZE (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 1480061
+MD5 (gnome2/gnome-system-monitor-2.18.0.tar.bz2) = 5b4256a20710c8431290ea27238c0905
+SHA256 (gnome2/gnome-system-monitor-2.18.0.tar.bz2) = 2aab8f003bf5373e4a68cb04a1c5942faf8b1ae0be49296b670877a954e5a6c9
+SIZE (gnome2/gnome-system-monitor-2.18.0.tar.bz2) = 1669066
diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src::proctable.c
deleted file mode 100644
index 0d99406..0000000
--- a/sysutils/gnome-system-monitor/files/patch-src::proctable.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/proctable.c.orig Wed Aug 30 14:11:01 2006
-+++ src/proctable.c Tue Oct 24 13:39:29 2006
-@@ -923,6 +923,12 @@ static void cb_exclude(ProcInfo* info, G
- }
-
-
-+static int
-+pid_compare(const void* first, const void* second)
-+{
-+ return *(unsigned*)first - *(unsigned*)second;
-+}
-+
- static void
- refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n)
- {
-@@ -1015,10 +1021,16 @@ proctable_update_list (ProcData * const
-
- pid_list = glibtop_get_proclist (&proclist, which, arg);
-
-+ qsort(pid_list, proclist.number, sizeof (*pid_list), pid_compare);
-+
- /* FIXME: total cpu time elapsed should be calculated on an individual basis here
- ** should probably have a total_time_last gint in the ProcInfo structure */
- glibtop_get_cpu (&cpu);
-- total_time = MAX(cpu.total - total_time_last, 1);
-+ total_time = cpu.total - total_time_last;
-+ if (cpu.frequency) {
-+ total_time /= (cpu.frequency/100);
-+ }
-+ total_time = MAX(total_time, 1);
- total_time_last = cpu.total;
-
- refresh_list (procdata, pid_list, proclist.number);
diff --git a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c b/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
deleted file mode 100644
index 971e718..0000000
--- a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/openfiles.c.orig Mon Apr 11 03:50:49 2005
-+++ src/openfiles.c Mon Apr 11 03:52:13 2005
-@@ -8,6 +8,7 @@
- #include <netdb.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include "procman.h"
- #include "openfiles.h"
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index 3adab4f..b251815 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -29,9 +29,54 @@ 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/help/gnome-system-monitor/fr/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/fr/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/fr/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/fr/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/fr/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/fr/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/fr/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/fr/figures/processListing.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/fr/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/fr/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/fr/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/pa/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/pa/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/pa/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/pa/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/pa/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/pa/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/pa/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/pa/figures/processListing.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/pa/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/pa/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/pa/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/sv/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/sv/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/sv/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/sv/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/sv/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/sv/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/sv/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/sv/figures/processListing.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/sv/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/sv/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/sv/gnome-system-monitor.xml
share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
share/gnome/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
+share/gnome/omf/gnome-system-monitor/gnome-system-monitor-fr.omf
+share/gnome/omf/gnome-system-monitor/gnome-system-monitor-pa.omf
+share/gnome/omf/gnome-system-monitor/gnome-system-monitor-sv.omf
+share/gnome/pixmaps/gnome-system-monitor/side.png
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
@@ -104,12 +149,6 @@ 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
-@dirrm share/gnome/omf/gnome-system-monitor
-@dirrm share/gnome/help/gnome-system-monitor/bg/figures
-@dirrm share/gnome/help/gnome-system-monitor/bg
-@dirrm share/gnome/help/gnome-system-monitor/C/figures
-@dirrm share/gnome/help/gnome-system-monitor/C
-@dirrm share/gnome/help/gnome-system-monitor
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -164,3 +203,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
+@dirrm share/gnome/pixmaps/gnome-system-monitor
+@dirrm share/gnome/omf/gnome-system-monitor
+@dirrm share/gnome/help/gnome-system-monitor/sv/figures
+@dirrm share/gnome/help/gnome-system-monitor/sv
+@dirrm share/gnome/help/gnome-system-monitor/pa/figures
+@dirrm share/gnome/help/gnome-system-monitor/pa
+@dirrm share/gnome/help/gnome-system-monitor/fr/figures
+@dirrm share/gnome/help/gnome-system-monitor/fr
+@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 a6a3b87..1881e1d 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,12 +3,10 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.45 2006/07/27 00:40:38 marcus Exp $
-#
+# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.59 2007/03/12 12:55:31 ahze Exp $
PORTNAME= gnome-system-tools
-PORTVERSION= 2.14.0
-PORTREVISION= 1
+PORTVERSION= 2.18.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,12 +16,13 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Tools to configure workstations
-BUILD_DEPENDS= ${LOCALBASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
-RUN_DEPENDS= ${LOCALBASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
+LIB_DEPENDS= oobs-1.3:${PORTSDIR}/devel/liboobs
USE_BZIP2= yes
USE_GMAKE= yes
+INSTALLS_ICONS= yes
USE_GETTEXT= yes
+USE_LDCONFIG= yes
USE_XLIB= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2
@@ -35,10 +34,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= gnome-system-tools.schemas
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-IGNORE= uses symbols not present in 4.X
-.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|$${prefix}/$${DATADIRNAME}|$${datadir}|g' \
+ ${WRKSRC}/configure
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index dea2f07..f774a5b 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gnome-system-tools-2.18.0.tar.bz2) = af305872b4bd72802915b007a7015010
+SHA256 (gnome2/gnome-system-tools-2.18.0.tar.bz2) = de4667c8a95c55e1936b19d3bed85507a37f0eabcaa1f2eadd3c7ef89e39c480
+SIZE (gnome2/gnome-system-tools-2.18.0.tar.bz2) = 2815588
diff --git a/sysutils/gnome-system-tools/files/patch-configure b/sysutils/gnome-system-tools/files/patch-configure
deleted file mode 100644
index 712bb1d..0000000
--- a/sysutils/gnome-system-tools/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Thu Jan 13 17:15:39 2005
-+++ configure Thu Jan 13 17:17:13 2005
-@@ -22990,7 +22990,7 @@
- GST_CFLAGS="$GST_DEPENDS_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS"
-
- GST_TOOL_LIBS="$GST_LIBS -lutil \$(top_builddir)/src/common/libsetuptool.a"
--GST_TOOL_CFLAGS="$GST_CFLAGS -I\$(top_srcdir)/src/common"
-+GST_TOOL_CFLAGS="-I\$(top_srcdir)/src/common $GST_CFLAGS"
-
- GST_TOOL_CLEANFILES="\$(desktop) \$(desktop).in"
- GST_TOOL_EXTRA_DIST="\$(toolpixmaps) \$(desktop).in.in"
diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c
deleted file mode 100644
index f73b28a..0000000
--- a/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c
+++ /dev/null
@@ -1,110 +0,0 @@
---- src/common/gst-auth.c.orig Mon Aug 8 15:00:01 2005
-+++ src/common/gst-auth.c Sat Sep 10 01:47:35 2005
-@@ -55,6 +55,82 @@
- static int root; /* if we are root, no password is
- required */
-
-+#ifdef __FreeBSD__
-+static int
-+_forkpty (int *amaster, char *name,
-+ struct termios *termp, struct winsize *winp)
-+{
-+ int master, slave;
-+ char *line;
-+ pid_t pid;
-+
-+ master = posix_openpt (O_RDWR);
-+ if (master == -1)
-+ return (-1);
-+
-+ if (grantpt (master) == -1)
-+ {
-+ (void) close (master);
-+ return (-1);
-+ }
-+
-+ if (unlockpt (master) == -1)
-+ {
-+ (void) close (master);
-+ return (-1);
-+ }
-+
-+ line = ptsname (master);
-+ if (line == NULL)
-+ {
-+ (void) close (master);
-+ return (-1);
-+ }
-+
-+ slave = open (line, O_RDWR);
-+ if (slave < 0)
-+ {
-+ (void) close (master);
-+ return (-1);
-+ }
-+
-+ if (amaster)
-+ *amaster = master;
-+
-+ if (name)
-+ strcpy (name, line);
-+
-+ if (termp)
-+ (void) tcsetattr(slave, TCSAFLUSH, termp);
-+
-+ if (winp)
-+ (void) ioctl(slave, TIOCSWINSZ, (char *) winp);
-+
-+ pid = fork ();
-+ switch (pid)
-+ {
-+ case -1:
-+ (void) close (slave);
-+ (void) close (master);
-+ return (-1);
-+ case 0:
-+ (void) close (master);
-+ dup2 (slave, STDIN_FILENO);
-+ dup2 (slave, STDOUT_FILENO);
-+ dup2 (slave, STDERR_FILENO);
-+ return (0);
-+ default:
-+ (void) close (slave);
-+ return (pid);
-+ }
-+
-+ (void) close (master);
-+ return (-1);
-+}
-+#else
-+#define _forkpty forkpty
-+#endif
-+
- static void
- gst_auth_display_error_message (GstTool *tool, gchar *primary_text, gchar *secondary_text)
- {
-@@ -125,7 +201,7 @@ gst_auth_run_term (GstTool *tool, gchar
- int p[2];
-
- pipe (p);
-- tool->backend_pid = forkpty (&tool->write_fd, NULL, NULL, NULL);
-+ tool->backend_pid = _forkpty (&tool->write_fd, NULL, NULL, NULL);
-
- if (tool->backend_pid < 0) {
- gst_auth_display_error_message (tool,
-@@ -142,12 +218,12 @@ gst_auth_run_term (GstTool *tool, gchar
- unsetenv("LANG");
- unsetenv("LANGUAGE");
-
-- dup2 (p[1], 1);
-- dup2 (p[1], 2);
-+ dup2 (p[1], STDOUT_FILENO);
-+ dup2 (p[1], STDERR_FILENO);
- close (p[0]);
-
- execv (args[0], args);
-- exit (255);
-+ _exit (255);
- } else {
- #ifndef __FreeBSD__
- /* Linux's su works ok with echo disabling */
diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c
deleted file mode 100644
index 9aaef15..0000000
--- a/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/common/gst-tool.c.orig Tue Jun 21 15:07:05 2005
-+++ src/common/gst-tool.c Wed Jul 6 01:28:22 2005
-@@ -598,7 +598,14 @@ gst_tool_kill_backend_cb (GstDirectiveEn
- if (tool->root_access == ROOT_ACCESS_SIMULATED_DISABLED)
- tool->root_access = ROOT_ACCESS_SIMULATED;
-
-+#if 0
-+ /*
-+ * We do not need to wait for the tool,
-+ * as it will get SIGPIPE anyway.
-+ * This waitpid causes problems on FreeBSD.
-+ */
- waitpid (tool->backend_pid, NULL, 0);
-+#endif
- }
- }
-
-@@ -1655,7 +1662,7 @@ poll_backend (GstTool *tool)
- struct pollfd fd;
-
- fd.fd = tool->read_fd;
-- fd.events = POLLIN || POLLPRI;
-+ fd.events = POLLIN | POLLPRI;
-
- while (poll (&fd, 1, 100) <= 0) {
- while (gtk_events_pending ())
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 3f9b6a1..48f75de 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -7,137 +7,133 @@ lib/nautilus/extensions-1.0/libnautilus-gst-shares.a
lib/nautilus/extensions-1.0/libnautilus-gst-shares.la
lib/nautilus/extensions-1.0/libnautilus-gst-shares.so
libdata/pkgconfig/gnome-system-tools.pc
-%%DATADIR%%/interfaces/boot.glade
-%%DATADIR%%/interfaces/common.glade
-%%DATADIR%%/interfaces/disks.glade
-%%DATADIR%%/interfaces/network.glade
-%%DATADIR%%/interfaces/services.glade
-%%DATADIR%%/interfaces/shares.glade
-%%DATADIR%%/interfaces/time.glade
-%%DATADIR%%/interfaces/users.glade
-%%DATADIR%%/pixmaps/16_ethernet.xpm
-%%DATADIR%%/pixmaps/16_loopback.xpm
-%%DATADIR%%/pixmaps/16_plip.xpm
-%%DATADIR%%/pixmaps/16_ppp.xpm
-%%DATADIR%%/pixmaps/archlinux.png
-%%DATADIR%%/pixmaps/black_panther.png
-%%DATADIR%%/pixmaps/boot.png
-%%DATADIR%%/pixmaps/computer.png
-%%DATADIR%%/pixmaps/conectiva.png
-%%DATADIR%%/pixmaps/connection-ethernet.png
-%%DATADIR%%/pixmaps/connection-modem.png
-%%DATADIR%%/pixmaps/debian.png
-%%DATADIR%%/pixmaps/disks.png
-%%DATADIR%%/pixmaps/fedora.png
-%%DATADIR%%/pixmaps/freebsd.png
-%%DATADIR%%/pixmaps/gentoo.png
-%%DATADIR%%/pixmaps/gnome-dev-cdrom-data.png
-%%DATADIR%%/pixmaps/gnome-dev-cdrom-mixed.png
-%%DATADIR%%/pixmaps/irda-16.png
-%%DATADIR%%/pixmaps/irda-48.png
-%%DATADIR%%/pixmaps/mandrake.png
-%%DATADIR%%/pixmaps/nameresolution.png
-%%DATADIR%%/pixmaps/nameresolution_alias.png
-%%DATADIR%%/pixmaps/nameresolution_id.png
-%%DATADIR%%/pixmaps/network.png
-%%DATADIR%%/pixmaps/openna.png
-%%DATADIR%%/pixmaps/pld.png
-%%DATADIR%%/pixmaps/plip-48.png
-%%DATADIR%%/pixmaps/ppp.png
-%%DATADIR%%/pixmaps/reading.png
-%%DATADIR%%/pixmaps/redhat.png
-%%DATADIR%%/pixmaps/server.png
-%%DATADIR%%/pixmaps/services.png
-%%DATADIR%%/pixmaps/settings.png
-%%DATADIR%%/pixmaps/shares.png
-%%DATADIR%%/pixmaps/slackware.png
-%%DATADIR%%/pixmaps/specifix.png
-%%DATADIR%%/pixmaps/suse.png
-%%DATADIR%%/pixmaps/talk-userlist.png
-%%DATADIR%%/pixmaps/time.png
-%%DATADIR%%/pixmaps/timezone.png
-%%DATADIR%%/pixmaps/turbolinux.png
-%%DATADIR%%/pixmaps/unsupported-distro.png
-%%DATADIR%%/pixmaps/users-groups.png
-%%DATADIR%%/pixmaps/users.png
-%%DATADIR%%/pixmaps/vidalinux.png
-%%DATADIR%%/pixmaps/vine.png
-%%DATADIR%%/pixmaps/wavelan-16.png
-%%DATADIR%%/pixmaps/wavelan-48.png
-%%DATADIR%%/pixmaps/world_map-960.png
share/gnome/applications/network.desktop
share/gnome/applications/services.desktop
share/gnome/applications/shares.desktop
share/gnome/applications/time.desktop
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/gnome-system-tools/interfaces/boot.glade
+share/gnome/gnome-system-tools/interfaces/common.glade
+share/gnome/gnome-system-tools/interfaces/disks.glade
+share/gnome/gnome-system-tools/interfaces/network.glade
+share/gnome/gnome-system-tools/interfaces/services.glade
+share/gnome/gnome-system-tools/interfaces/shares.glade
+share/gnome/gnome-system-tools/interfaces/time.glade
+share/gnome/gnome-system-tools/interfaces/users.glade
+share/gnome/gnome-system-tools/pixmaps/world_map-960.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/network-admin/fr/figures/network-tool.png
+share/gnome/help/network-admin/fr/network-admin.xml
+share/gnome/help/network-admin/sv/figures/network-tool.png
+share/gnome/help/network-admin/sv/network-admin.xml
share/gnome/help/services-admin/C/figures/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/fr/figures/services-tool.png
+share/gnome/help/services-admin/fr/services-admin.xml
share/gnome/help/services-admin/nl/figures/service-properties.png
share/gnome/help/services-admin/nl/figures/services-tool.png
share/gnome/help/services-admin/nl/legal.xml
share/gnome/help/services-admin/nl/services-admin.xml
+share/gnome/help/services-admin/sv/figures/services-tool.png
+share/gnome/help/services-admin/sv/services-admin.xml
+share/gnome/help/shares-admin/C/figures/shares-tool.png
+share/gnome/help/shares-admin/C/legal.xml
+share/gnome/help/shares-admin/C/shares-admin.xml
+share/gnome/help/shares-admin/sv/figures/shares-tool.png
+share/gnome/help/shares-admin/sv/shares-admin.xml
share/gnome/help/time-admin/C/figures/time-map.png
share/gnome/help/time-admin/C/figures/time-servers.png
-share/gnome/help/time-admin/C/figures/time-tool.png
+share/gnome/help/time-admin/C/figures/time-tool-automatic.png
+share/gnome/help/time-admin/C/figures/time-tool-manual.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/figures/time-tool-automatic.png
+share/gnome/help/time-admin/es/figures/time-tool-manual.png
share/gnome/help/time-admin/es/time-admin.xml
+share/gnome/help/time-admin/fr/figures/time-map.png
+share/gnome/help/time-admin/fr/figures/time-servers.png
+share/gnome/help/time-admin/fr/figures/time-tool-automatic.png
+share/gnome/help/time-admin/fr/figures/time-tool-manual.png
+share/gnome/help/time-admin/fr/time-admin.xml
share/gnome/help/time-admin/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
share/gnome/help/time-admin/nl/legal.xml
share/gnome/help/time-admin/nl/time-admin.xml
+share/gnome/help/time-admin/ru/figures/time-map.png
+share/gnome/help/time-admin/ru/figures/time-servers.png
+share/gnome/help/time-admin/ru/figures/time-tool-automatic.png
+share/gnome/help/time-admin/ru/figures/time-tool-manual.png
+share/gnome/help/time-admin/ru/time-admin.xml
+share/gnome/help/time-admin/sv/figures/time-map.png
+share/gnome/help/time-admin/sv/figures/time-servers.png
+share/gnome/help/time-admin/sv/figures/time-tool-automatic.png
+share/gnome/help/time-admin/sv/figures/time-tool-manual.png
+share/gnome/help/time-admin/sv/time-admin.xml
share/gnome/help/users-admin/C/figures/users-tool.png
share/gnome/help/users-admin/C/legal.xml
share/gnome/help/users-admin/C/users-admin.xml
share/gnome/help/users-admin/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/help/users-admin/fr/figures/users-tool.png
+share/gnome/help/users-admin/fr/users-admin.xml
+share/gnome/help/users-admin/ru/figures/users-tool.png
+share/gnome/help/users-admin/ru/users-admin.xml
+share/gnome/help/users-admin/sv/figures/users-tool.png
+share/gnome/help/users-admin/sv/users-admin.xml
share/gnome/omf/gnome-system-tools/services-admin-nl.omf
share/gnome/omf/gnome-system-tools/time-admin-nl.omf
share/gnome/omf/network-admin/network-admin-C.omf
share/gnome/omf/network-admin/network-admin-es.omf
+share/gnome/omf/network-admin/network-admin-fr.omf
+share/gnome/omf/network-admin/network-admin-sv.omf
share/gnome/omf/services-admin/services-admin-C.omf
share/gnome/omf/services-admin/services-admin-es.omf
+share/gnome/omf/services-admin/services-admin-fr.omf
+share/gnome/omf/services-admin/services-admin-sv.omf
+share/gnome/omf/shares-admin/shares-admin-C.omf
+share/gnome/omf/shares-admin/shares-admin-sv.omf
share/gnome/omf/time-admin/time-admin-C.omf
share/gnome/omf/time-admin/time-admin-es.omf
+share/gnome/omf/time-admin/time-admin-fr.omf
+share/gnome/omf/time-admin/time-admin-ru.omf
+share/gnome/omf/time-admin/time-admin-sv.omf
share/gnome/omf/users-admin/users-admin-C.omf
share/gnome/omf/users-admin/users-admin-es.omf
+share/gnome/omf/users-admin/users-admin-fr.omf
+share/gnome/omf/users-admin/users-admin-ru.omf
+share/gnome/omf/users-admin/users-admin-sv.omf
+share/icons/hicolor/48x48/devices/irda.png
+share/icons/hicolor/48x48/devices/plip.png
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
+share/locale/be/LC_MESSAGES/gnome-system-tools.mo
share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-system-tools.mo
share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
share/locale/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/dz/LC_MESSAGES/gnome-system-tools.mo
share/locale/el/LC_MESSAGES/gnome-system-tools.mo
share/locale/en_CA/LC_MESSAGES/gnome-system-tools.mo
share/locale/en_GB/LC_MESSAGES/gnome-system-tools.mo
share/locale/es/LC_MESSAGES/gnome-system-tools.mo
share/locale/et/LC_MESSAGES/gnome-system-tools.mo
share/locale/eu/LC_MESSAGES/gnome-system-tools.mo
+share/locale/fa/LC_MESSAGES/gnome-system-tools.mo
share/locale/fi/LC_MESSAGES/gnome-system-tools.mo
share/locale/fr/LC_MESSAGES/gnome-system-tools.mo
share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
@@ -150,10 +146,12 @@ share/locale/hu/LC_MESSAGES/gnome-system-tools.mo
share/locale/id/LC_MESSAGES/gnome-system-tools.mo
share/locale/it/LC_MESSAGES/gnome-system-tools.mo
share/locale/ja/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ka/LC_MESSAGES/gnome-system-tools.mo
share/locale/ko/LC_MESSAGES/gnome-system-tools.mo
share/locale/ku/LC_MESSAGES/gnome-system-tools.mo
share/locale/lt/LC_MESSAGES/gnome-system-tools.mo
share/locale/lv/LC_MESSAGES/gnome-system-tools.mo
+share/locale/mg/LC_MESSAGES/gnome-system-tools.mo
share/locale/mk/LC_MESSAGES/gnome-system-tools.mo
share/locale/ml/LC_MESSAGES/gnome-system-tools.mo
share/locale/mn/LC_MESSAGES/gnome-system-tools.mo
@@ -162,7 +160,7 @@ share/locale/nb/LC_MESSAGES/gnome-system-tools.mo
share/locale/ne/LC_MESSAGES/gnome-system-tools.mo
share/locale/nl/LC_MESSAGES/gnome-system-tools.mo
share/locale/nn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/no/LC_MESSAGES/gnome-system-tools.mo
+share/locale/or/LC_MESSAGES/gnome-system-tools.mo
share/locale/pa/LC_MESSAGES/gnome-system-tools.mo
share/locale/pl/LC_MESSAGES/gnome-system-tools.mo
share/locale/pt/LC_MESSAGES/gnome-system-tools.mo
@@ -185,44 +183,112 @@ 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
+@dirrm share/locale/zh_TW/LC_MESSAGES
+@dirrm share/locale/zh_TW
+@dirrm share/locale/zh_HK/LC_MESSAGES
+@dirrm share/locale/zh_HK
+@dirrm share/locale/zh_CN/LC_MESSAGES
+@dirrm share/locale/zh_CN
+@dirrm share/locale/xh/LC_MESSAGES
+@dirrm share/locale/xh
+@dirrm share/locale/uk/LC_MESSAGES
+@dirrm share/locale/uk
+@dirrm share/locale/sr/LC_MESSAGES
+@dirrm share/locale/sr
+@dirrm share/locale/sk/LC_MESSAGES
+@dirrm share/locale/sk
+@dirrm share/locale/rw/LC_MESSAGES
+@dirrm share/locale/rw
+@dirrm share/locale/ro/LC_MESSAGES
+@dirrm share/locale/ro
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+@dirrm share/locale/nn/LC_MESSAGES
+@dirrm share/locale/nn
+@dirrm share/locale/ne/LC_MESSAGES
+@dirrm share/locale/ne
+@dirrm share/locale/mg/LC_MESSAGES
+@dirrm share/locale/mg
+@dirrm share/locale/ku/LC_MESSAGES
+@dirrm share/locale/ku
+@dirrm share/locale/ko/LC_MESSAGES
+@dirrm share/locale/ko
+@dirrm share/locale/gl/LC_MESSAGES
+@dirrm share/locale/gl
+@dirrm share/locale/fi/LC_MESSAGES
+@dirrm share/locale/fi
+@dirrm share/locale/el/LC_MESSAGES
+@dirrm share/locale/el
+@dirrm share/locale/dz/LC_MESSAGES
+@dirrm share/locale/dz
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@dirrm share/locale/ca/LC_MESSAGES
+@dirrm share/locale/ca
+@dirrm share/locale/bn_IN/LC_MESSAGES
+@dirrm share/locale/bn_IN
+@dirrm share/locale/be/LC_MESSAGES
+@dirrm share/locale/be
@dirrm share/gnome/omf/users-admin
@dirrm share/gnome/omf/time-admin
+@dirrm share/gnome/omf/shares-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/sv/figures
+@dirrm share/gnome/help/users-admin/sv
+@dirrm share/gnome/help/users-admin/ru/figures
+@dirrm share/gnome/help/users-admin/ru
+@dirrm share/gnome/help/users-admin/fr/figures
+@dirrm share/gnome/help/users-admin/fr
@dirrm share/gnome/help/users-admin/es/figures
@dirrm share/gnome/help/users-admin/es
+@dirrm share/gnome/help/users-admin/C/figures
+@dirrm share/gnome/help/users-admin/C
@dirrm share/gnome/help/users-admin
+@dirrm share/gnome/help/time-admin/sv/figures
+@dirrm share/gnome/help/time-admin/sv
+@dirrm share/gnome/help/time-admin/ru/figures
+@dirrm share/gnome/help/time-admin/ru
@dirrm share/gnome/help/time-admin/nl/figures
@dirrm share/gnome/help/time-admin/nl
+@dirrm share/gnome/help/time-admin/fr/figures
+@dirrm share/gnome/help/time-admin/fr
@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/shares-admin/sv/figures
+@dirrm share/gnome/help/shares-admin/sv
+@dirrm share/gnome/help/shares-admin/C/figures
+@dirrm share/gnome/help/shares-admin/C
+@dirrm share/gnome/help/shares-admin
+@dirrm share/gnome/help/services-admin/sv/figures
+@dirrm share/gnome/help/services-admin/sv
@dirrm share/gnome/help/services-admin/nl/figures
@dirrm share/gnome/help/services-admin/nl
+@dirrm share/gnome/help/services-admin/fr/figures
+@dirrm share/gnome/help/services-admin/fr
@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/sv/figures
+@dirrm share/gnome/help/network-admin/sv
+@dirrm share/gnome/help/network-admin/fr/figures
+@dirrm share/gnome/help/network-admin/fr
@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
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/interfaces
-@dirrm %%DATADIR%%
+@dirrm share/gnome/gnome-system-tools/pixmaps
+@dirrm share/gnome/gnome-system-tools/interfaces
+@dirrm share/gnome/gnome-system-tools
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -245,12 +311,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
@dirrmtry share/locale/pt
@dirrmtry share/locale/pl/LC_MESSAGES
@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
@dirrmtry share/locale/nn/LC_MESSAGES
@dirrmtry share/locale/nn
@dirrmtry share/locale/ne/LC_MESSAGES
@dirrmtry share/locale/ne
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/ko/LC_MESSAGES
@@ -261,7 +327,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
@dirrmtry share/locale/fi
@dirrmtry share/locale/el/LC_MESSAGES
@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
index 2700067..a78e643 100644
--- a/sysutils/gnome-volume-manager/Makefile
+++ b/sysutils/gnome-volume-manager/Makefile
@@ -3,12 +3,12 @@
# Whom: Jean-Yves Lefort <jylefort@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.7 2006/09/15 05:50:19 marcus Exp $
+# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.13 2007/03/09 22:15:17 mezz Exp $
#
PORTNAME= gnome-volume-manager
-PORTVERSION= 2.15.0
-PORTREVISION= 2
+PORTVERSION= 2.17.0
+PORTREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/gnome-volume-manager/distinfo b/sysutils/gnome-volume-manager/distinfo
index 9b0f0ca..a3b7541 100644
--- a/sysutils/gnome-volume-manager/distinfo
+++ b/sysutils/gnome-volume-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-volume-manager-2.15.0.tar.bz2) = d723bc2069fd19cf1c31961fbc1cf3c8
-SHA256 (gnome-volume-manager-2.15.0.tar.bz2) = f3d2ce3e2f2a4b757d4688bae7f6b8418d11340618f15d34871a002516ab8e0e
-SIZE (gnome-volume-manager-2.15.0.tar.bz2) = 318479
+MD5 (gnome-volume-manager-2.17.0.tar.bz2) = 104cec26e721e0bba69debd392367195
+SHA256 (gnome-volume-manager-2.17.0.tar.bz2) = 5517cf5d6a70227d66afb9a8b97a704f0d8e29098cec98bcbf68da77133537a9
+SIZE (gnome-volume-manager-2.17.0.tar.bz2) = 341241
diff --git a/sysutils/gnome-volume-manager/files/patch-src_manager.c b/sysutils/gnome-volume-manager/files/patch-src_manager.c
index 753b495..a847dd4 100644
--- a/sysutils/gnome-volume-manager/files/patch-src_manager.c
+++ b/sysutils/gnome-volume-manager/files/patch-src_manager.c
@@ -1,5 +1,5 @@
---- src/manager.c.orig Mon Jul 31 16:37:36 2006
-+++ src/manager.c Wed Dec 20 14:59:45 2006
+--- src/manager.c.orig Tue Nov 7 13:01:17 2006
++++ src/manager.c Sun Dec 31 15:33:44 2006
@@ -23,9 +23,12 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -13,54 +13,220 @@
#include <locale.h>
-@@ -3088,10 +3091,17 @@ gvm_local_user (void)
- struct utmp *utmp;
- const char *user;
- size_t ulen;
+@@ -1556,12 +1559,27 @@ enum {
+ MOUNT_UID = (1 << 15),
+ MOUNT_UMASK = (1 << 16),
+ MOUNT_UTF8 = (1 << 17),
++ MOUNT_LOCALE = (1 << 18),
++ MOUNT_LONGNAME = (1 << 19),
+ };
+
+ static struct {
+ const char *name;
+ guint32 flag;
+ } mount_options[] = {
++#ifdef __FreeBSD__
++ { "-D=", MOUNT_CODEPAGE }, /* vfat */
++ { "-M=", MOUNT_DMASK }, /* vfat */
++ { "-m=", MOUNT_FMASK }, /* vfat, ntfs */
++ { "-L=", MOUNT_LOCALE }, /* vfat */
++ { "-C=", MOUNT_IOCHARSET }, /* ntfs, ios9660 */
++ { "noatime", MOUNT_NOATIME },
++ { "noexec", MOUNT_NOEXEC },
++ { "ro", MOUNT_READ_ONLY },
++ { "longnames", MOUNT_LONGNAME }, /* vfat */
++ { "sync", MOUNT_SYNC },
++ { "-u=", MOUNT_UID }, /* vfat, ntfs */
++#else
+ { "codepage=", MOUNT_CODEPAGE }, /* vfat */
+ { "data=", MOUNT_DATA }, /* ext3 */
+ { "dirsync", MOUNT_DIRSYNC },
+@@ -1580,6 +1598,7 @@ static struct {
+ { "uid=", MOUNT_UID }, /* vfat, ntfs, udf, iso9660 */
+ { "umask=", MOUNT_UMASK }, /* vfat, ntfs, udf */
+ { "utf8", MOUNT_UTF8 }, /* vfat, iso9660 */
++#endif
+ };
+
+
+@@ -1760,10 +1779,17 @@ gvm_mount_options (GPtrArray *options, g
+ g_slist_free_1 (l);
+ }
+
++#ifndef __FreeBSD__
+ if (opts & MOUNT_UID) {
+ option = g_strdup_printf ("uid=%u", getuid ());
+ g_ptr_array_add (options, option);
+ }
++#else
++ if (opts & MOUNT_UID && (!strcmp (where, "vfat") || !strcmp (where, "ntfs"))) {
++ option = g_strdup_printf ("u=%u", getuid ());
++ g_ptr_array_add (options, option);
++ }
++#endif
+
+ return TRUE;
+ }
+@@ -1813,7 +1839,7 @@ gvm_device_mount (const char *udi, gbool
+
+ return retval;
+ } else {
+- char *mount_point, *fstype, *drive, **moptions, fmask_opt[12], *charset_opt = NULL;
++ char *mount_point, *fstype, *drive, **moptions, fmask_opt[12], *charset_opt = NULL, *locale_opt = NULL;
+ DBusMessage *dmesg, *reply;
+ gboolean freev = FALSE;
+ GPtrArray *options;
+@@ -1893,21 +1919,86 @@ gvm_device_mount (const char *udi, gbool
+
+ if (opts & MOUNT_FMASK) {
+ mask = umask (0);
++#ifdef __FreeBSD__
++ snprintf (fmask_opt, sizeof (fmask_opt), "-m=%#o", mask | 0111);
++#else
+ snprintf (fmask_opt, sizeof (fmask_opt), "fmask=%#o", mask | 0111);
++#endif
+ g_ptr_array_add (options, fmask_opt);
+ umask (mask);
+ }
+
+ if (opts & MOUNT_SHORTNAME)
+ g_ptr_array_add (options, "shortname=lower");
++ if (opts & MOUNT_LONGNAME)
++ g_ptr_array_add (options, "longnames");
++
++ if (opts & MOUNT_LOCALE) {
++ char *locale;
++
++ locale = setlocale(LC_ALL, NULL);
++ if (!locale)
++ locale = getenv("LANG");
++ if (locale) {
++
++ locale_opt = g_strdup_printf ("-L=%s", locale);
++ g_ptr_array_add (options, locale_opt);
++ }
++ }
++
++#ifdef __FreeBSD__
++ if (opts & MOUNT_CODEPAGE) {
++ if ((iocharset = gvm_iocharset ())) {
++ charset_opt = g_strdup_printf ("-D=%s", iocharset);
++ g_ptr_array_add (options, charset_opt);
++ }
++ }
++
++ if (opts & MOUNT_UID) {
++ snprintf (uid, sizeof (uid) - 1, "-u=%s", getuid ());
++ g_ptr_array_add (options, uid);
++ }
++#endif
+ } else if (!strcmp (fstype, "iso9660")) {
+ /* only care about uid= and iocharset= */
++#ifdef __FreeBSD__
++ if (opts & MOUNT_IOCHARSET) {
++ if ((iocharset = gvm_iocharset ())) {
++ charset_opt = g_strdup_printf ("-C=%s", iocharset);
++ g_ptr_array_add (options, charset_opt);
++ }
++ }
++#endif
+ } else if (!strcmp (fstype, "udf")) {
+ /* also care about uid= and iocharset= */
+ if (opts & MOUNT_NOATIME)
+ g_ptr_array_add (options, "noatime");
++#ifdef __FreeBSD__
++ if (opts & MOUNT_IOCHARSET) {
++ if ((iocharset = gvm_iocharset ())) {
++ charset_opt = g_strdup_printf ("-C=%s", iocharset);
++ g_ptr_array_add (options, charset_opt);
++ }
++ }
++#endif
++ } else if (!strcmp (fstype, "ntfs")) {
++ /* only care about uid= and iocharset= */
++#ifdef __FreeBSD__
++ if (opts & MOUNT_IOCHARSET) {
++ if ((iocharset = gvm_iocharset ())) {
++ charset_opt = g_strdup_printf ("-C=%s", iocharset);
++ g_ptr_array_add (options, charset_opt);
++ }
++ }
++
++ if (opts & MOUNT_UID) {
++ snprintf (uid, sizeof (uid) - 1, "-u=%s", getuid ());
++ g_ptr_array_add (options, uid);
++ }
++#endif
+ }
+
++#ifndef __FreeBSD__
+ if (opts & (MOUNT_IOCHARSET|MOUNT_UTF8)) {
+ if ((iocharset = gvm_iocharset ())) {
+ if ((opts & MOUNT_UTF8) && !strcmp (iocharset, "utf8")) {
+@@ -1923,6 +2014,7 @@ gvm_device_mount (const char *udi, gbool
+ snprintf (uid, sizeof (uid) - 1, "uid=%u", getuid ());
+ g_ptr_array_add (options, uid);
+ }
++#endif
+
+ libhal_free_string (fstype);
+ }
+@@ -1947,6 +2039,7 @@ gvm_device_mount (const char *udi, gbool
+
+ g_ptr_array_free (options, TRUE);
+ g_free (charset_opt);
++ g_free (locale_opt);
+
+ policy = g_new (struct _MountPolicy, 1);
+ policy->udi = g_strdup (udi);
+@@ -3185,6 +3278,12 @@ gvm_local_user (void)
+ size_t n;
+ DIR *dir;
+ int vt;
+#ifndef __linux__
+ int bytes, fd;
+ struct stat sb;
+ struct utmp buf[1024];
-+ long len;
++ size_t len;
+#endif
- user = g_get_user_name ();
- ulen = strlen (user);
+ if (local & LOCAL_USER_CHECKED)
+ return (local & LOCAL_USER_FOUND);
+@@ -3208,6 +3307,7 @@ gvm_local_user (void)
-+#ifdef __linux__
- setutent ();
+ fallback:
- while (!local && (utmp = getutent ())) {
-@@ -3103,7 +3113,31 @@ gvm_local_user (void)
++#ifdef __linux__
+ if (!(local & LOCAL_USER_FOUND)) {
+ setutent ();
+
+@@ -3222,6 +3322,29 @@ gvm_local_user (void)
+
+ endutent ();
}
-
- endutent ();
--
+#else
+ if ((fd = open (_PATH_WTMP, O_RDONLY, 0)) < 0 || fstat(fd, &sb) == -1) {
+ close (fd);
+ return TRUE;
+ }
++
+ len = (sb.st_size + sizeof(buf) - 1) / sizeof(buf);
+
+ while (!local && --len >= 0) {
+ if (lseek(fd, (off_t) (len * sizeof(buf)), L_SET) == -1 ||
-+ (bytes = read (fd, buf, sizeof(buf))) == -1) {
++ (bytes = read (fd, buf, sizeof(buf))) == -1) {
+ close (fd);
+ return TRUE;
+ }
+ for (utmp = &buf[bytes / sizeof(buf[0]) - 1]; !local && utmp >= buf; --utmp) {
-+ if (!utmp->ut_name[0] || strncmp (utmp->ut_name, user, ulen) != 0)
++ if (!utmp->ut_name[0] || strncmp (utmp->ut_name, user, n) != 0)
+ continue;
-+ local = utmp->ut_line[0] == ':' && utmp->ut_line[1] >= '0' && utmp->ut_line[1] <= '9';
-+ if (!local)
-+ /* Handle vty logins */
-+ local = strlen(utmp->ut_line) > 4 && strncmp(utmp->ut_line, "ttyv", 4) == 0 && utmp->ut_line[4] >= '0' && utmp->ut_line[4] <= '9';
++ local = utmp->ut_line[0] == ':' && utmp->ut_line[1] >= '0' && utmp->ut_line[1] <= '9' || !strncmp (utmp->ut_line, "ttyv", 4) ? LOCAL_USER_FOUND : 0;
+ }
+ }
+
+ close (fd);
+#endif
- return local;
- }
-
+
+ local |= LOCAL_USER_CHECKED;
+
diff --git a/sysutils/gnome-volume-manager/pkg-plist b/sysutils/gnome-volume-manager/pkg-plist
index c26bce9..03aa400 100644
--- a/sysutils/gnome-volume-manager/pkg-plist
+++ b/sysutils/gnome-volume-manager/pkg-plist
@@ -38,9 +38,12 @@ share/locale/it/LC_MESSAGES/gnome-volume-manager.mo
share/locale/ja/LC_MESSAGES/gnome-volume-manager.mo
share/locale/ka/LC_MESSAGES/gnome-volume-manager.mo
share/locale/ko/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ku/LC_MESSAGES/gnome-volume-manager.mo
share/locale/lt/LC_MESSAGES/gnome-volume-manager.mo
share/locale/lv/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/mg/LC_MESSAGES/gnome-volume-manager.mo
share/locale/mk/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ml/LC_MESSAGES/gnome-volume-manager.mo
share/locale/mn/LC_MESSAGES/gnome-volume-manager.mo
share/locale/ms/LC_MESSAGES/gnome-volume-manager.mo
share/locale/nb/LC_MESSAGES/gnome-volume-manager.mo
@@ -56,6 +59,7 @@ share/locale/ro/LC_MESSAGES/gnome-volume-manager.mo
share/locale/ru/LC_MESSAGES/gnome-volume-manager.mo
share/locale/rw/LC_MESSAGES/gnome-volume-manager.mo
share/locale/sk/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/sl/LC_MESSAGES/gnome-volume-manager.mo
share/locale/sq/LC_MESSAGES/gnome-volume-manager.mo
share/locale/sr/LC_MESSAGES/gnome-volume-manager.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-volume-manager.mo
@@ -84,6 +88,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo
@dirrmtry share/locale/uk
@dirrmtry share/locale/sr/LC_MESSAGES
@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
@dirrmtry share/locale/sk/LC_MESSAGES
@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@@ -98,6 +104,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo
@dirrmtry share/locale/nn
@dirrmtry share/locale/ne/LC_MESSAGES
@dirrmtry share/locale/ne
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrmtry share/locale/ko/LC_MESSAGES
@dirrmtry share/locale/ko
@dirrmtry share/locale/gl/LC_MESSAGES
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index b5d283d..8191ee8 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.114 2006/10/03 13:26:18 ahze Exp $
+# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.128 2007/03/12 20:33:36 mezz Exp $
#
PORTNAME= nautilus-cd-burner
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index eca8e99..d82a3dc 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-cd-burner-2.16.3.tar.bz2) = 6e3653c849e24aacd7e29b4030327b4e
-SHA256 (gnome2/nautilus-cd-burner-2.16.3.tar.bz2) = 9a71004a13a9fd63d3e0de05da1f3bc49f9d70e15dab59e4ac4c66ad33db987d
-SIZE (gnome2/nautilus-cd-burner-2.16.3.tar.bz2) = 719549
+MD5 (gnome2/nautilus-cd-burner-2.18.0.tar.bz2) = 90b71393db1d78c7d5ab2e740f2f1678
+SHA256 (gnome2/nautilus-cd-burner-2.18.0.tar.bz2) = 2d79ba86263e2ae79d90e589276ff502632192ef21c28223ca2d9555d80d4249
+SIZE (gnome2/nautilus-cd-burner-2.18.0.tar.bz2) = 732896
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index 37773d4..47a18e6 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -71,6 +71,7 @@ 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/ku/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/mg/LC_MESSAGES/nautilus-cd-burner.mo
@@ -145,6 +146,8 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
@dirrmtry share/locale/ne
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrmtry share/locale/ko/LC_MESSAGES
@dirrmtry share/locale/ko
@dirrmtry share/locale/hy/LC_MESSAGES
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 00d03fe..990ed3b 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -3,26 +3,32 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.21 2006/07/27 03:59:24 marcus Exp $
+# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.34 2007/03/12 12:25:41 ahze Exp $
#
PORTNAME= system-tools-backends
-PORTVERSION= 1.4.2
-PORTREVISION= 3
+PORTVERSION= 2.2.0
CATEGORIES= sysutils 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= Backend system admin scripts for gnome-system-tools
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
+
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
-USE_GETTEXT= yes
-USE_GNOME= gnomehack gnometarget intlhack
+USE_GNOME= gnomehack intlhack glib20
GNU_CONFIGURE= yes
+USE_RC_SUBR= system-tools-backends
+USE_GNOME_SUBR= yes
+CONFIGURE_ARGS= --with-stb-group=wheel \
+ --localstatedir=/var
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -32,10 +38,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
-.if ${PERL_LEVEL} < 500600
-post-configure:
- @${FIND} ${WRKSRC} \( -name "*.pl" -or -name "*-conf" \) | \
- ${XARGS} ${REINPLACE_CMD} -e 's|@scriptsdir|[@]scriptsdir|g'
-.endif
-
.include <bsd.port.post.mk>
diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo
index 44f7838..845364e 100644
--- a/sysutils/system-tools-backends/distinfo
+++ b/sysutils/system-tools-backends/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/system-tools-backends-1.4.2.tar.bz2) = a0af1513becdf3b9bfed3535ad8f7dab
-SHA256 (gnome2/system-tools-backends-1.4.2.tar.bz2) = 32762567ece8c0ab59dc1b2186ee8cfeac6d1f92574dfb3011483431135d8940
-SIZE (gnome2/system-tools-backends-1.4.2.tar.bz2) = 708733
+MD5 (gnome2/system-tools-backends-2.2.0.tar.bz2) = c22888cd0d6de02601d014215959f4d0
+SHA256 (gnome2/system-tools-backends-2.2.0.tar.bz2) = 76f9e9dc58324bc24944b321593a85e518467fa7a77c8fe7ad96ff4a5aff0c36
+SIZE (gnome2/system-tools-backends-2.2.0.tar.bz2) = 409025
diff --git a/sysutils/system-tools-backends/files/patch-network-conf.in b/sysutils/system-tools-backends/files/patch-network-conf.in
deleted file mode 100644
index 51f4ac2..0000000
--- a/sysutils/system-tools-backends/files/patch-network-conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- network-conf.in.orig Sun Nov 20 20:27:32 2005
-+++ network-conf.in Mon Nov 28 13:34:34 2005
-@@ -75,7 +75,7 @@
- "conectiva-9", "conectiva-10",
- "vine-3.0", "vine-3.1",
- "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0",
-- "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6");
-+ "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "freebsd-7");
-
- $description =<<"end_of_description;";
- Configures all network parameters and interfaces.
diff --git a/sysutils/system-tools-backends/files/patch-network.pl.in b/sysutils/system-tools-backends/files/patch-network.pl.in
deleted file mode 100644
index 9820ac4..0000000
--- a/sysutils/system-tools-backends/files/patch-network.pl.in
+++ /dev/null
@@ -1,97 +0,0 @@
---- network.pl.in.orig Thu Jul 6 16:43:53 2006
-+++ network.pl.in Thu Jul 6 16:48:47 2006
-@@ -94,7 +94,7 @@
- my ($fd, $line, $iface);
- my (@ifaces, $command);
-
-- $command = &gst_file_get_cmd_path ("iwconfig");
-+ $command = &gst_file_get_cmd_path ("ifconfig");
- open $fd, "$command |";
- return @ifaces if $fd eq undef;
-
-@@ -117,6 +117,38 @@
- return \@ifaces;
- }
-
-+sub gst_network_get_freebsd_ethernet_ifaces
-+{
-+ my ($fd, $line, $iface);
-+ my (@ifaces, $command);
-+
-+ $command = &gst_file_get_cmd_path ("ifconfig");
-+ open $fd, "$command |";
-+ return @ifaces if $fd eq undef;
-+
-+ while (<$fd>)
-+ {
-+ if (/^([a-zA-Z]+[0-9]+):/)
-+ {
-+ $iface = $1;
-+ }
-+
-+ if (/media:.*ethernet.*/i)
-+ {
-+ push @ifaces, $iface;
-+ }
-+ elsif (/ether:*/i)
-+ {
-+ push @ifaces, $iface;
-+ }
-+ }
-+
-+ &gst_file_close ($fd);
-+ &gst_report_leave ();
-+
-+ return \@ifaces;
-+}
-+
- # Returns an array with the wireless devices found
- sub gst_network_get_wireless_ifaces
- {
-@@ -126,6 +158,13 @@
- return &gst_network_get_freebsd_wireless_ifaces if ($plat eq "FreeBSD");
- }
-
-+sub gst_network_get_ethernet_ifaces
-+{
-+ my ($plat) = $$tool{"system"};
-+
-+ return &gst_network_get_freebsd_ethernet_ifaces if ($plat eq "FreeBSD");
-+}
-+
- # set of functions for enabling an interface
- sub gst_network_config_wireless
- {
-@@ -778,9 +817,21 @@
- {
- my ($dev) = @_;
- my (@wireless_ifaces, $wi, $type);
-+ my (@ethernet_ifaces, $eth, $type);
-
- return $types_cache{$dev} if (exists $types_cache{$dev});
-
-+ #check whether interface is ethernet
-+ $ethernet_ifaces = &gst_network_get_ethernet_ifaces ();
-+ foreach $eth (@$ethernet_ifaces)
-+ {
-+ if ($dev eq $eth)
-+ {
-+ $types_cache{$dev} = "ethernet";
-+ return $types_cache{$dev};
-+ }
-+ }
-+
- #check whether interface is wireless
- $wireless_ifaces = &gst_network_get_wireless_ifaces ();
- foreach $wi (@$wireless_ifaces)
-@@ -803,10 +854,6 @@
- {
- $types_cache{$dev} = "modem";
- }
-- }
-- elsif ($dev =~ /^(eth|dc|ed|bfe|em|fxp|bge|de|xl|ixgb|txp|vx|lge|nge|pcn|re|rl|sf|sis|sk|ste|ti|tl|tx|vge|vr|wb|cs|ex|ep|fe|ie|lnc|sn|xe|le|an|awi|wi|ndis|wlaue|axe|cue|kue|rue|fwe|nve)[0-9]/)
-- {
-- $types_cache{$dev} = "ethernet";
- }
- elsif ($dev =~ /^irlan[0-9]/)
- {
diff --git a/sysutils/system-tools-backends/files/patch-platform.pl.in b/sysutils/system-tools-backends/files/patch-platform.pl.in
deleted file mode 100644
index 81ad3b2..0000000
--- a/sysutils/system-tools-backends/files/patch-platform.pl.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- platform.pl.in.orig Fri Aug 26 00:56:21 2005
-+++ platform.pl.in Fri Aug 26 00:56:36 2005
-@@ -77,6 +77,7 @@
- "freebsd-4" => "FreeBSD 4",
- "freebsd-5" => "FreeBSD 5",
- "freebsd-6" => "FreeBSD 6",
-+ "freebsd-7" => "FreeBSD 7",
- "gentoo" => "Gentoo Linux",
- "vlos-1.2" => "Vida Linux OS 1.2",
- "archlinux-0.7" => "Arch Linux 0.7",
diff --git a/sysutils/system-tools-backends/files/patch-replace.pl.in b/sysutils/system-tools-backends/files/patch-replace.pl.in
deleted file mode 100644
index 9487b29..0000000
--- a/sysutils/system-tools-backends/files/patch-replace.pl.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- replace.pl.in.orig Tue Dec 21 11:17:14 2004
-+++ replace.pl.in Thu Dec 23 13:14:41 2004
-@@ -1128,7 +1128,7 @@
-
- while ($line_no < $line_end)
- {
-- delete $$buff[$line_no];
-+ splice @{$buff},$line_no,1;
- $line_no++;
- }
-
-@@ -1140,7 +1140,7 @@
-
- while ($line_no < $line_end)
- {
-- delete $$buff[$line_no];
-+ splice @{$buff},$line_no,1;
- $line_no++;
- }
- }
-@@ -1680,7 +1680,7 @@
- }
- else
- {
-- delete $$buff[$i];
-+ splice @{$buff},$i,1;
- }
- }
- }
diff --git a/sysutils/system-tools-backends/files/patch-service-list.pl.in b/sysutils/system-tools-backends/files/patch-service-list.pl.in
deleted file mode 100644
index 5590c56..0000000
--- a/sysutils/system-tools-backends/files/patch-service-list.pl.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- service-list.pl.in.orig Mon Aug 8 13:59:07 2005
-+++ service-list.pl.in Sun Nov 13 17:11:02 2005
-@@ -105,6 +105,7 @@
- "atm3\.sh",
- "ccd",
- "cleanvar",
-+ "cleartmp",
- "devdb",
- "devfs",
- "dhclient",
-@@ -139,7 +140,9 @@
- "swap1",
- "syscons",
- "sysctl",
-+ "tmp",
- "ttys",
-+ "var",
- "virecover",
- # These are the services found in SuSE
- "rc[sS0-9]\.d",
diff --git a/sysutils/system-tools-backends/files/patch-service.pl.in b/sysutils/system-tools-backends/files/patch-service.pl.in
deleted file mode 100644
index 1162f27..0000000
--- a/sysutils/system-tools-backends/files/patch-service.pl.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- service.pl.in.orig Fri Aug 26 00:57:01 2005
-+++ service.pl.in Fri Aug 26 00:57:13 2005
-@@ -227,6 +227,7 @@
-
- "freebsd-5" => "freebsd-5",
- "freebsd-6" => "freebsd-5",
-+ "freebsd-7" => "freebsd-5",
- );
-
- %runlevels=
-@@ -1571,6 +1572,7 @@
-
- "freebsd-5" => \&gst_service_rcng_get_status,
- "freebsd-6" => \&gst_service_rcng_get_status,
-+ "freebsd-7" => \&gst_service_rcng_get_status,
- );
- my $proc;
-
diff --git a/sysutils/system-tools-backends/files/patch-services-conf.in b/sysutils/system-tools-backends/files/patch-services-conf.in
deleted file mode 100644
index d665143..0000000
--- a/sysutils/system-tools-backends/files/patch-services-conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- services-conf.in.orig Mon Jan 2 10:32:34 2006
-+++ services-conf.in Fri Jan 6 01:08:21 2006
-@@ -55,7 +55,7 @@
- "pld-1.0", "pld-1.1", "pld-1.99",
- "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0",
- "vine-3.0", "vine-3.1",
-- "gentoo", "archlinux", "vlos-1.2", "freebsd-5", "freebsd-6", "suse-9.0", "suse-9.1");
-+ "gentoo", "archlinux", "vlos-1.2", "freebsd-5", "freebsd-6", "freebsd-7", "suse-9.0", "suse-9.1");
-
- $description =<<"end_of_description;";
- Configures which services are to be started or stopped at which runlevels
diff --git a/sysutils/system-tools-backends/files/patch-shares-conf.in b/sysutils/system-tools-backends/files/patch-shares-conf.in
deleted file mode 100644
index 5fa1e78..0000000
--- a/sysutils/system-tools-backends/files/patch-shares-conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- shares-conf.in.orig Fri Aug 26 00:57:50 2005
-+++ shares-conf.in Fri Aug 26 00:57:57 2005
-@@ -557,6 +557,7 @@
- "vlos-1.2" => "gentoo",
- "freebsd-5" => "freebsd-5",
- "freebsd-6" => "freebsd-5",
-+ "freebsd-7" => "freebsd-5",
- );
-
- my %dist_table =
diff --git a/sysutils/system-tools-backends/files/patch-time-conf.in b/sysutils/system-tools-backends/files/patch-time-conf.in
deleted file mode 100644
index 716bd5a..0000000
--- a/sysutils/system-tools-backends/files/patch-time-conf.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- time-conf.in.orig Mon Jan 2 10:47:30 2006
-+++ time-conf.in Fri Jan 6 01:09:09 2006
-@@ -72,7 +72,7 @@
- "gentoo", "vlos-1.2", "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "fedora-3", "rpath",
- "vine-3.0", "vine-3.1",
- "archlinux",
-- "freebsd-5", "freebsd-6");
-+ "freebsd-5", "freebsd-6", "freebsd-7");
-
- $description =<<"end_of_description;";
- Configures your system clock, timezone and time server list.
-@@ -591,6 +591,7 @@
-
- "freebsd-5" => "freebsd-5",
- "freebsd-6" => "freebsd-5",
-+ "freebsd-7" => "freebsd-5",
- );
-
- my %dist_tables =
-@@ -842,6 +843,7 @@
-
- "freebsd-5" => "freebsd-5",
- "freebsd-6" => "freebsd-5",
-+ "freebsd-7" => "freebsd-5",
- );
-
- my %dist_tables =
diff --git a/sysutils/system-tools-backends/files/patch-users-conf.in b/sysutils/system-tools-backends/files/patch-users-conf.in
deleted file mode 100644
index eaa6b37..0000000
--- a/sysutils/system-tools-backends/files/patch-users-conf.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- users-conf.in.orig Sun Nov 20 20:27:32 2005
-+++ users-conf.in Mon Nov 28 13:35:33 2005
-@@ -76,7 +76,7 @@
- "debian-2.2", "debian-3.0", "debian-sarge",
- "suse-7.0", "suse-9.0", "suse-9.1", "turbolinux-7.0",
- "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0",
-- "freebsd-4", "freebsd-5", "freebsd-6",
-+ "freebsd-4", "freebsd-5", "freebsd-6", "freebsd-7",
- "gentoo", "vlos-1.2",
- "archlinux-0.7",
- "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "fedora-3", "rpath", "vine-3.0", "vine-3.1");
-@@ -374,6 +374,7 @@
- 'freebsd-4' => $freebsd_logindefs_defaults,
- 'freebsd-5' => $freebsd_logindefs_defaults,
- 'freebsd-6' => $freebsd_logindefs_defaults,
-+ 'freebsd-7' => $freebsd_logindefs_defaults,
- 'suse-7.0' => $gentoo_logindefs_defaults,
- 'suse-9.0' => $gentoo_logindefs_defaults,
- 'suse-9.1' => $gentoo_logindefs_defaults,
diff --git a/sysutils/system-tools-backends/files/system-tools-backends.in b/sysutils/system-tools-backends/files/system-tools-backends.in
new file mode 100644
index 0000000..dcaff5e
--- /dev/null
+++ b/sysutils/system-tools-backends/files/system-tools-backends.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+# $FreeBSD$
+# $MCom: ports/sysutils/system-tools-backends/files/system-tools-backends.in,v 1.3 2006/12/06 19:31:12 marcus Exp $
+
+# PROVIDE: system-tools-backends
+# REQUIRE: DAEMON dbus
+#
+# Add the following to /etc/rc.conf to start SystemToolsBackends at boot time:
+#
+# system_tools_backends_enable="YES"
+#
+
+. %%RC_SUBR%%
+. %%GNOME_SUBR%%
+
+export PATH=${PATH}:%%PREFIX%%/bin
+
+system_tools_backends_enable=${system_tools_backends_enable-${gnome_enable}}
+
+name=system_tools_backends
+rcvar=`set_rcvar`
+command="%%PREFIX%%/bin/system-tools-backends"
+pidfile="/var/run/system-tools-backends.pid"
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist
index e6bc30c..257e1ef 100644
--- a/sysutils/system-tools-backends/pkg-plist
+++ b/sysutils/system-tools-backends/pkg-plist
@@ -1,133 +1,56 @@
-libdata/pkgconfig/system-tools-backends.pc
-share/aclocal/system-tools-backends.m4
-share/locale/ar/LC_MESSAGES/system-tools-backends.mo
-share/locale/az/LC_MESSAGES/system-tools-backends.mo
-share/locale/bg/LC_MESSAGES/system-tools-backends.mo
-share/locale/bn/LC_MESSAGES/system-tools-backends.mo
-share/locale/bs/LC_MESSAGES/system-tools-backends.mo
-share/locale/ca/LC_MESSAGES/system-tools-backends.mo
-share/locale/cs/LC_MESSAGES/system-tools-backends.mo
-share/locale/da/LC_MESSAGES/system-tools-backends.mo
-share/locale/de/LC_MESSAGES/system-tools-backends.mo
-share/locale/el/LC_MESSAGES/system-tools-backends.mo
-share/locale/en_CA/LC_MESSAGES/system-tools-backends.mo
-share/locale/en_GB/LC_MESSAGES/system-tools-backends.mo
-share/locale/es/LC_MESSAGES/system-tools-backends.mo
-share/locale/eu/LC_MESSAGES/system-tools-backends.mo
-share/locale/fi/LC_MESSAGES/system-tools-backends.mo
-share/locale/fr/LC_MESSAGES/system-tools-backends.mo
-share/locale/gu/LC_MESSAGES/system-tools-backends.mo
-share/locale/hi/LC_MESSAGES/system-tools-backends.mo
-share/locale/hr/LC_MESSAGES/system-tools-backends.mo
-share/locale/hu/LC_MESSAGES/system-tools-backends.mo
-share/locale/id/LC_MESSAGES/system-tools-backends.mo
-share/locale/it/LC_MESSAGES/system-tools-backends.mo
-share/locale/ja/LC_MESSAGES/system-tools-backends.mo
-share/locale/ko/LC_MESSAGES/system-tools-backends.mo
-share/locale/lt/LC_MESSAGES/system-tools-backends.mo
-share/locale/ms/LC_MESSAGES/system-tools-backends.mo
-share/locale/nb/LC_MESSAGES/system-tools-backends.mo
-share/locale/ne/LC_MESSAGES/system-tools-backends.mo
-share/locale/nl/LC_MESSAGES/system-tools-backends.mo
-share/locale/no/LC_MESSAGES/system-tools-backends.mo
-share/locale/pa/LC_MESSAGES/system-tools-backends.mo
-share/locale/pl/LC_MESSAGES/system-tools-backends.mo
-share/locale/pt/LC_MESSAGES/system-tools-backends.mo
-share/locale/pt_BR/LC_MESSAGES/system-tools-backends.mo
-share/locale/ro/LC_MESSAGES/system-tools-backends.mo
-share/locale/rw/LC_MESSAGES/system-tools-backends.mo
-share/locale/sk/LC_MESSAGES/system-tools-backends.mo
-share/locale/sq/LC_MESSAGES/system-tools-backends.mo
-share/locale/sr/LC_MESSAGES/system-tools-backends.mo
-share/locale/sr@Latn/LC_MESSAGES/system-tools-backends.mo
-share/locale/sv/LC_MESSAGES/system-tools-backends.mo
-share/locale/ta/LC_MESSAGES/system-tools-backends.mo
-share/locale/th/LC_MESSAGES/system-tools-backends.mo
-share/locale/tr/LC_MESSAGES/system-tools-backends.mo
-share/locale/uk/LC_MESSAGES/system-tools-backends.mo
-share/locale/vi/LC_MESSAGES/system-tools-backends.mo
-share/locale/xh/LC_MESSAGES/system-tools-backends.mo
-share/locale/zh_CN/LC_MESSAGES/system-tools-backends.mo
-share/locale/zh_TW/LC_MESSAGES/system-tools-backends.mo
-share/setup-tool-backends/files/general_isdn_ppp_options
-share/setup-tool-backends/scripts/boot-conf
-share/setup-tool-backends/scripts/boot-grub.pl
-share/setup-tool-backends/scripts/boot-lilo.pl
-share/setup-tool-backends/scripts/boot-yaboot.pl
-share/setup-tool-backends/scripts/boot.pl
-share/setup-tool-backends/scripts/debug.pl
-share/setup-tool-backends/scripts/dhcpd-conf
-share/setup-tool-backends/scripts/dhcpd.pl
-share/setup-tool-backends/scripts/disks-conf
-share/setup-tool-backends/scripts/display-conf
-share/setup-tool-backends/scripts/file.pl
-share/setup-tool-backends/scripts/filesys.pl
-share/setup-tool-backends/scripts/font-conf
-share/setup-tool-backends/scripts/font.pl
-share/setup-tool-backends/scripts/general.pl
-share/setup-tool-backends/scripts/guess_system.sh
-share/setup-tool-backends/scripts/internetsharing-conf
-share/setup-tool-backends/scripts/ishare.pl
-share/setup-tool-backends/scripts/media.pl
-share/setup-tool-backends/scripts/memory-conf
-share/setup-tool-backends/scripts/mouse-conf
-share/setup-tool-backends/scripts/network-conf
-share/setup-tool-backends/scripts/network.pl
-share/setup-tool-backends/scripts/package-conf
-share/setup-tool-backends/scripts/parse.pl
-share/setup-tool-backends/scripts/partition.pl
-share/setup-tool-backends/scripts/platform.pl
-share/setup-tool-backends/scripts/print-conf
-share/setup-tool-backends/scripts/print.pl
-share/setup-tool-backends/scripts/process.pl
-share/setup-tool-backends/scripts/replace.pl
-share/setup-tool-backends/scripts/report.pl
-share/setup-tool-backends/scripts/service-list.pl
-share/setup-tool-backends/scripts/service.pl
-share/setup-tool-backends/scripts/services-conf
-share/setup-tool-backends/scripts/share.pl
-share/setup-tool-backends/scripts/shares-conf
-share/setup-tool-backends/scripts/time-conf
-share/setup-tool-backends/scripts/tokenizer.pl
-share/setup-tool-backends/scripts/type1inst
-share/setup-tool-backends/scripts/users-conf
-share/setup-tool-backends/scripts/util.pl
-share/setup-tool-backends/scripts/x.pl
-share/setup-tool-backends/scripts/xml.pl
-@dirrm share/setup-tool-backends/scripts
-@dirrm share/setup-tool-backends/files
-@dirrm share/setup-tool-backends
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
+bin/system-tools-backends
+etc/dbus-1/system.d/system-tools-backends.conf
+libdata/pkgconfig/system-tools-backends-2.0.pc
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.GroupsConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.HostsConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.IfacesConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.NFSConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.NTPConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.Platform.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.SMBConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.ServicesConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.TimeConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.UsersConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.service
+share/system-tools-backends-2.0/files/general_isdn_ppp_options
+share/system-tools-backends-2.0/scripts/GroupsConfig.pm
+share/system-tools-backends-2.0/scripts/HostsConfig.pm
+share/system-tools-backends-2.0/scripts/IfacesConfig.pm
+share/system-tools-backends-2.0/scripts/Init/Services.pm
+share/system-tools-backends-2.0/scripts/Init/ServicesList.pm
+share/system-tools-backends-2.0/scripts/NFSConfig.pm
+share/system-tools-backends-2.0/scripts/NTPConfig.pm
+share/system-tools-backends-2.0/scripts/Network/Hosts.pm
+share/system-tools-backends-2.0/scripts/Network/Ifaces.pm
+share/system-tools-backends-2.0/scripts/Platform.pm
+share/system-tools-backends-2.0/scripts/SMBConfig.pm
+share/system-tools-backends-2.0/scripts/ServicesConfig.pm
+share/system-tools-backends-2.0/scripts/Shares/NFS.pm
+share/system-tools-backends-2.0/scripts/Shares/SMB.pm
+share/system-tools-backends-2.0/scripts/StbObject.pm
+share/system-tools-backends-2.0/scripts/SystemToolsBackends.pl
+share/system-tools-backends-2.0/scripts/Time/NTP.pm
+share/system-tools-backends-2.0/scripts/Time/TimeDate.pm
+share/system-tools-backends-2.0/scripts/TimeConfig.pm
+share/system-tools-backends-2.0/scripts/Users/Groups.pm
+share/system-tools-backends-2.0/scripts/Users/Shells.pm
+share/system-tools-backends-2.0/scripts/Users/Users.pm
+share/system-tools-backends-2.0/scripts/UsersConfig.pm
+share/system-tools-backends-2.0/scripts/Utils/Backend.pm
+share/system-tools-backends-2.0/scripts/Utils/File.pm
+share/system-tools-backends-2.0/scripts/Utils/Monitor.pm
+share/system-tools-backends-2.0/scripts/Utils/Parse.pm
+share/system-tools-backends-2.0/scripts/Utils/Platform.pm
+share/system-tools-backends-2.0/scripts/Utils/Replace.pm
+share/system-tools-backends-2.0/scripts/Utils/Report.pm
+share/system-tools-backends-2.0/scripts/Utils/Util.pm
+share/system-tools-backends-2.0/scripts/Utils/XML.pm
+@dirrm share/system-tools-backends-2.0/scripts/Utils
+@dirrm share/system-tools-backends-2.0/scripts/Users
+@dirrm share/system-tools-backends-2.0/scripts/Time
+@dirrm share/system-tools-backends-2.0/scripts/Shares
+@dirrm share/system-tools-backends-2.0/scripts/Network
+@dirrm share/system-tools-backends-2.0/scripts/Init
+@dirrm share/system-tools-backends-2.0/scripts
+@dirrm share/system-tools-backends-2.0/files
+@dirrm share/system-tools-backends-2.0
diff --git a/textproc/docbook-sk/Makefile b/textproc/docbook-sk/Makefile
index bc01cdf..490a5f6 100644
--- a/textproc/docbook-sk/Makefile
+++ b/textproc/docbook-sk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= docbook-sk
PORTVERSION= 4.1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= http://www.oasis-open.org/docbook/xml/${PORTVERSION}/
DISTNAME= docbkx${PORTVERSION:S/.//g}
@@ -40,7 +40,6 @@ do-install:
done
post-install:
- @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DOCBOOKDIR}/docbook.cat
@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" file://${DOCBOOKDIR}/dbpoolx.mod
@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//DTD DocBook XML V4.1.2//EN" file://${DOCBOOKDIR}/docbookx.dtd
@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" file://${DOCBOOKDIR}/dbcentx.mod
diff --git a/textproc/docbook-sk/pkg-plist b/textproc/docbook-sk/pkg-plist
index f56fe56..1706ca3 100644
--- a/textproc/docbook-sk/pkg-plist
+++ b/textproc/docbook-sk/pkg-plist
@@ -7,9 +7,7 @@ share/xml/docbook/%%DTD_VERSION%%/dbgenent.mod
share/xml/docbook/%%DTD_VERSION%%/dbhierx.mod
share/xml/docbook/%%DTD_VERSION%%/dbnotnx.mod
share/xml/docbook/%%DTD_VERSION%%/dbpoolx.mod
-@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG %%DOCBOOKDIR%%/docbook.cat
share/xml/docbook/%%DTD_VERSION%%/docbook.cat
-@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DOCBOOKDIR%%/docbook.cat
share/xml/docbook/%%DTD_VERSION%%/docbookx.dtd
@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" file://%%DOCBOOKDIR%%/dbpoolx.mod
@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//DTD DocBook XML V4.1.2//EN" file://%%DOCBOOKDIR%%/docbookx.dtd
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index ec389ff..79d2245 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -3,20 +3,21 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.44 2007/03/13 00:37:32 mezz Exp $
#
PORTNAME= gnome-doc-utils
-PORTVERSION= 0.7.2
-PORTREVISION= 1
+PORTVERSION= 0.10.1
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-doc-utils/0.7
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-doc-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME doc utils
-BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
+ gawk:${PORTSDIR}/lang/gawk
RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
${LOCALBASE}/share/xml/docbook/4.3/catalog.xml:${PORTSDIR}/textproc/docbook-xml-430 \
diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo
index c6b6c87..202ff4a 100644
--- a/textproc/gnome-doc-utils/distinfo
+++ b/textproc/gnome-doc-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-doc-utils-0.7.2.tar.bz2) = 3f3903e5a3e3b05261498d907f2471a9
-SHA256 (gnome-doc-utils-0.7.2.tar.bz2) = aa2f8fed9aa95aff9c2a7d627a85cc428cef3dfa0cccd538dcfc41446bde8b8d
-SIZE (gnome-doc-utils-0.7.2.tar.bz2) = 405767
+MD5 (gnome-doc-utils-0.10.1.tar.bz2) = 208775a4b6c6d9ea0478a84afb36701f
+SHA256 (gnome-doc-utils-0.10.1.tar.bz2) = 7cd6c5bc72cb4f9ff4f173c957dcea1b71bbea3191bb337772eca57614f6b643
+SIZE (gnome-doc-utils-0.10.1.tar.bz2) = 427716
diff --git a/textproc/gnome-doc-utils/files/patch-xml2po__xml2po.py b/textproc/gnome-doc-utils/files/patch-xml2po__xml2po.py
deleted file mode 100644
index e062005..0000000
--- a/textproc/gnome-doc-utils/files/patch-xml2po__xml2po.py
+++ /dev/null
@@ -1,41 +0,0 @@
---- xml2po/xml2po.py.orig Sun Apr 2 03:47:17 2006
-+++ xml2po/xml2po.py Fri Oct 20 00:57:46 2006
-@@ -242,14 +242,10 @@
- text = normalizeString(text, not spacepreserve)
- if (text.strip() == ''):
- return text
-- file = open(mofile, "rb")
-- if file:
-- myfallback = NoneTranslations()
-- gt = gettext.GNUTranslations(file)
-- gt.add_fallback(myfallback)
-- if gt:
-- res = gt.ugettext(text.decode('utf-8'))
-- return res
-+ global gt
-+ if gt:
-+ res = gt.ugettext(text.decode('utf-8'))
-+ return res
-
- return text
-
-@@ -648,6 +644,7 @@
- filename = ''
- origxml = ''
- mofile = ''
-+gt = None
- ultimate = [ ]
- ignored = [ ]
- filenames = [ ]
-@@ -763,6 +760,11 @@
- if mode=='merge' and mofile=='':
- print >> sys.stderr, "Error: You must specify MO file when merging translations."
- sys.exit(3)
-+
-+file = open(mofile, "rb")
-+if file:
-+ gt = gettext.GNUTranslations(file)
-+ gt.add_fallback(NoneTranslations())
-
- ultimate_tags = read_finaltags(ultimate)
- ignored_tags = read_ignoredtags(ignored)
diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist
index 054f92b..7ed23ca 100644
--- a/textproc/gnome-doc-utils/pkg-plist
+++ b/textproc/gnome-doc-utils/pkg-plist
@@ -1,4 +1,5 @@
bin/gnome-doc-prepare
+bin/gnome-doc-tool
bin/xml2po
libdata/pkgconfig/gnome-doc-utils.pc
libdata/pkgconfig/xml2po.pc
@@ -34,7 +35,6 @@ 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
share/gnome/help/gnome-doc-xslt/C/db2html-refentry.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-suppressed.xml
share/gnome/help/gnome-doc-xslt/C/db2html-table.xml
share/gnome/help/gnome-doc-xslt/C/db2html-title.xml
share/gnome/help/gnome-doc-xslt/C/db2html-xref.xml
@@ -45,7 +45,6 @@ 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
@@ -63,6 +62,7 @@ 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/eu/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
@@ -77,22 +77,29 @@ share/locale/ka/LC_MESSAGES/gnome-doc-utils.mo
share/locale/ko/LC_MESSAGES/gnome-doc-utils.mo
share/locale/lt/LC_MESSAGES/gnome-doc-utils.mo
share/locale/lv/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/mg/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/mk/LC_MESSAGES/gnome-doc-utils.mo
share/locale/ml/LC_MESSAGES/gnome-doc-utils.mo
share/locale/mn/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/mr/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/or/LC_MESSAGES/gnome-doc-utils.mo
share/locale/pa/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/pl/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/sl/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/ta/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
@@ -134,11 +141,11 @@ share/xml/gnome/xslt/docbook/html/db2html.xsl
share/xml/gnome/xslt/docbook/omf/db2omf.xsl
share/xml/gnome/xslt/docbook/utils/chunks.xsl
share/xml/gnome/xslt/docbook/utils/credits.xsl
+share/xml/gnome/xslt/docbook/utils/figures.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
share/xml2po/docbook.pyc
share/xml2po/empty.py
@@ -147,8 +154,9 @@ share/xml2po/gs.py
share/xml2po/gs.pyc
share/xml2po/ubuntu.py
share/xml2po/ubuntu.pyc
+share/xml2po/xhtml.py
+share/xml2po/xhtml.pyc
@dirrm share/xml2po
-@dirrm share/xml/gnome/xslt/xsldoc
@dirrm share/xml/gnome/xslt/gettext
@dirrm share/xml/gnome/xslt/docbook/utils
@dirrm share/xml/gnome/xslt/docbook/omf
@@ -177,6 +185,8 @@ share/xml2po/ubuntu.pyc
@dirrmtry share/locale/ug
@dirrmtry share/locale/sr/LC_MESSAGES
@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
@dirrmtry share/locale/sk/LC_MESSAGES
@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@@ -185,8 +195,14 @@ share/xml2po/ubuntu.pyc
@dirrmtry share/locale/ro
@dirrmtry share/locale/pt/LC_MESSAGES
@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
@dirrmtry share/locale/ne/LC_MESSAGES
@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/ko/LC_MESSAGES
@dirrmtry share/locale/ko
@dirrmtry share/locale/gl/LC_MESSAGES
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 45740cb..4fd76a6 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -4,11 +4,11 @@
# Whom: Ying-Chieh Liao <ijliao@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/textproc/libxml++26/Makefile,v 1.13 2006/04/13 07:52:38 bland Exp $
+# $MCom: ports/textproc/libxml++26/Makefile,v 1.18 2007/03/07 19:06:06 marcus Exp $
#
PORTNAME= libxml++
-PORTVERSION= 2.14.0
+PORTVERSION= 2.18.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -34,6 +34,10 @@ post-patch:
${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e '/^gentoo_ltmain_version=/s/`.*`/$$gentoo_lt_version/' \
${WRKSRC}/configure
+ @${REINPLACE_CMD} -e '/^library_configdir =/s/libdir/includedir/' \
+ ${WRKSRC}/libxml++/Makefile.in
+ @${REINPLACE_CMD} -e '/^Cflags:/s/libdir/includedir/' \
+ ${WRKSRC}/libxml++-2.6.pc.in
.if defined(NOPORTDOCS)
@${REINPLACE_CMD} -E '/^SUBDIRS = /s/(docs|examples)//g' ${WRKSRC}/Makefile.in
.endif
diff --git a/textproc/libxml++26/distinfo b/textproc/libxml++26/distinfo
index 0dbea2e..9a2cf84 100644
--- a/textproc/libxml++26/distinfo
+++ b/textproc/libxml++26/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxml++-2.14.0.tar.gz) = 92ccfe24e23d6942441c6a1c78509dbf
-SHA256 (libxml++-2.14.0.tar.gz) = 9a3434e3f9193e4b577a4122e649ddb96bfb61d50899369e89fc64218efabf8c
-SIZE (libxml++-2.14.0.tar.gz) = 935513
+MD5 (libxml++-2.18.0.tar.gz) = 63b31bd9751cf99aaafccf6dfa4f88cd
+SHA256 (libxml++-2.18.0.tar.gz) = 0733c759c818d5aff07692b11c1bd1df736e4b479fb79cc50c3ab8b948d26b7e
+SIZE (libxml++-2.18.0.tar.gz) = 2020427
diff --git a/textproc/libxml++26/pkg-plist b/textproc/libxml++26/pkg-plist
index 1529065..afb1d2e 100644
--- a/textproc/libxml++26/pkg-plist
+++ b/textproc/libxml++26/pkg-plist
@@ -1,3 +1,4 @@
+include/libxml++-%%API_VERSION%%/include/libxml++config.h
include/libxml++-%%API_VERSION%%/libxml++/attribute.h
include/libxml++-%%API_VERSION%%/libxml++/document.h
include/libxml++-%%API_VERSION%%/libxml++/dtd.h
@@ -124,9 +125,6 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
%%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
@@ -169,25 +167,25 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
%%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++-2.6/docs/reference/%%DOC_VERSION%%/html/dir_060042f61ad41255a77b5a60dc66afb4.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_060042f61ad41255a77b5a60dc66afb4_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_060042f61ad41255a77b5a60dc66afb4_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_98cc7bcadc131313690a7320eb0caa09.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_98cc7bcadc131313690a7320eb0caa09_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_98cc7bcadc131313690a7320eb0caa09_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_9cc7404ab660b5374779d403c202c70c.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_9cc7404ab660b5374779d403c202c70c_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_9cc7404ab660b5374779d403c202c70c_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_c513157412c8384caf468454c2c3cfa9.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_c513157412c8384caf468454c2c3cfa9_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_c513157412c8384caf468454c2c3cfa9_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_cf5c1e9933cb056be190fe9c88b8f1f0.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_cf5c1e9933cb056be190fe9c88b8f1f0_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_cf5c1e9933cb056be190fe9c88b8f1f0_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d49b71a5503b600be72da967490472e5.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d49b71a5503b600be72da967490472e5_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d49b71a5503b600be72da967490472e5_dep.map
%%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
@@ -219,6 +217,25 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
%%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_func_0x63.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x64.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x65.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x66.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x67.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x68.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x69.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6b.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6c.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6d.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6e.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6f.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x70.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x72.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x73.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x74.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x76.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x77.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_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
@@ -226,6 +243,7 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
%%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_defs.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
@@ -259,13 +277,14 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
%%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++config_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/namespacesigc.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
@@ -280,6 +299,7 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
%%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/tabs.css
%%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
@@ -297,4 +317,5 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
@dirrm include/libxml++-%%API_VERSION%%/libxml++/io
@dirrm include/libxml++-%%API_VERSION%%/libxml++/exceptions
@dirrm include/libxml++-%%API_VERSION%%/libxml++
+@dirrm include/libxml++-%%API_VERSION%%/include
@dirrm include/libxml++-%%API_VERSION%%
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index bb5d39c..7349680 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -3,11 +3,11 @@
# Whom: Rene Hexel <rh@netbsd.org>
#
# $FreeBSD$
-# $MCom: ports/textproc/scrollkeeper/Makefile,v 1.2 2006/09/10 00:51:13 mezz Exp $
+# $MCom: ports/textproc/scrollkeeper/Makefile,v 1.7 2007/02/20 20:26:47 marcus Exp $
PORTNAME= scrollkeeper
PORTVERSION= 0.3.14
-PORTREVISION= 5
+PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -18,19 +18,20 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= An Open Document Cataloging Project
BUILD_DEPENDS= intltool-extract:${PORTSDIR}/textproc/intltool \
- ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \
- ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
+ ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
+ ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/catalog.xml:${PORTSDIR}/textproc/docbook-xml \
+ ${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk
RUN_DEPENDS= intltool-extract:${PORTSDIR}/textproc/intltool \
- ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \
- ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
+ ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
+ ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/catalog.xml:${PORTSDIR}/textproc/docbook-xml \
+ ${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk
-DOCBOOK_VERSION= 4.1.2
+DOCBOOK_VERSION=4.2
-USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15
USE_BISON= yes
USE_GNOME= gnomehack gnomehier gnometarget libxslt intlhack
USE_LDCONFIG= yes
diff --git a/textproc/scrollkeeper/files/patch-configure b/textproc/scrollkeeper/files/patch-configure
deleted file mode 100644
index 054d07f..0000000
--- a/textproc/scrollkeeper/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig Sat Dec 6 03:18:20 2003
-+++ configure Sat Dec 6 17:46:38 2003
-@@ -7864,6 +7864,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8360,7 +8361,7 @@
- echo "$as_me:$LINENO: checking for DocBook XML DTD" >&5
- echo $ECHO_N "checking for DocBook XML DTD... $ECHO_C" >&6
- db_found=
-- for vers in 4.2 4.1.2; do
-+ for vers in 4.1.2 4.2; do
- if xmlcatalog $XML_CATALOG "-//OASIS//DTD DocBook XML V$vers//EN" >/dev/null ; then
- db_found=$vers
- break
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 70a8606..b03128a 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany-extensions/Makefile,v 1.78 2006/10/03 20:07:26 mezz Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.88 2007/03/11 20:34:21 mezz Exp $
#
PORTNAME= epiphany
-PORTVERSION= 2.16.1
+PORTVERSION= 2.18.0
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -33,9 +33,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_C
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-mozilla=${GECKO}
+GCONF_SCHEMAS= smart-bookmarks.schemas
+
EPHY_EXTENSIONS=all
+EPHY_VERSION= 2.18
-PLIST_SUB= VERSION="2.16" EPHY_VERSION="2.16"
+PLIST_SUB= VERSION="2.18" EPHY_VERSION=${EPHY_VERSION}
OPTIONS= OPENSP "Enable OpenSP SGML support" off \
ADBLOCK "Enable the adblock extension" on
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 706a35e..624d53c 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-extensions-2.16.1.tar.bz2) = 93a8d37175dc1f173c0185c254de5c38
-SHA256 (gnome2/epiphany-extensions-2.16.1.tar.bz2) = 315ef2eeaf2943830bdf04958af613dce62574aa6697acfab335a0b9e4f699c5
-SIZE (gnome2/epiphany-extensions-2.16.1.tar.bz2) = 810858
+MD5 (gnome2/epiphany-extensions-2.18.0.tar.bz2) = c0a6218b6a8506f204891a0769ac9553
+SHA256 (gnome2/epiphany-extensions-2.18.0.tar.bz2) = 38c58fb43b6fcfecd80f8d36aa1a0ff1163c050195dda1ed074f5f605b007ff9
+SIZE (gnome2/epiphany-extensions-2.18.0.tar.bz2) = 892671
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index fc38f54..adaa34b 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -2,7 +2,11 @@ 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/cc-license-viewer.ephy-extension
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.py
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.pyc
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.pyo
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/certificates.ephy-extension
%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.py
%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyc
%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyo
@@ -59,6 +63,7 @@ lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension
share/gnome/epiphany-extensions/ephy-gestures.xml
share/gnome/epiphany-extensions/glade/action-properties.glade
share/gnome/epiphany-extensions/glade/actions-editor.glade
+%%ADBLOCK%%share/gnome/epiphany-extensions/glade/adblock.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
@@ -85,7 +90,29 @@ share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source.png
share/gnome/help/epiphany-extensions/C/figures/epi-ext-sidebar.png
share/gnome/help/epiphany-extensions/C/figures/epi-ext-tabgroups.png
share/gnome/help/epiphany-extensions/C/legal.xml
+share/gnome/help/epiphany-extensions/sv/epiphany-extensions.xml
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-action-create.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-adblocker.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-back.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-close-2.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-close.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-forward.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-fullscreen.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-homepage.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-new-tab.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-new-window.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-next-tab.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-prev-tab.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-reload.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-stop.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-up.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source-2.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-sidebar.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-tabgroups.png
share/gnome/omf/epiphany-extensions/epiphany-extensions-C.omf
+share/gnome/omf/epiphany-extensions/epiphany-extensions-sv.omf
+share/locale/ar/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
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
@@ -127,6 +154,8 @@ share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@dirrm share/gnome/omf/epiphany-extensions
+@dirrm share/gnome/help/epiphany-extensions/sv/figures
+@dirrm share/gnome/help/epiphany-extensions/sv
@dirrm share/gnome/help/epiphany-extensions/C/figures
@dirrm share/gnome/help/epiphany-extensions/C
@dirrm share/gnome/help/epiphany-extensions
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index d1bc841..715e21c 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany/Makefile,v 1.128 2006/10/12 20:03:10 ahze Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.141 2007/03/11 20:12:27 mezz Exp $
#
PORTNAME= epiphany
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index fa99579..609b848 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-2.16.3.tar.bz2) = 3ee93d168eb5720a96f4c7adf2cdf2d4
-SHA256 (gnome2/epiphany-2.16.3.tar.bz2) = a1a328d65dc95bd30d79b6434ae25db760f0d383baa9f25bb6862177e4d6f12d
-SIZE (gnome2/epiphany-2.16.3.tar.bz2) = 4232106
+MD5 (gnome2/epiphany-2.18.0.tar.bz2) = 3ac47fcf7e9875885c3f4d53dac24b7c
+SHA256 (gnome2/epiphany-2.18.0.tar.bz2) = 92c8f698a101ff2fdd9a83b96a5a37376be839df9d918c084c6551a7db587fd5
+SIZE (gnome2/epiphany-2.18.0.tar.bz2) = 4658364
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 9be25d1..00f0b4d 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -66,12 +66,7 @@ share/dbus-1/services/org.gnome.Epiphany.service
%%DOCSDIR%%/up.png
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-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/about.ini
share/gnome/epiphany/chrome/branding/brand.dtd
share/gnome/epiphany/chrome/branding/brand.properties
share/gnome/epiphany/chrome/epiphany.manifest
@@ -91,6 +86,34 @@ share/gnome/epiphany/glade/epiphany.glade
share/gnome/epiphany/glade/form-signing-dialog.glade
share/gnome/epiphany/glade/prefs-dialog.glade
share/gnome/epiphany/glade/print.glade
+share/gnome/epiphany/icons/hicolor/16x16/actions/bookmark-view.png
+share/gnome/epiphany/icons/hicolor/16x16/actions/bookmark-web.png
+share/gnome/epiphany/icons/hicolor/16x16/actions/download.png
+share/gnome/epiphany/icons/hicolor/16x16/actions/history-view.png
+share/gnome/epiphany/icons/hicolor/16x16/actions/location-entry.png
+share/gnome/epiphany/icons/hicolor/16x16/status/popup-hidden.png
+share/gnome/epiphany/icons/hicolor/22x22/actions/bookmark-view.png
+share/gnome/epiphany/icons/hicolor/22x22/actions/bookmark-web.png
+share/gnome/epiphany/icons/hicolor/22x22/actions/download.png
+share/gnome/epiphany/icons/hicolor/22x22/actions/history-view.png
+share/gnome/epiphany/icons/hicolor/22x22/actions/location-entry.png
+share/gnome/epiphany/icons/hicolor/22x22/status/popup-hidden.png
+share/gnome/epiphany/icons/hicolor/24x24/actions/bookmark-view.png
+share/gnome/epiphany/icons/hicolor/24x24/actions/bookmark-web.png
+share/gnome/epiphany/icons/hicolor/24x24/actions/download.png
+share/gnome/epiphany/icons/hicolor/24x24/actions/history-view.png
+share/gnome/epiphany/icons/hicolor/24x24/actions/location-entry.png
+share/gnome/epiphany/icons/hicolor/24x24/status/popup-hidden.png
+share/gnome/epiphany/icons/hicolor/32x32/actions/bookmark-view.png
+share/gnome/epiphany/icons/hicolor/32x32/actions/download.png
+share/gnome/epiphany/icons/hicolor/32x32/actions/history-view.png
+share/gnome/epiphany/icons/hicolor/32x32/actions/location-entry.png
+share/gnome/epiphany/icons/hicolor/32x32/status/popup-hidden.png
+share/gnome/epiphany/icons/hicolor/scalable/actions/bookmark-view.svg
+share/gnome/epiphany/icons/hicolor/scalable/actions/download.svg
+share/gnome/epiphany/icons/hicolor/scalable/actions/history-view.svg
+share/gnome/epiphany/icons/hicolor/scalable/actions/location-entry.svg
+share/gnome/epiphany/icons/hicolor/scalable/status/popup-hidden.svg
share/gnome/epiphany/mime-types-permissions.xml
share/gnome/help/epiphany/C/epiphany.xml
share/gnome/help/epiphany/C/figures/ephy-addressbar-smartbookmark-screenshot.png
@@ -108,6 +131,11 @@ share/gnome/help/epiphany/el/figures/ephy-addressbar-smartbookmark-screenshot.pn
share/gnome/help/epiphany/el/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/el/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/el/figures/ephy-screenshot.png
+share/gnome/help/epiphany/en_GB/epiphany.xml
+share/gnome/help/epiphany/en_GB/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/en_GB/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/en_GB/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/en_GB/figures/ephy-screenshot.png
share/gnome/help/epiphany/es/epiphany.xml
share/gnome/help/epiphany/es/figures/ephy-addressbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/es/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -128,6 +156,11 @@ share/gnome/help/epiphany/fr/figures/ephy-addressbar-smartbookmark-screenshot.pn
share/gnome/help/epiphany/fr/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/fr/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/fr/figures/ephy-screenshot.png
+share/gnome/help/epiphany/it/epiphany.xml
+share/gnome/help/epiphany/it/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/it/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/it/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/it/figures/ephy-screenshot.png
share/gnome/help/epiphany/ja/epiphany.xml
share/gnome/help/epiphany/ja/figures/ephy-addressbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/ja/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -156,10 +189,12 @@ 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-en_GB.omf
share/gnome/omf/epiphany/epiphany-es.omf
share/gnome/omf/epiphany/epiphany-eu.omf
share/gnome/omf/epiphany/epiphany-fi.omf
share/gnome/omf/epiphany/epiphany-fr.omf
+share/gnome/omf/epiphany/epiphany-it.omf
share/gnome/omf/epiphany/epiphany-ja.omf
share/gnome/omf/epiphany/epiphany-nl.omf
share/gnome/omf/epiphany/epiphany-ru.omf
@@ -242,6 +277,7 @@ share/locale/wa/LC_MESSAGES/epiphany.mo
share/locale/zh_CN/LC_MESSAGES/epiphany.mo
share/locale/zh_HK/LC_MESSAGES/epiphany.mo
share/locale/zh_TW/LC_MESSAGES/epiphany.mo
+%%PYTHON%%share/pygtk/2.0/defs/epiphany.defs
@dirrm share/gnome/omf/epiphany
@dirrm share/gnome/help/epiphany/uk/figures
@dirrm share/gnome/help/epiphany/uk
@@ -253,6 +289,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
@dirrm share/gnome/help/epiphany/nl
@dirrm share/gnome/help/epiphany/ja/figures
@dirrm share/gnome/help/epiphany/ja
+@dirrm share/gnome/help/epiphany/it/figures
+@dirrm share/gnome/help/epiphany/it
@dirrm share/gnome/help/epiphany/fr/figures
@dirrm share/gnome/help/epiphany/fr
@dirrm share/gnome/help/epiphany/fi/figures
@@ -261,6 +299,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
@dirrm share/gnome/help/epiphany/eu
@dirrm share/gnome/help/epiphany/es/figures
@dirrm share/gnome/help/epiphany/es
+@dirrm share/gnome/help/epiphany/en_GB/figures
+@dirrm share/gnome/help/epiphany/en_GB
@dirrm share/gnome/help/epiphany/el/figures
@dirrm share/gnome/help/epiphany/el
@dirrm share/gnome/help/epiphany/bg/figures
@@ -268,6 +308,23 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
@dirrm share/gnome/help/epiphany/C/figures
@dirrm share/gnome/help/epiphany/C
@dirrm share/gnome/help/epiphany
+@dirrm share/gnome/epiphany/icons/hicolor/scalable/status
+@dirrm share/gnome/epiphany/icons/hicolor/scalable/actions
+@dirrm share/gnome/epiphany/icons/hicolor/scalable
+@dirrm share/gnome/epiphany/icons/hicolor/32x32/status
+@dirrm share/gnome/epiphany/icons/hicolor/32x32/actions
+@dirrm share/gnome/epiphany/icons/hicolor/32x32
+@dirrm share/gnome/epiphany/icons/hicolor/24x24/status
+@dirrm share/gnome/epiphany/icons/hicolor/24x24/actions
+@dirrm share/gnome/epiphany/icons/hicolor/24x24
+@dirrm share/gnome/epiphany/icons/hicolor/22x22/status
+@dirrm share/gnome/epiphany/icons/hicolor/22x22/actions
+@dirrm share/gnome/epiphany/icons/hicolor/22x22
+@dirrm share/gnome/epiphany/icons/hicolor/16x16/status
+@dirrm share/gnome/epiphany/icons/hicolor/16x16/actions
+@dirrm share/gnome/epiphany/icons/hicolor/16x16
+@dirrm share/gnome/epiphany/icons/hicolor
+@dirrm share/gnome/epiphany/icons
@dirrm share/gnome/epiphany/glade
@dirrm share/gnome/epiphany/chrome/global
@dirrm share/gnome/epiphany/chrome/branding
@@ -281,10 +338,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
@dirrm include/epiphany/%%EPHY_VERSION%%/epiphany
@dirrm include/epiphany/%%EPHY_VERSION%%
@dirrm include/epiphany
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@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%%
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index 283c6dd..5c237b4 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= erwn
PORTVERSION= 0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www editors
MASTER_SITES= http://lisas.de/erwin/
DISTNAME= erwin-${PORTVERSION}
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
MAN1= erwin.1
post-patch:
- @${REINPLACE_CMD} -e "s|gtkhtml-3.6|gtkhtml-3.8|g" \
+ @${REINPLACE_CMD} -e "s|gtkhtml-3.6|gtkhtml-3.14|g" \
${WRKSRC}/configure
post-install:
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 52363d87..e16cc25 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
-# $MCom: ports/www/evolution-webcal/Makefile,v 1.41 2006/09/04 05:53:25 marcus Exp $
+# $MCom: ports/www/evolution-webcal/Makefile,v 1.46 2007/03/13 20:47:20 mezz Exp $
#
PORTNAME= webcal
-PORTVERSION= 2.8.0
+PORTVERSION= 2.10.0
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
index 251b8a7..1e808f3 100644
--- a/www/evolution-webcal/distinfo
+++ b/www/evolution-webcal/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-webcal-2.8.0.tar.bz2) = 6dd4821ce90e238acbd8a959fee1ee14
-SHA256 (evolution-webcal-2.8.0.tar.bz2) = 485fb66cd50ba18dde547653cd6a41443a08be74293833552bdde49f402fb554
-SIZE (evolution-webcal-2.8.0.tar.bz2) = 162495
+MD5 (evolution-webcal-2.10.0.tar.bz2) = a29004e6e1ad977845ed7c68963c8925
+SHA256 (evolution-webcal-2.10.0.tar.bz2) = 4017850f067d1b08f7b76b94988978f8f63ecfc8d201c910ea5d6119097add15
+SIZE (evolution-webcal-2.10.0.tar.bz2) = 163306
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
index 0fd96d4..19e0896 100644
--- a/www/evolution-webcal/pkg-plist
+++ b/www/evolution-webcal/pkg-plist
@@ -1,5 +1,6 @@
libexec/evolution-webcal
share/locale/ar/LC_MESSAGES/evolution-webcal.mo
+share/locale/as/LC_MESSAGES/evolution-webcal.mo
share/locale/az/LC_MESSAGES/evolution-webcal.mo
share/locale/bg/LC_MESSAGES/evolution-webcal.mo
share/locale/bn/LC_MESSAGES/evolution-webcal.mo
@@ -29,6 +30,7 @@ share/locale/it/LC_MESSAGES/evolution-webcal.mo
share/locale/ja/LC_MESSAGES/evolution-webcal.mo
share/locale/ka/LC_MESSAGES/evolution-webcal.mo
share/locale/ko/LC_MESSAGES/evolution-webcal.mo
+share/locale/ku/LC_MESSAGES/evolution-webcal.mo
share/locale/ky/LC_MESSAGES/evolution-webcal.mo
share/locale/lt/LC_MESSAGES/evolution-webcal.mo
share/locale/lv/LC_MESSAGES/evolution-webcal.mo
@@ -54,6 +56,7 @@ share/locale/sr/LC_MESSAGES/evolution-webcal.mo
share/locale/sr@Latn/LC_MESSAGES/evolution-webcal.mo
share/locale/sv/LC_MESSAGES/evolution-webcal.mo
share/locale/ta/LC_MESSAGES/evolution-webcal.mo
+share/locale/te/LC_MESSAGES/evolution-webcal.mo
share/locale/th/LC_MESSAGES/evolution-webcal.mo
share/locale/tr/LC_MESSAGES/evolution-webcal.mo
share/locale/ug/LC_MESSAGES/evolution-webcal.mo
@@ -75,6 +78,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
@dirrmtry share/locale/sr/LC_MESSAGES
@dirrmtry share/locale/sr
@dirrmtry share/locale/sl/LC_MESSAGES
@@ -95,6 +100,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
@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/ko/LC_MESSAGES
@dirrmtry share/locale/ko
@dirrmtry share/locale/gl/LC_MESSAGES
@@ -111,3 +118,5 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index ca6ba20..7751191 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.88 2006/10/02 23:42:29 ahze Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.98 2007/03/13 01:24:10 marcus Exp $
#
PORTNAME= gtkhtml3
-PORTVERSION= 3.12.3
+PORTVERSION= 3.14.0
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,13 +23,12 @@ USE_GETTEXT= yes
USE_BZIP2= yes
USE_XLIB= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \
- libgnomeprintui ltverhack
+USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui ltverhack
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-PLIST_SUB= VERSION="3.8"
+PLIST_SUB= VERSION="3.14"
.include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 4d3396c..5c08be2 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.12.3.tar.bz2) = b580590014988b02e51b66be65319570
-SHA256 (gnome2/gtkhtml-3.12.3.tar.bz2) = 666849b22375efbaf2ab506b33868ac64126728a8e509f055882ae6940999847
-SIZE (gnome2/gtkhtml-3.12.3.tar.bz2) = 1284704
+MD5 (gnome2/gtkhtml-3.14.0.tar.bz2) = 633fe78fc9b28e013bed269848aa0f9b
+SHA256 (gnome2/gtkhtml-3.14.0.tar.bz2) = ca18d5bf20dee45175dc4517b01ff926b0f7bf62a09ed8c97aaa43dd7b0833c7
+SIZE (gnome2/gtkhtml-3.14.0.tar.bz2) = 1273500
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index b8be05d..1a964af 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -14,45 +14,24 @@ lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so
lib/libgtkhtml-%%VERSION%%.a
lib/libgtkhtml-%%VERSION%%.la
lib/libgtkhtml-%%VERSION%%.so
-lib/libgtkhtml-%%VERSION%%.so.15
+lib/libgtkhtml-%%VERSION%%.so.19
libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
share/gnome/gtkhtml-%%VERSION%%/Editor.idl
share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml-%%VERSION%%/icons/16_copy.png
-share/gnome/gtkhtml-%%VERSION%%/icons/16_cut.png
-share/gnome/gtkhtml-%%VERSION%%/icons/16_paste.png
-share/gnome/gtkhtml-%%VERSION%%/icons/24_copy.png
-share/gnome/gtkhtml-%%VERSION%%/icons/24_cut.png
-share/gnome/gtkhtml-%%VERSION%%/icons/24_paste.png
share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png
share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png
share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png
share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png
-share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-24.png
share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png
share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-24.png
share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
share/gnome/gtkhtml-%%VERSION%%/icons/paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/properties-16.png
share/gnome/gtkhtml-%%VERSION%%/icons/rect.png
-share/gnome/gtkhtml-%%VERSION%%/icons/redo-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/redo-24.png
share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg
share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
@@ -60,28 +39,8 @@ share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/search-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/search-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-1.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-10.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-11.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-2.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-3.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-4.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-5.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-6.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-8.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-9.png
-share/gnome/gtkhtml-%%VERSION%%/icons/table-column-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/table-row-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/table-table-16.png
share/gnome/gtkhtml-%%VERSION%%/icons/texture.png
share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png
-share/gnome/gtkhtml-%%VERSION%%/icons/undo-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/undo-24.png
share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs
share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index ca6ba20..7751191 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.88 2006/10/02 23:42:29 ahze Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.98 2007/03/13 01:24:10 marcus Exp $
#
PORTNAME= gtkhtml3
-PORTVERSION= 3.12.3
+PORTVERSION= 3.14.0
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,13 +23,12 @@ USE_GETTEXT= yes
USE_BZIP2= yes
USE_XLIB= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \
- libgnomeprintui ltverhack
+USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui ltverhack
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-PLIST_SUB= VERSION="3.8"
+PLIST_SUB= VERSION="3.14"
.include <bsd.port.mk>
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index 4d3396c..5c08be2 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.12.3.tar.bz2) = b580590014988b02e51b66be65319570
-SHA256 (gnome2/gtkhtml-3.12.3.tar.bz2) = 666849b22375efbaf2ab506b33868ac64126728a8e509f055882ae6940999847
-SIZE (gnome2/gtkhtml-3.12.3.tar.bz2) = 1284704
+MD5 (gnome2/gtkhtml-3.14.0.tar.bz2) = 633fe78fc9b28e013bed269848aa0f9b
+SHA256 (gnome2/gtkhtml-3.14.0.tar.bz2) = ca18d5bf20dee45175dc4517b01ff926b0f7bf62a09ed8c97aaa43dd7b0833c7
+SIZE (gnome2/gtkhtml-3.14.0.tar.bz2) = 1273500
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index b8be05d..1a964af 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -14,45 +14,24 @@ lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so
lib/libgtkhtml-%%VERSION%%.a
lib/libgtkhtml-%%VERSION%%.la
lib/libgtkhtml-%%VERSION%%.so
-lib/libgtkhtml-%%VERSION%%.so.15
+lib/libgtkhtml-%%VERSION%%.so.19
libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
share/gnome/gtkhtml-%%VERSION%%/Editor.idl
share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml-%%VERSION%%/icons/16_copy.png
-share/gnome/gtkhtml-%%VERSION%%/icons/16_cut.png
-share/gnome/gtkhtml-%%VERSION%%/icons/16_paste.png
-share/gnome/gtkhtml-%%VERSION%%/icons/24_copy.png
-share/gnome/gtkhtml-%%VERSION%%/icons/24_cut.png
-share/gnome/gtkhtml-%%VERSION%%/icons/24_paste.png
share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png
share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png
share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png
share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png
-share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-24.png
share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png
share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-24.png
share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
share/gnome/gtkhtml-%%VERSION%%/icons/paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/properties-16.png
share/gnome/gtkhtml-%%VERSION%%/icons/rect.png
-share/gnome/gtkhtml-%%VERSION%%/icons/redo-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/redo-24.png
share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg
share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
@@ -60,28 +39,8 @@ share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/search-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/search-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-1.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-10.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-11.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-2.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-3.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-4.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-5.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-6.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-8.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-9.png
-share/gnome/gtkhtml-%%VERSION%%/icons/table-column-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/table-row-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/table-table-16.png
share/gnome/gtkhtml-%%VERSION%%/icons/texture.png
share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png
-share/gnome/gtkhtml-%%VERSION%%/icons/undo-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/undo-24.png
share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs
share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index ea04ea2..9fe9ba0 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -3,12 +3,11 @@
# Whom: eivind/dima/jseger
#
# $FreeBSD$
-# $MCom: ports-stable/www/mozilla/Makefile,v 1.15 2006/10/18 17:29:07 ahze Exp $
-#
+# $MCom: ports/www/mozilla/Makefile,v 1.43 2007/03/16 15:29:49 ahze Exp $
PORTNAME= mozilla
PORTVERSION= 1.7.13
-PORTREVISION?= 2
+PORTREVISION?= 1
PORTEPOCH= 2
CATEGORIES?= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index ba37784..784085b 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -4,7 +4,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/www/mozilla/Makefile.common,v 1.1 2006/10/18 17:29:07 ahze Exp $
+# $MCom: ports/www/mozilla/Makefile.common,v 1.45 2007/02/06 00:05:55 ahze Exp $
# This file contains some reusable components for mozilla ports. It's of
# use primarily to apps from the mozilla project itself (such as Firefox,
@@ -87,19 +87,16 @@ GENERIC_MOZCONFIG?= ${.CURDIR}/../../www/mozilla/files/mozconfig-generic.in
PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in
MOZCONFIG?= ${WRKSRC}/.mozconfig
MOZILLA_PLIST_DIRS?= bin include lib share/idl
-
+GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
PKGINSTALL?= ${WRKDIR}/pkg-install
PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall
-MASTER_MOZDIR?= ${.CURDIR}/../../www/mozilla
+MASTER_MOZDIR?= ${PORTSDIR}/www/mozilla
PKGINSTALL_INC?= ${MASTER_MOZDIR}/pkg-install.in
PKGDEINSTALL_INC?= ${MASTER_MOZDIR}/pkg-deinstall.in
EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \
--exclude */macbuild/* \
--exclude */package/* \
- --exclude .cvsignore \
- --exclude makefile.win \
- --exclude MANIFEST \
--exclude mozilla/modules/libimg/png \
--exclude mozilla/jpeg \
--exclude mozilla/dbm \
@@ -111,12 +108,12 @@ JPI_LIST?=\
${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \
${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so
-PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \
+MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \
${MOZILLA}-xpcom ${MOZILLA}-plugin
-CPPFLAGS+= -I${X11BASE}/include
+CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss
CFLAGS+= ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${X11BASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
+LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
LIBS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv
_USE_GECKO_OPTIONS_ALL= java debug logging optimized_cflags
@@ -138,9 +135,10 @@ _${option}= ${TRUE}
.endfor
# Standard options from README
+MOZ_TOOLKIT?= gtk2
MOZ_OPTIONS+= --enable-crypto \
--disable-tests \
- --enable-default-toolkit=gtk2 \
+ --enable-default-toolkit=${MOZ_TOOLKIT} \
--enable-xft \
--with-pthreads
# Configure options for install
@@ -222,13 +220,6 @@ MOZ_OPTIONS+= --enable-logging
MOZ_OPTIONS+= --disable-logging
.endif
-.if exists(${LOCALBASE}/include/freetype/freetype.h)
-BROKEN= "You must upgrade your freetype port to 1.3.1_2 or higher before \
- installing ${PORTNAME}. If you have 1.3.1_2 installed, please remove \
- ${LOCALBASE}/include/freetype, then build ${PORTNAME}"
-.endif
-
-# Makefile.common defines
MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAGS}|g' \
-e 's|@CFLAGS@|${CFLAGS}|g' \
-e 's|@LDFLAGS@|${LDFLAGS}|g' \
@@ -351,7 +342,7 @@ gecko-pre-install:
.if defined(MOZILLA_SUFX) && ${MOZILLA_SUFX}!="none"
${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//} ${FAKEDIR}/bin/${MOZILLA}
${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//}-config ${FAKEDIR}/bin/${MOZILLA}-config
-.for pc in ${PKGCONFIG_FILES:S|${MOZILLA_SUFX}||}
+.for pc in ${MOZ_PKGCONFIG_FILES:S|${MOZILLA_SUFX}||}
${SED} -e 's|Requires: ${MOZILLA:S/${MOZILLA_SUFX}//}|Requires: ${MOZILLA}|' \
${FAKEDIR}/lib/pkgconfig/${pc}.pc > ${FAKEDIR}/lib/pkgconfig/${pc:S/${MOZILLA:S,${MOZILLA_SUFX},,}/${MOZILLA}/}.pc
.endfor
@@ -386,7 +377,7 @@ gecko-create-plist:
${FIND} -d * -type d | \
${SED} -e 's|^|@dirrm ${dir}/|' >> ${PLIST}
.endfor
-.for pcfile in ${PKGCONFIG_FILES}
+.for pcfile in ${MOZ_PKGCONFIG_FILES}
${ECHO_CMD} "libdata/pkgconfig/${pcfile}.pc" >> ${PLIST}
@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
-e 's|${MOZILLA}-nspr = ${PORTVERSION}|nspr|' \
@@ -409,7 +400,7 @@ gecko-do-install:
cd ${FAKEDIR}/${dir} && ${FIND} . | \
${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${dir}
.endfor
-.for pcfile in ${PKGCONFIG_FILES}
+.for pcfile in ${MOZ_PKGCONFIG_FILES}
${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \
${PREFIX}/libdata/pkgconfig/${pcfile}.pc
.endfor
diff --git a/www/mozilla/bsd.gecko.mk b/www/mozilla/bsd.gecko.mk
index d6923aa..b27dc30 100644
--- a/www/mozilla/bsd.gecko.mk
+++ b/www/mozilla/bsd.gecko.mk
@@ -2,7 +2,7 @@
# ex:ts=4
#
# $FreeBSD$
-# $MCom: ports-stable/www/mozilla/bsd.gecko.mk,v 1.3 2006/10/24 17:48:39 ahze Exp $
+# $MCom: ports/www/mozilla/bsd.gecko.mk,v 1.30 2006/12/09 15:32:06 ahze Exp $
#
# 4 column tabs prevent hair loss and tooth decay!
diff --git a/www/mozilla/pkg-deinstall.in b/www/mozilla/pkg-deinstall.in
index 535f0f5..4a0a2fb 100644
--- a/www/mozilla/pkg-deinstall.in
+++ b/www/mozilla/pkg-deinstall.in
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $MCom: ports-stable/www/mozilla/pkg-deinstall.in,v 1.9 2006/10/18 17:29:07 ahze Exp $
+# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.19 2006/12/09 15:32:06 ahze Exp $
#
# Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>)
diff --git a/www/mozilla/pkg-install.in b/www/mozilla/pkg-install.in
index f3d6e6f..8fcc2b0 100644
--- a/www/mozilla/pkg-install.in
+++ b/www/mozilla/pkg-install.in
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $MCom: ports-stable/www/mozilla/pkg-install.in,v 1.9 2006/10/18 17:29:07 ahze Exp $
+# $MCom: ports/www/mozilla/pkg-install.in,v 1.19 2006/12/09 15:32:06 ahze Exp $
#
# Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>)
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index 09918ae..ebc4bf3 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= peacock
PORTVERSION= 1.9.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,4 +20,8 @@ USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui gtksourceview gtkhtml3
GNU_CONFIGURE= yes
+post-patch:
+ @${REINPLACE_CMD} -e 's|libgtkhtml-3.8|libgtkhtml-3.14|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 242f608..137a43c 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,11 +3,12 @@
# Whom: ade, archie
#
# $FreeBSD$
-# $MCom: ports/x11-fm/nautilus/Makefile,v 1.117 2006/10/02 22:48:27 ahze Exp $
+# $MCom: ports/x11-fm/nautilus/Makefile,v 1.127 2007/03/16 16:07:42 marcus Exp $
#
PORTNAME= nautilus
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0.1
+PORTREVISION= 1
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,6 +19,7 @@ COMMENT= File manager for the GNOME desktop
LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif
+INSTALLS_ICONS= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
@@ -35,11 +37,20 @@ CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \
--enable-static
MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
+OPTIONS= TRACKER "Enable Tracker Search (sysutils/tracker)" Off
+
GCONF_SCHEMAS= apps_nautilus_preferences.schemas
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_TRACKER)
+LIB_DEPENDS+= trackerclient.0:${PORTSDIR}/sysutils/tracker
+.else
+CONFIGURE_ARGS+=--disable-tracker
+.endif
+
post-install:
${MKDIR} ${PREFIX}/lib/nautilus/extensions-1.0
@-update-desktop-database
-# @${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index 40184b7..2d40f1a 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-2.16.3.tar.bz2) = 05a0fe98d524ca5287da21845ab8490c
-SHA256 (gnome2/nautilus-2.16.3.tar.bz2) = af2ff5ad922e28cc831b4ac3d83f0f35eedcf7a3230d3df76aa9f91c3ffbc36c
-SIZE (gnome2/nautilus-2.16.3.tar.bz2) = 4268274
+MD5 (gnome2/nautilus-2.18.0.1.tar.bz2) = a4e98623e326c5daa201564eed218594
+SHA256 (gnome2/nautilus-2.18.0.1.tar.bz2) = 30fa5660a93d01d8711e974436a629de5659d034973dbff10c0734c507f03734
+SIZE (gnome2/nautilus-2.18.0.1.tar.bz2) = 4339093
diff --git a/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c
deleted file mode 100644
index 2d67d65..0000000
--- a/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnautilus-private/nautilus-emblem-utils.c.orig Mon Oct 14 22:20:28 2002
-+++ libnautilus-private/nautilus-emblem-utils.c Mon Oct 14 22:20:56 2002
-@@ -24,6 +24,7 @@
-
- #include <config.h>
-
-+#include <sys/types.h>
- #include <utime.h>
- #include <stdio.h>
- #include <time.h>
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index f5d69f1..4a600f9 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -75,10 +75,13 @@ share/gnome/pixmaps/nautilus/colors.png
share/gnome/pixmaps/nautilus/emblems.png
share/gnome/pixmaps/nautilus/erase.png
share/gnome/pixmaps/nautilus/knob.png
-share/gnome/pixmaps/nautilus/nautilus-launch-icon.png
share/gnome/pixmaps/nautilus/note-indicator.png
-share/gnome/pixmaps/nautilus/text-selection-frame.png
share/gnome/pixmaps/nautilus/thumbnail_frame.png
+share/icons/hicolor/16x16/apps/nautilus.png
+share/icons/hicolor/22x22/apps/nautilus.png
+share/icons/hicolor/24x24/apps/nautilus.png
+share/icons/hicolor/32x32/apps/nautilus.png
+share/icons/hicolor/scalable/apps/nautilus.svg
share/locale/af/LC_MESSAGES/nautilus.mo
share/locale/am/LC_MESSAGES/nautilus.mo
share/locale/ar/LC_MESSAGES/nautilus.mo
@@ -98,6 +101,7 @@ share/locale/dz/LC_MESSAGES/nautilus.mo
share/locale/el/LC_MESSAGES/nautilus.mo
share/locale/en_CA/LC_MESSAGES/nautilus.mo
share/locale/en_GB/LC_MESSAGES/nautilus.mo
+share/locale/eo/LC_MESSAGES/nautilus.mo
share/locale/es/LC_MESSAGES/nautilus.mo
share/locale/et/LC_MESSAGES/nautilus.mo
share/locale/eu/LC_MESSAGES/nautilus.mo
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 0635db5..c413b32 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.6 2006/09/10 00:51:16 mezz Exp $
+# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.12 2007/02/02 19:49:43 mezz Exp $
#
PORTNAME= fontconfig
-PORTVERSION= 2.3.2
-PORTREVISION?= 7
+PORTVERSION= 2.4.2
+PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://fontconfig.org/release/
@@ -16,46 +16,37 @@ MASTER_SITES= http://fontconfig.org/release/
MAINTAINER= gnome@FreeBSD.org
COMMENT= An XML-based font configuration API for X Windows
-PATCH_SITES+= http://www.freetype.org/freetype2/patches/
-PATCHFILES+= fontconfig-2.3.2-noftinternals.patch
-PATCH_DIST_STRIP+= -p1
-
.if !defined(REFERENCE_PORT)
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
expat.6:${PORTSDIR}/textproc/expat2
-USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
PREFIX?= ${X11BASE}
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-USE_GNOME= gnomehack gnometarget pkgconfig
+USE_AUTOTOOLS= libtool:15
+USE_GNOME= gnomehack gnometarget pkgconfig ltverhack
CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \
--with-expat-includes=${LOCALBASE}/include \
--with-expat-lib=${LOCALBASE}/lib \
--with-default-fonts=${X11BASE}/lib/X11/fonts \
+ --with-cache-dir=/var/db/fontconfig \
--without-add-fonts \
+ --mandir=${PREFIX}/man \
--disable-docs
-CONFIGURE_ENV= HASDOCBOOK=no
MAKE_ENV= LC_ALL=C
PKGINSTALL= ${WRKDIR}/pkg-install
-PKGDEINSTALL= ${PKGINSTALL}
MTREE_FILE= /etc/mtree/BSD.x11-4.dist
-MAN1= fc-match.1
+MAN1= fc-cache.1 fc-cat.1 fc-list.1 fc-match.1
MAN5= fonts-conf.5
PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
.include <bsd.port.pre.mk>
-.if defined(WITH_CJK)
-#PATCH_SITES+= http://lwj-hinet.myweb.hinet.net/ \
-# ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \
-# http://bsdchat.com/dist/firefly-cjk-patchset/
-#PATCHFILES+= cjk-fontconfig-2.3.2-20051217.patch.gz
-#PATCH_DIST_STRIP+= -p1
+.if exists(${LOCALBASE}/bin/docbook2man)
+USE_DOCBOOK2MAN= yes
.endif
post-install:
@@ -64,6 +55,11 @@ post-install:
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
.endif
${INSTALL_MAN} ${MAN5:S|^|${WRKSRC}/doc/|} ${PREFIX}/man/man5
+.if !defined(USE_DOCBOOK2MAN)
+.for manpage in ${MAN1}
+ ${INSTALL_MAN} ${FILESDIR}/${manpage} ${PREFIX}/man/man1
+.endfor
+.endif
if [ ! -f ${PREFIX}/etc/fonts/fonts.conf ]; then \
${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf; \
${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \
@@ -75,7 +71,7 @@ post-install:
> ${PKGINSTALL}
.if !defined(PACKAGE_BUILDING)
@${LDCONFIG} -m ${PREFIX}/lib
- @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
.include <bsd.port.post.mk>
diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
index 0cc28db..25c81d9 100644
--- a/x11-fonts/fontconfig/distinfo
+++ b/x11-fonts/fontconfig/distinfo
@@ -1,6 +1,3 @@
-MD5 (fontconfig-2.3.2.tar.gz) = 7354f9f125ea78a8f2851cb9c31d4866
-SHA256 (fontconfig-2.3.2.tar.gz) = 6f7b91d328d6408c097ec11777bf4b1c2c710613b573b399794bc5999ff12227
-SIZE (fontconfig-2.3.2.tar.gz) = 964045
-MD5 (fontconfig-2.3.2-noftinternals.patch) = 92cad1f7eef3edc6a34a2fd5cbbf352a
-SHA256 (fontconfig-2.3.2-noftinternals.patch) = f1b41d3438acf7624c3df767111817dfdea283e418c16b3c74d25768e6d2fedd
-SIZE (fontconfig-2.3.2-noftinternals.patch) = 18275
+MD5 (fontconfig-2.4.2.tar.gz) = f035852f521b54677f2b5c9e2f6d54a4
+SHA256 (fontconfig-2.4.2.tar.gz) = 63a3d6413182817b91eea327b58c243f1865acfc40bef61fc52d2b0431341363
+SIZE (fontconfig-2.4.2.tar.gz) = 1278340
diff --git a/x11-fonts/fontconfig/files/fc-cache.1 b/x11-fonts/fontconfig/files/fc-cache.1
new file mode 100644
index 0000000..18809ff
--- /dev/null
+++ b/x11-fonts/fontconfig/files/fc-cache.1
@@ -0,0 +1,75 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "FC-CACHE" "1" "12 November 2006" "" ""
+
+.SH NAME
+fc-cache \- build font information cache files
+.SH SYNOPSIS
+
+\fBfc-cache\fR [ \fB-fsvV?\fR ] [ \fB--force\fR ] [ \fB--system-only\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIdirs\fB\fR ]
+
+.SH "DESCRIPTION"
+.PP
+\fBfc-cache\fR scans the font directories on
+the system and builds font information cache files for
+applications using fontconfig for their font handling.
+.PP
+If directory arguments are not given,
+\fBfc-cache\fR uses each directory in the
+current font configuration. Each directory is scanned for
+font files readable by FreeType. A cache is created which
+contains properties of each font and the associated filename.
+This cache is used to speed up application startup when using
+the fontconfig library.
+.PP
+Note that \fBfc-cache\fR must be executed
+once per architecture to generate font information customized
+for that architecture. On a subsequent run,
+\fBfc-cache\fR will augment the cache
+information files with the information for the new
+architecture.
+.SH "OPTIONS"
+.PP
+This program follows the usual GNU command line syntax,
+with long options starting with two dashes (`-'). A summary of
+options is included below.
+.TP
+\fB-f --force \fR
+Force re-generation of apparently up-to-date cache files,
+overriding the timestamp checking.
+.TP
+\fB-s --system-only \fR
+Only scan system-wide directories, omitting the places
+located in the user's home directory.
+.TP
+\fB-v --verbose \fR
+Display status information while busy.
+.TP
+\fB-? --help \fR
+Show summary of options.
+.TP
+\fB-V --version \fR
+Show version of the program and exit.
+.TP
+\fB\fIdirs\fB \fR
+A list of directories to scan for fonts.
+.SH "FILES"
+.TP
+\fB\fIfonts.cache-2\fB\fR
+These files are generated by \fBfc-cache\fR
+and contain maps from file names to font properties. They are
+read by the fontconfig library at application startup to locate
+appropriate fonts.
+.SH "SEE ALSO"
+.PP
+\fBfc-list\fR (1).
+.PP
+The fontconfig user's guide, in HTML format:
+\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&.
+.SH "AUTHOR"
+.PP
+This manual page was written by Keith Packard
+<keithp@keithp.com> and Josselin Mouette <joss@debian.org>\&.
diff --git a/x11-fonts/fontconfig/files/fc-cat.1 b/x11-fonts/fontconfig/files/fc-cat.1
new file mode 100644
index 0000000..07152a0
--- /dev/null
+++ b/x11-fonts/fontconfig/files/fc-cat.1
@@ -0,0 +1,37 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "FC-CAT" "1" "12 November 2006" "" ""
+
+.SH NAME
+fc-cat \- read font information cache files
+.SH SYNOPSIS
+
+\fBfc-cat < fonts-cache-2-file >\fR [ \fB-V?\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIdirs\fB\fR ]
+
+.SH "DESCRIPTION"
+.PP
+\fBfc-cat\fR reads a font information cache file
+and emits it in ASCII form.
+.SH "OPTIONS"
+.PP
+This program follows the usual GNU command line syntax,
+with long options starting with two dashes (`-'). A summary of
+options is included below.
+.TP
+\fB-? --help \fR
+Show summary of options.
+.TP
+\fB-V --version \fR
+Show version of the program and exit.
+.SH "SEE ALSO"
+.PP
+\fBfc-cache\fR (1).
+.PP
+The fontconfig user's guide, in HTML format:
+\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&.
+.SH "AUTHOR"
+.PP
+This manual page was written by Patrick Lam <plam@mit.edu>\&.
diff --git a/x11-fonts/fontconfig/files/fc-list.1 b/x11-fonts/fontconfig/files/fc-list.1
new file mode 100644
index 0000000..0bff184
--- /dev/null
+++ b/x11-fonts/fontconfig/files/fc-list.1
@@ -0,0 +1,61 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "FC-LIST" "1" "12 November 2006" "" ""
+
+.SH NAME
+fc-list \- list available fonts
+.SH SYNOPSIS
+
+\fBfc-list\fR [ \fB-vV?\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIpattern\fB\fR ] [ \fB\fIelement\fB\fR ]
+
+.SH "DESCRIPTION"
+.PP
+\fBfc-list\fR lists fonts and styles
+available on the system for applications using fontconfig.
+.SH "OPTIONS"
+.PP
+This program follows the usual GNU command line syntax,
+with long options starting with two dashes (`-'). A summary of
+options is included below.
+.TP
+\fB-v --verbose \fR
+Display status information while busy.
+.TP
+\fB-? --help \fR
+Show summary of options.
+.TP
+\fB-V --version \fR
+Show version of the program and exit.
+.TP
+\fB\fIpattern\fB \fR
+If this argument is set, only fonts matching
+\fIpattern\fR are displayed.
+.TP
+\fB\fIelement\fB \fR
+If set, the \fIelement\fR property
+is displayed for matching fonts.
+.SH "EXAMPLES"
+.TP
+\fBfc-list\fR
+Lists all font faces.
+.TP
+\fBfc-list :lang=hi\fR
+Lists font faces that cover Hindi.
+.TP
+\fBfc-list : family style file spacing \fR
+Lists the filename and spacing value for each font
+face. ``:'' is an empty pattern that matches all
+fonts.
+.SH "SEE ALSO"
+.PP
+\fBfc-cache\fR (1).
+.PP
+The fontconfig user's guide, in HTML format:
+\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&.
+.SH "AUTHOR"
+.PP
+This manual page was written by Keith Packard
+<keithp@keithp.com> and Josselin Mouette <joss@debian.org>\&.
diff --git a/x11-fonts/fontconfig/files/fc-match.1 b/x11-fonts/fontconfig/files/fc-match.1
new file mode 100644
index 0000000..336abc3
--- /dev/null
+++ b/x11-fonts/fontconfig/files/fc-match.1
@@ -0,0 +1,51 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "FC-MATCH" "1" "12 November 2006" "" ""
+
+.SH NAME
+fc-match \- match available fonts
+.SH SYNOPSIS
+
+\fBfc-match\fR [ \fB-svV?\fR ] [ \fB--sort\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIfont-pattern\fB\fR ]
+
+.SH "DESCRIPTION"
+.PP
+\fBfc-match\fR matches font-pattern (empty
+pattern by default) using the normal fontconfig matching rules to find
+the best font available. If --sort is given, the sorted list of best
+matching fonts is displayed. With --verbose, the whole font pattern
+for each match is printed, otherwise only the file, family and style
+are printed..
+.SH "OPTIONS"
+.PP
+This program follows the usual GNU command line syntax,
+with long options starting with two dashes (`-'). A summary of
+options is included below.
+.TP
+\fB-v --verbose \fR
+Print whole font pattern for each match.
+.TP
+\fB-? --help \fR
+Show summary of options.
+.TP
+\fB-V --version \fR
+Show version of the program and exit.
+.TP
+\fB-s --sort \fR
+Displays sorted list of best matching fonts.
+.TP
+\fB\fIfont-pattern\fB \fR
+Displays fonts matching
+\fIfont-pattern\fR (uses empty pattern by default).
+.SH "SEE ALSO"
+.PP
+\fBfc-list\fR (1).
+.PP
+The fontconfig user's guide, in HTML format:
+\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&.
+.SH "AUTHOR"
+.PP
+This manual page was updated by Patrick Lam <plam@csail.mit.edu>\&.
diff --git a/x11-fonts/fontconfig/files/patch-Makefile.in b/x11-fonts/fontconfig/files/patch-Makefile.in
index 1a31035..0ebabf4 100644
--- a/x11-fonts/fontconfig/files/patch-Makefile.in
+++ b/x11-fonts/fontconfig/files/patch-Makefile.in
@@ -1,10 +1,10 @@
---- Makefile.in.orig Wed Jul 27 02:23:03 2005
-+++ Makefile.in Wed Jul 27 02:25:27 2005
-@@ -721,28 +721,7 @@
-
+--- Makefile.in.orig Sat Nov 4 14:54:15 2006
++++ Makefile.in Sat Nov 4 14:54:46 2006
+@@ -785,28 +785,6 @@ $(srcdir)/ChangeLog:
+ .PHONY: ChangeLog $(srcdir)/ChangeLog
install-data-local:
-- $(mkinstalldirs) $(DESTDIR)$(configdir)
+- $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
- if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
- echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
- mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \
@@ -16,17 +16,16 @@
- echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
- $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
- fi; fi
-- if $(RUN_FC_CACHE_TEST); then \
-- echo " fc-cache/fc-cache -f -v"; \
-- fc-cache/fc-cache -f -v; \
+- @(if $(RUN_FC_CACHE_TEST); then \
+- echo " fc-cache/fc-cache -s -f -v"; \
+- fc-cache/fc-cache -s -f -v; \
- else \
- echo "***"; \
- echo "*** Warning: fonts.cache not built"; \
- echo "***"; \
- echo "*** Generate this file manually on host system using fc-cache"; \
- echo "***"; \
-- fi
-+
+- fi)
uninstall-local:
if [ -f $(srcdir)/fonts.conf ]; then \
diff --git a/x11-fonts/fontconfig/files/patch-fc_match.c b/x11-fonts/fontconfig/files/patch-fc_match.c
deleted file mode 100644
index 5f8564f..0000000
--- a/x11-fonts/fontconfig/files/patch-fc_match.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- fc-match/fc-match.c.orig Mon Dec 6 20:25:18 2004
-+++ fc-match/fc-match.c Fri Mar 9 17:26:55 2007
-@@ -99,7 +99,7 @@
- int c;
-
- #if HAVE_GETOPT_LONG
-- while ((c = getopt_long (argc, argv, "Vv?", longopts, NULL)) != -1)
-+ while ((c = getopt_long (argc, argv, "sVv?", longopts, NULL)) != -1)
- #else
- while ((c = getopt (argc, argv, "sVv?")) != -1)
- #endif
diff --git a/x11-fonts/fontconfig/files/pkg-install.in b/x11-fonts/fontconfig/files/pkg-install.in
index dcf6ebb..e82abb4 100644
--- a/x11-fonts/fontconfig/files/pkg-install.in
+++ b/x11-fonts/fontconfig/files/pkg-install.in
@@ -6,7 +6,5 @@ export PATH
if [ "$2" = "POST-INSTALL" ]; then
echo "Running fc-cache to build fontconfig cache..."
fc-cache -f -v
-elif [ "$2" = "DEINSTALL" ]; then
- find %%PREFIX%%/lib/X11/fonts/ -name fonts.cache-1 -delete
- find %%X11BASE%%/lib/X11/fonts/ -name fonts.cache-1 -delete
+ exit 0
fi
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index 18587b6..05f221b 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -1,12 +1,47 @@
bin/fc-cache
+bin/fc-cat
bin/fc-list
bin/fc-match
-etc/fonts/conf.d/autohint.conf
-etc/fonts/conf.d/no-bitmaps.conf
-etc/fonts/conf.d/no-sub-pixel.conf
-etc/fonts/conf.d/sub-pixel.conf
-etc/fonts/conf.d/unhinted.conf
-etc/fonts/conf.d/yes-bitmaps.conf
+etc/fonts/conf.avail/10-autohint.conf
+etc/fonts/conf.avail/10-no-sub-pixel.conf
+etc/fonts/conf.avail/10-sub-pixel-bgr.conf
+etc/fonts/conf.avail/10-sub-pixel-rgb.conf
+etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
+etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
+etc/fonts/conf.avail/10-unhinted.conf
+etc/fonts/conf.avail/20-fix-globaladvance.conf
+etc/fonts/conf.avail/20-lohit-gujarati.conf
+etc/fonts/conf.avail/20-unhint-small-vera.conf
+etc/fonts/conf.avail/30-amt-aliases.conf
+etc/fonts/conf.avail/30-urw-aliases.conf
+etc/fonts/conf.avail/40-generic.conf
+etc/fonts/conf.avail/49-sansserif.conf
+etc/fonts/conf.avail/50-user.conf
+etc/fonts/conf.avail/51-local.conf
+etc/fonts/conf.avail/60-latin.conf
+etc/fonts/conf.avail/65-fonts-persian.conf
+etc/fonts/conf.avail/65-nonlatin.conf
+etc/fonts/conf.avail/69-unifont.conf
+etc/fonts/conf.avail/70-no-bitmaps.conf
+etc/fonts/conf.avail/70-yes-bitmaps.conf
+etc/fonts/conf.avail/80-delicious.conf
+etc/fonts/conf.avail/90-synthetic.conf
+etc/fonts/conf.avail/README
+etc/fonts/conf.d/20-fix-globaladvance.conf
+etc/fonts/conf.d/20-lohit-gujarati.conf
+etc/fonts/conf.d/20-unhint-small-vera.conf
+etc/fonts/conf.d/30-amt-aliases.conf
+etc/fonts/conf.d/30-urw-aliases.conf
+etc/fonts/conf.d/40-generic.conf
+etc/fonts/conf.d/49-sansserif.conf
+etc/fonts/conf.d/50-user.conf
+etc/fonts/conf.d/51-local.conf
+etc/fonts/conf.d/60-latin.conf
+etc/fonts/conf.d/65-fonts-persian.conf
+etc/fonts/conf.d/65-nonlatin.conf
+etc/fonts/conf.d/69-unifont.conf
+etc/fonts/conf.d/80-delicious.conf
+etc/fonts/conf.d/90-synthetic.conf
@unexec if cmp -s %D/etc/fonts/fonts.conf %D/etc/fonts/fonts.conf.default; then rm -f %D/etc/fonts/fonts.conf; fi
etc/fonts/fonts.conf.default
@exec [ -f %B/fonts.conf ] || cp %B/%f %B/fonts.conf
@@ -21,4 +56,6 @@ lib/libfontconfig.so.1
libdata/pkgconfig/fontconfig.pc
@dirrm include/fontconfig
@dirrmtry etc/fonts/conf.d
+@dirrmtry etc/fonts/conf.avail
@dirrmtry etc/fonts
+@unexec rm -rf /var/db/fontconfig 2>/dev/null || true
diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile
index 58f7b19..e8e5eb5 100644
--- a/x11-fonts/linux-f10-fontconfig/Makefile
+++ b/x11-fonts/linux-f10-fontconfig/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fontconfig
PORTVERSION= 2.2.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fonts linux
DISTNAME= ${PORTNAME}-${PORTVERSION}-13
@@ -28,6 +28,6 @@ post-extract:
${RM} ${WRKSRC}/etc/fonts/fonts.conf
post-install:
- ${LN} -s ${X11BASE}/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/fonts.conf
+ ${INSTALL_DATA} ${FILESDIR}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf
.include <bsd.port.mk>
diff --git a/x11-fonts/linux-f10-fontconfig/files/fonts.conf b/x11-fonts/linux-f10-fontconfig/files/fonts.conf
new file mode 100644
index 0000000..42770b4
--- /dev/null
+++ b/x11-fonts/linux-f10-fontconfig/files/fonts.conf
@@ -0,0 +1,436 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/fonts.conf file to configure system font access -->
+<fontconfig>
+
+<!--
+ DO NOT EDIT THIS FILE.
+ IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
+ LOCAL CHANGES BELONG IN 'local.conf'.
+
+ The intent of this standard configuration file is to be adequate for
+ most environments. If you have a reasonably normal environment and
+ have found problems with this configuration, they are probably
+ things that others will also want fixed. Please submit any
+ problems to the fontconfig bugzilla system located at fontconfig.org
+
+ Note that the normal 'make install' procedure for fontconfig is to
+ replace any existing fonts.conf file with the new version. Place
+ any local customizations in local.conf which this file references.
+
+ Keith Packard
+-->
+
+<!-- Font directory list -->
+
+ <dir>/usr/X11R6/lib/X11/fonts</dir>
+
+ <dir>~/.fonts</dir>
+
+<!--
+ Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+ <match target="pattern">
+ <test qual="any" name="family">
+ <string>mono</string>
+ </test>
+ <edit name="family" mode="assign">
+ <string>monospace</string>
+ </edit>
+ </match>
+
+<!--
+ Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+ <match target="pattern">
+ <test qual="any" name="family">
+ <string>sans serif</string>
+ </test>
+ <edit name="family" mode="assign">
+ <string>sans-serif</string>
+ </edit>
+ </match>
+
+<!--
+ Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+ <match target="pattern">
+ <test qual="any" name="family">
+ <string>sans</string>
+ </test>
+ <edit name="family" mode="assign">
+ <string>sans-serif</string>
+ </edit>
+ </match>
+
+<!--
+ Mark common families with their generics so we'll get
+ something reasonable
+-->
+
+<!--
+ Serif faces
+ -->
+ <alias>
+ <family>Bitstream Vera Serif</family>
+ <family>Times New Roman</family>
+ <family>Thorndale AMT</family>
+ <family>Times</family>
+ <family>Nimbus Roman No9 L</family>
+ <family>Luxi Serif</family>
+ <family>Kochi Mincho</family>
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
+ <family>ï¼­ï¼³ 明æœ</family>
+ <family>Baekmuk Batang</family>
+ <family>FreeSerif</family>
+ <default><family>serif</family></default>
+ </alias>
+<!--
+ Sans-serif faces
+ -->
+ <alias>
+ <family>Bitstream Vera Sans</family>
+ <family>Helvetica</family>
+ <family>Arial</family>
+ <family>Verdana</family>
+ <family>Albany AMT</family>
+ <family>Nimbus Sans L</family>
+ <family>Luxi Sans</family>
+ <family>Kochi Gothic</family>
+ <family>AR PL KaitiM GB</family>
+ <family>AR PL KaitiM Big5</family>
+ <family>MS ゴシック</family>
+ <family>Baekmuk Dotum</family>
+ <family>SimSun</family>
+ <family>FreeSans</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+<!--
+ Monospace faces
+ -->
+ <alias>
+ <family>Bitstream Vera Sans Mono</family>
+ <family>Courier</family>
+ <family>Courier New</family>
+ <family>Andale Mono</family>
+ <family>Luxi Mono</family>
+ <family>Cumberland AMT</family>
+ <family>Nimbus Mono L</family>
+ <family>NSimSun</family>
+ <family>FreeMono</family>
+ <default><family>monospace</family></default>
+ </alias>
+<!--
+ If the font still has no generic name, add sans-serif
+ -->
+ <match target="pattern">
+ <test qual="all" name="family" compare="not_eq">
+ <string>sans-serif</string>
+ </test>
+ <test qual="all" name="family" compare="not_eq">
+ <string>serif</string>
+ </test>
+ <test qual="all" name="family" compare="not_eq">
+ <string>monospace</string>
+ </test>
+ <edit name="family" mode="append_last">
+ <string>sans-serif</string>
+ </edit>
+ </match>
+
+<!--
+ URW provides metric and shape compatible fonts for these 3 Adobe families.
+ -->
+ <alias>
+ <family>Times</family>
+ <accept><family>Nimbus Roman No9 L</family></accept>
+ </alias>
+ <alias>
+ <family>Helvetica</family>
+ <accept><family>Nimbus Sans L</family></accept>
+ </alias>
+ <alias>
+ <family>Courier</family>
+ <accept><family>Nimbus Mono L</family></accept>
+ </alias>
+
+<!--
+ AMT provides metric and shape compatible fonts for these three web font
+ families.
+ -->
+ <alias>
+ <family>Times New Roman</family>
+ <accept><family>Thorndale AMT</family></accept>
+ </alias>
+ <alias>
+ <family>Arial</family>
+ <accept><family>Albany AMT</family></accept>
+ </alias>
+ <alias>
+ <family>Courier New</family>
+ <accept><family>Cumberland AMT</family></accept>
+ </alias>
+
+<!--
+ Some Asian fonts misadvertise themselves as monospaced when
+ in fact they are dual-spaced (half and full). This makes
+ FreeType very confused as it forces all widths to match.
+ Undo this magic by disabling the width forcing code -->
+ <match target="font">
+ <test name="family"><string>GulimChe</string></test>
+ <edit name="globaladvance"><bool>false</bool></edit>
+ </match>
+
+ <match target="font">
+ <test name="family"><string>DotumChe</string></test>
+ <edit name="globaladvance"><bool>false</bool></edit>
+ </match>
+
+ <match target="font">
+ <test name="family"><string>BatangChe</string></test>
+ <edit name="globaladvance"><bool>false</bool></edit>
+ </match>
+
+ <match target="font">
+ <test name="family"><string>GungsuhChe</string></test>
+ <edit name="globaladvance"><bool>false</bool></edit>
+ </match>
+
+<!--
+ The Bitstream Vera fonts have GASP entries suggesting that hinting be
+ disabled below 8 ppem, but FreeType ignores those, preferring to use
+ the data found in the instructed hints. The initial Vera release
+ didn't include the right instructions in the 'prep' table. Fix this
+ by disabling hinting manually at smaller sizes (< 8ppem)
+ -->
+
+ <match target="font">
+ <test name="family">
+ <string>Bitstream Vera Sans</string>
+ </test>
+ <test name="pixelsize" compare="less">
+ <double>7.5</double>
+ </test>
+ <edit name="hinting">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+ <match target="font">
+ <test name="family">
+ <string>Bitstream Vera Serif</string>
+ </test>
+ <test name="pixelsize" compare="less">
+ <double>7.5</double>
+ </test>
+ <edit name="hinting">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+ <match target="font">
+ <test name="family">
+ <string>Bitstream Vera Sans Mono</string>
+ </test>
+ <test name="pixelsize" compare="less">
+ <double>7.5</double>
+ </test>
+ <edit name="hinting">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+<!--
+ Load per-user customization file
+-->
+ <include ignore_missing="yes">~/.fonts.conf</include>
+
+<!--
+ Load local system customization file
+-->
+ <include ignore_missing="yes">conf.d</include>
+ <include ignore_missing="yes">local.conf</include>
+
+<!--
+ Provide required aliases for standard names
+-->
+ <alias>
+ <family>serif</family>
+ <prefer>
+ <family>Bitstream Vera Serif</family>
+ <family>Times New Roman</family>
+ <family>Thorndale AMT</family>
+ <family>Luxi Serif</family>
+ <family>Nimbus Roman No9 L</family>
+ <family>Times</family>
+ <family>Frank Ruehl</family>
+ <family>Kochi Mincho</family>
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
+ <family>ï¼­ï¼³ 明æœ</family>
+ <family>Baekmuk Batang</family>
+ <family>FreeSerif</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>sans-serif</family>
+ <prefer>
+ <family>Bitstream Vera Sans</family>
+ <family>Verdana</family>
+ <family>Arial</family>
+ <family>Albany AMT</family>
+ <family>Luxi Sans</family>
+ <family>Nimbus Sans L</family>
+ <family>Helvetica</family>
+ <family>Nachlieli</family>
+ <family>Kochi Gothic</family>
+ <family>AR PL KaitiM GB</family>
+ <family>AR PL KaitiM Big5</family>
+ <family>MS ゴシック</family>
+ <family>Baekmuk Dotum</family>
+ <family>SimSun</family>
+ <family>FreeSans</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>monospace</family>
+ <prefer>
+ <family>Bitstream Vera Sans Mono</family>
+ <family>Andale Mono</family>
+ <family>Courier New</family>
+ <family>Cumberland AMT</family>
+ <family>Luxi Mono</family>
+ <family>Nimbus Mono L</family>
+ <family>Courier</family>
+ <family>Miriam Mono</family>
+ <family>Kochi Gothic</family>
+ <family>AR PL KaitiM GB</family>
+ <family>Baekmuk Dotum</family>
+ <family>FreeMono</family>
+ </prefer>
+ </alias>
+
+<!--
+ Artificial oblique for fonts without an italic or oblique version
+ -->
+
+ <match target="font">
+ <!-- check to see if the font is roman -->
+ <test name="slant">
+ <const>roman</const>
+ </test>
+ <!-- check to see if the pattern requested non-roman -->
+ <test target="pattern" name="slant" compare="not_eq">
+ <const>roman</const>
+ </test>
+ <!-- multiply the matrix to slant the font -->
+ <edit name="matrix" mode="assign">
+ <times>
+ <name>matrix</name>
+ <matrix><double>1</double><double>0.2</double>
+ <double>0</double><double>1</double>
+ </matrix>
+ </times>
+ </edit>
+ <!-- pretend the font is oblique now -->
+ <edit name="slant" mode="assign">
+ <const>oblique</const>
+ </edit>
+ </match>
+
+<!--
+ Synthetic emboldening for fonts that do not have bold face available
+ -->
+
+ <match target="font">
+ <!-- check to see if the font is just regular -->
+ <test name="weight" compare="less_eq">
+ <int>100</int>
+ </test>
+ <!-- check to see if the pattern requests bold -->
+ <test target="pattern" name="weight" compare="more_eq">
+ <int>200</int>
+ </test>
+ <!-- set the embolden flag -->
+ <edit name="embolden" mode="assign">
+ <bool>true</bool>
+ </edit>
+ </match>
+
+
+ <config>
+<!--
+ These are the default Unicode chars that are expected to be blank
+ in fonts. All other blank chars are assumed to be broken and
+ won't appear in the resulting charsets
+ -->
+ <blank>
+ <int>0x0020</int> <!-- SPACE -->
+ <int>0x00A0</int> <!-- NO-BREAK SPACE -->
+ <int>0x00AD</int> <!-- SOFT HYPHEN -->
+ <int>0x034F</int> <!-- COMBINING GRAPHEME JOINER -->
+ <int>0x0600</int> <!-- ARABIC NUMBER SIGN -->
+ <int>0x0601</int> <!-- ARABIC SIGN SANAH -->
+ <int>0x0602</int> <!-- ARABIC FOOTNOTE MARKER -->
+ <int>0x0603</int> <!-- ARABIC SIGN SAFHA -->
+ <int>0x06DD</int> <!-- ARABIC END OF AYAH -->
+ <int>0x070F</int> <!-- SYRIAC ABBREVIATION MARK -->
+ <int>0x115F</int> <!-- HANGUL CHOSEONG FILLER -->
+ <int>0x1160</int> <!-- HANGUL JUNGSEONG FILLER -->
+ <int>0x1680</int> <!-- OGHAM SPACE MARK -->
+ <int>0x17B4</int> <!-- KHMER VOWEL INHERENT AQ -->
+ <int>0x17B5</int> <!-- KHMER VOWEL INHERENT AA -->
+ <int>0x180E</int> <!-- MONGOLIAN VOWEL SEPARATOR -->
+ <int>0x2000</int> <!-- EN QUAD -->
+ <int>0x2001</int> <!-- EM QUAD -->
+ <int>0x2002</int> <!-- EN SPACE -->
+ <int>0x2003</int> <!-- EM SPACE -->
+ <int>0x2004</int> <!-- THREE-PER-EM SPACE -->
+ <int>0x2005</int> <!-- FOUR-PER-EM SPACE -->
+ <int>0x2006</int> <!-- SIX-PER-EM SPACE -->
+ <int>0x2007</int> <!-- FIGURE SPACE -->
+ <int>0x2008</int> <!-- PUNCTUATION SPACE -->
+ <int>0x2009</int> <!-- THIN SPACE -->
+ <int>0x200A</int> <!-- HAIR SPACE -->
+ <int>0x200B</int> <!-- ZERO WIDTH SPACE -->
+ <int>0x200C</int> <!-- ZERO WIDTH NON-JOINER -->
+ <int>0x200D</int> <!-- ZERO WIDTH JOINER -->
+ <int>0x200E</int> <!-- LEFT-TO-RIGHT MARK -->
+ <int>0x200F</int> <!-- RIGHT-TO-LEFT MARK -->
+ <int>0x2028</int> <!-- LINE SEPARATOR -->
+ <int>0x2029</int> <!-- PARAGRAPH SEPARATOR -->
+ <int>0x202A</int> <!-- LEFT-TO-RIGHT EMBEDDING -->
+ <int>0x202B</int> <!-- RIGHT-TO-LEFT EMBEDDING -->
+ <int>0x202C</int> <!-- POP DIRECTIONAL FORMATTING -->
+ <int>0x202D</int> <!-- LEFT-TO-RIGHT OVERRIDE -->
+ <int>0x202E</int> <!-- RIGHT-TO-LEFT OVERRIDE -->
+ <int>0x202F</int> <!-- NARROW NO-BREAK SPACE -->
+ <int>0x205F</int> <!-- MEDIUM MATHEMATICAL SPACE -->
+ <int>0x2060</int> <!-- WORD JOINER -->
+ <int>0x2061</int> <!-- FUNCTION APPLICATION -->
+ <int>0x2062</int> <!-- INVISIBLE TIMES -->
+ <int>0x2063</int> <!-- INVISIBLE SEPARATOR -->
+ <int>0x206A</int> <!-- INHIBIT SYMMETRIC SWAPPING -->
+ <int>0x206B</int> <!-- ACTIVATE SYMMETRIC SWAPPING -->
+ <int>0x206C</int> <!-- INHIBIT ARABIC FORM SHAPING -->
+ <int>0x206D</int> <!-- ACTIVATE ARABIC FORM SHAPING -->
+ <int>0x206E</int> <!-- NATIONAL DIGIT SHAPES -->
+ <int>0x206F</int> <!-- NOMINAL DIGIT SHAPES -->
+ <int>0x3000</int> <!-- IDEOGRAPHIC SPACE -->
+ <int>0x3164</int> <!-- HANGUL FILLER -->
+ <int>0xFEFF</int> <!-- ZERO WIDTH NO-BREAK SPACE -->
+ <int>0xFFA0</int> <!-- HALFWIDTH HANGUL FILLER -->
+ <int>0xFFF9</int> <!-- INTERLINEAR ANNOTATION ANCHOR -->
+ <int>0xFFFA</int> <!-- INTERLINEAR ANNOTATION SEPARATOR -->
+ <int>0xFFFB</int> <!-- INTERLINEAR ANNOTATION TERMINATOR -->
+ </blank>
+<!--
+ Rescan configuration every 30 seconds when FcFontSetList is called
+ -->
+ <rescan>
+ <int>30</int>
+ </rescan>
+ </config>
+
+</fontconfig>
diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile
index 58f7b19..e8e5eb5 100644
--- a/x11-fonts/linux-f8-fontconfig/Makefile
+++ b/x11-fonts/linux-f8-fontconfig/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fontconfig
PORTVERSION= 2.2.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fonts linux
DISTNAME= ${PORTNAME}-${PORTVERSION}-13
@@ -28,6 +28,6 @@ post-extract:
${RM} ${WRKSRC}/etc/fonts/fonts.conf
post-install:
- ${LN} -s ${X11BASE}/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/fonts.conf
+ ${INSTALL_DATA} ${FILESDIR}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf
.include <bsd.port.mk>
diff --git a/x11-fonts/linux-f8-fontconfig/files/fonts.conf b/x11-fonts/linux-f8-fontconfig/files/fonts.conf
new file mode 100644
index 0000000..42770b4
--- /dev/null
+++ b/x11-fonts/linux-f8-fontconfig/files/fonts.conf
@@ -0,0 +1,436 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/fonts.conf file to configure system font access -->
+<fontconfig>
+
+<!--
+ DO NOT EDIT THIS FILE.
+ IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
+ LOCAL CHANGES BELONG IN 'local.conf'.
+
+ The intent of this standard configuration file is to be adequate for
+ most environments. If you have a reasonably normal environment and
+ have found problems with this configuration, they are probably
+ things that others will also want fixed. Please submit any
+ problems to the fontconfig bugzilla system located at fontconfig.org
+
+ Note that the normal 'make install' procedure for fontconfig is to
+ replace any existing fonts.conf file with the new version. Place
+ any local customizations in local.conf which this file references.
+
+ Keith Packard
+-->
+
+<!-- Font directory list -->
+
+ <dir>/usr/X11R6/lib/X11/fonts</dir>
+
+ <dir>~/.fonts</dir>
+
+<!--
+ Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+ <match target="pattern">
+ <test qual="any" name="family">
+ <string>mono</string>
+ </test>
+ <edit name="family" mode="assign">
+ <string>monospace</string>
+ </edit>
+ </match>
+
+<!--
+ Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+ <match target="pattern">
+ <test qual="any" name="family">
+ <string>sans serif</string>
+ </test>
+ <edit name="family" mode="assign">
+ <string>sans-serif</string>
+ </edit>
+ </match>
+
+<!--
+ Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+ <match target="pattern">
+ <test qual="any" name="family">
+ <string>sans</string>
+ </test>
+ <edit name="family" mode="assign">
+ <string>sans-serif</string>
+ </edit>
+ </match>
+
+<!--
+ Mark common families with their generics so we'll get
+ something reasonable
+-->
+
+<!--
+ Serif faces
+ -->
+ <alias>
+ <family>Bitstream Vera Serif</family>
+ <family>Times New Roman</family>
+ <family>Thorndale AMT</family>
+ <family>Times</family>
+ <family>Nimbus Roman No9 L</family>
+ <family>Luxi Serif</family>
+ <family>Kochi Mincho</family>
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
+ <family>ï¼­ï¼³ 明æœ</family>
+ <family>Baekmuk Batang</family>
+ <family>FreeSerif</family>
+ <default><family>serif</family></default>
+ </alias>
+<!--
+ Sans-serif faces
+ -->
+ <alias>
+ <family>Bitstream Vera Sans</family>
+ <family>Helvetica</family>
+ <family>Arial</family>
+ <family>Verdana</family>
+ <family>Albany AMT</family>
+ <family>Nimbus Sans L</family>
+ <family>Luxi Sans</family>
+ <family>Kochi Gothic</family>
+ <family>AR PL KaitiM GB</family>
+ <family>AR PL KaitiM Big5</family>
+ <family>MS ゴシック</family>
+ <family>Baekmuk Dotum</family>
+ <family>SimSun</family>
+ <family>FreeSans</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+<!--
+ Monospace faces
+ -->
+ <alias>
+ <family>Bitstream Vera Sans Mono</family>
+ <family>Courier</family>
+ <family>Courier New</family>
+ <family>Andale Mono</family>
+ <family>Luxi Mono</family>
+ <family>Cumberland AMT</family>
+ <family>Nimbus Mono L</family>
+ <family>NSimSun</family>
+ <family>FreeMono</family>
+ <default><family>monospace</family></default>
+ </alias>
+<!--
+ If the font still has no generic name, add sans-serif
+ -->
+ <match target="pattern">
+ <test qual="all" name="family" compare="not_eq">
+ <string>sans-serif</string>
+ </test>
+ <test qual="all" name="family" compare="not_eq">
+ <string>serif</string>
+ </test>
+ <test qual="all" name="family" compare="not_eq">
+ <string>monospace</string>
+ </test>
+ <edit name="family" mode="append_last">
+ <string>sans-serif</string>
+ </edit>
+ </match>
+
+<!--
+ URW provides metric and shape compatible fonts for these 3 Adobe families.
+ -->
+ <alias>
+ <family>Times</family>
+ <accept><family>Nimbus Roman No9 L</family></accept>
+ </alias>
+ <alias>
+ <family>Helvetica</family>
+ <accept><family>Nimbus Sans L</family></accept>
+ </alias>
+ <alias>
+ <family>Courier</family>
+ <accept><family>Nimbus Mono L</family></accept>
+ </alias>
+
+<!--
+ AMT provides metric and shape compatible fonts for these three web font
+ families.
+ -->
+ <alias>
+ <family>Times New Roman</family>
+ <accept><family>Thorndale AMT</family></accept>
+ </alias>
+ <alias>
+ <family>Arial</family>
+ <accept><family>Albany AMT</family></accept>
+ </alias>
+ <alias>
+ <family>Courier New</family>
+ <accept><family>Cumberland AMT</family></accept>
+ </alias>
+
+<!--
+ Some Asian fonts misadvertise themselves as monospaced when
+ in fact they are dual-spaced (half and full). This makes
+ FreeType very confused as it forces all widths to match.
+ Undo this magic by disabling the width forcing code -->
+ <match target="font">
+ <test name="family"><string>GulimChe</string></test>
+ <edit name="globaladvance"><bool>false</bool></edit>
+ </match>
+
+ <match target="font">
+ <test name="family"><string>DotumChe</string></test>
+ <edit name="globaladvance"><bool>false</bool></edit>
+ </match>
+
+ <match target="font">
+ <test name="family"><string>BatangChe</string></test>
+ <edit name="globaladvance"><bool>false</bool></edit>
+ </match>
+
+ <match target="font">
+ <test name="family"><string>GungsuhChe</string></test>
+ <edit name="globaladvance"><bool>false</bool></edit>
+ </match>
+
+<!--
+ The Bitstream Vera fonts have GASP entries suggesting that hinting be
+ disabled below 8 ppem, but FreeType ignores those, preferring to use
+ the data found in the instructed hints. The initial Vera release
+ didn't include the right instructions in the 'prep' table. Fix this
+ by disabling hinting manually at smaller sizes (< 8ppem)
+ -->
+
+ <match target="font">
+ <test name="family">
+ <string>Bitstream Vera Sans</string>
+ </test>
+ <test name="pixelsize" compare="less">
+ <double>7.5</double>
+ </test>
+ <edit name="hinting">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+ <match target="font">
+ <test name="family">
+ <string>Bitstream Vera Serif</string>
+ </test>
+ <test name="pixelsize" compare="less">
+ <double>7.5</double>
+ </test>
+ <edit name="hinting">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+ <match target="font">
+ <test name="family">
+ <string>Bitstream Vera Sans Mono</string>
+ </test>
+ <test name="pixelsize" compare="less">
+ <double>7.5</double>
+ </test>
+ <edit name="hinting">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+<!--
+ Load per-user customization file
+-->
+ <include ignore_missing="yes">~/.fonts.conf</include>
+
+<!--
+ Load local system customization file
+-->
+ <include ignore_missing="yes">conf.d</include>
+ <include ignore_missing="yes">local.conf</include>
+
+<!--
+ Provide required aliases for standard names
+-->
+ <alias>
+ <family>serif</family>
+ <prefer>
+ <family>Bitstream Vera Serif</family>
+ <family>Times New Roman</family>
+ <family>Thorndale AMT</family>
+ <family>Luxi Serif</family>
+ <family>Nimbus Roman No9 L</family>
+ <family>Times</family>
+ <family>Frank Ruehl</family>
+ <family>Kochi Mincho</family>
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
+ <family>ï¼­ï¼³ 明æœ</family>
+ <family>Baekmuk Batang</family>
+ <family>FreeSerif</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>sans-serif</family>
+ <prefer>
+ <family>Bitstream Vera Sans</family>
+ <family>Verdana</family>
+ <family>Arial</family>
+ <family>Albany AMT</family>
+ <family>Luxi Sans</family>
+ <family>Nimbus Sans L</family>
+ <family>Helvetica</family>
+ <family>Nachlieli</family>
+ <family>Kochi Gothic</family>
+ <family>AR PL KaitiM GB</family>
+ <family>AR PL KaitiM Big5</family>
+ <family>MS ゴシック</family>
+ <family>Baekmuk Dotum</family>
+ <family>SimSun</family>
+ <family>FreeSans</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>monospace</family>
+ <prefer>
+ <family>Bitstream Vera Sans Mono</family>
+ <family>Andale Mono</family>
+ <family>Courier New</family>
+ <family>Cumberland AMT</family>
+ <family>Luxi Mono</family>
+ <family>Nimbus Mono L</family>
+ <family>Courier</family>
+ <family>Miriam Mono</family>
+ <family>Kochi Gothic</family>
+ <family>AR PL KaitiM GB</family>
+ <family>Baekmuk Dotum</family>
+ <family>FreeMono</family>
+ </prefer>
+ </alias>
+
+<!--
+ Artificial oblique for fonts without an italic or oblique version
+ -->
+
+ <match target="font">
+ <!-- check to see if the font is roman -->
+ <test name="slant">
+ <const>roman</const>
+ </test>
+ <!-- check to see if the pattern requested non-roman -->
+ <test target="pattern" name="slant" compare="not_eq">
+ <const>roman</const>
+ </test>
+ <!-- multiply the matrix to slant the font -->
+ <edit name="matrix" mode="assign">
+ <times>
+ <name>matrix</name>
+ <matrix><double>1</double><double>0.2</double>
+ <double>0</double><double>1</double>
+ </matrix>
+ </times>
+ </edit>
+ <!-- pretend the font is oblique now -->
+ <edit name="slant" mode="assign">
+ <const>oblique</const>
+ </edit>
+ </match>
+
+<!--
+ Synthetic emboldening for fonts that do not have bold face available
+ -->
+
+ <match target="font">
+ <!-- check to see if the font is just regular -->
+ <test name="weight" compare="less_eq">
+ <int>100</int>
+ </test>
+ <!-- check to see if the pattern requests bold -->
+ <test target="pattern" name="weight" compare="more_eq">
+ <int>200</int>
+ </test>
+ <!-- set the embolden flag -->
+ <edit name="embolden" mode="assign">
+ <bool>true</bool>
+ </edit>
+ </match>
+
+
+ <config>
+<!--
+ These are the default Unicode chars that are expected to be blank
+ in fonts. All other blank chars are assumed to be broken and
+ won't appear in the resulting charsets
+ -->
+ <blank>
+ <int>0x0020</int> <!-- SPACE -->
+ <int>0x00A0</int> <!-- NO-BREAK SPACE -->
+ <int>0x00AD</int> <!-- SOFT HYPHEN -->
+ <int>0x034F</int> <!-- COMBINING GRAPHEME JOINER -->
+ <int>0x0600</int> <!-- ARABIC NUMBER SIGN -->
+ <int>0x0601</int> <!-- ARABIC SIGN SANAH -->
+ <int>0x0602</int> <!-- ARABIC FOOTNOTE MARKER -->
+ <int>0x0603</int> <!-- ARABIC SIGN SAFHA -->
+ <int>0x06DD</int> <!-- ARABIC END OF AYAH -->
+ <int>0x070F</int> <!-- SYRIAC ABBREVIATION MARK -->
+ <int>0x115F</int> <!-- HANGUL CHOSEONG FILLER -->
+ <int>0x1160</int> <!-- HANGUL JUNGSEONG FILLER -->
+ <int>0x1680</int> <!-- OGHAM SPACE MARK -->
+ <int>0x17B4</int> <!-- KHMER VOWEL INHERENT AQ -->
+ <int>0x17B5</int> <!-- KHMER VOWEL INHERENT AA -->
+ <int>0x180E</int> <!-- MONGOLIAN VOWEL SEPARATOR -->
+ <int>0x2000</int> <!-- EN QUAD -->
+ <int>0x2001</int> <!-- EM QUAD -->
+ <int>0x2002</int> <!-- EN SPACE -->
+ <int>0x2003</int> <!-- EM SPACE -->
+ <int>0x2004</int> <!-- THREE-PER-EM SPACE -->
+ <int>0x2005</int> <!-- FOUR-PER-EM SPACE -->
+ <int>0x2006</int> <!-- SIX-PER-EM SPACE -->
+ <int>0x2007</int> <!-- FIGURE SPACE -->
+ <int>0x2008</int> <!-- PUNCTUATION SPACE -->
+ <int>0x2009</int> <!-- THIN SPACE -->
+ <int>0x200A</int> <!-- HAIR SPACE -->
+ <int>0x200B</int> <!-- ZERO WIDTH SPACE -->
+ <int>0x200C</int> <!-- ZERO WIDTH NON-JOINER -->
+ <int>0x200D</int> <!-- ZERO WIDTH JOINER -->
+ <int>0x200E</int> <!-- LEFT-TO-RIGHT MARK -->
+ <int>0x200F</int> <!-- RIGHT-TO-LEFT MARK -->
+ <int>0x2028</int> <!-- LINE SEPARATOR -->
+ <int>0x2029</int> <!-- PARAGRAPH SEPARATOR -->
+ <int>0x202A</int> <!-- LEFT-TO-RIGHT EMBEDDING -->
+ <int>0x202B</int> <!-- RIGHT-TO-LEFT EMBEDDING -->
+ <int>0x202C</int> <!-- POP DIRECTIONAL FORMATTING -->
+ <int>0x202D</int> <!-- LEFT-TO-RIGHT OVERRIDE -->
+ <int>0x202E</int> <!-- RIGHT-TO-LEFT OVERRIDE -->
+ <int>0x202F</int> <!-- NARROW NO-BREAK SPACE -->
+ <int>0x205F</int> <!-- MEDIUM MATHEMATICAL SPACE -->
+ <int>0x2060</int> <!-- WORD JOINER -->
+ <int>0x2061</int> <!-- FUNCTION APPLICATION -->
+ <int>0x2062</int> <!-- INVISIBLE TIMES -->
+ <int>0x2063</int> <!-- INVISIBLE SEPARATOR -->
+ <int>0x206A</int> <!-- INHIBIT SYMMETRIC SWAPPING -->
+ <int>0x206B</int> <!-- ACTIVATE SYMMETRIC SWAPPING -->
+ <int>0x206C</int> <!-- INHIBIT ARABIC FORM SHAPING -->
+ <int>0x206D</int> <!-- ACTIVATE ARABIC FORM SHAPING -->
+ <int>0x206E</int> <!-- NATIONAL DIGIT SHAPES -->
+ <int>0x206F</int> <!-- NOMINAL DIGIT SHAPES -->
+ <int>0x3000</int> <!-- IDEOGRAPHIC SPACE -->
+ <int>0x3164</int> <!-- HANGUL FILLER -->
+ <int>0xFEFF</int> <!-- ZERO WIDTH NO-BREAK SPACE -->
+ <int>0xFFA0</int> <!-- HALFWIDTH HANGUL FILLER -->
+ <int>0xFFF9</int> <!-- INTERLINEAR ANNOTATION ANCHOR -->
+ <int>0xFFFA</int> <!-- INTERLINEAR ANNOTATION SEPARATOR -->
+ <int>0xFFFB</int> <!-- INTERLINEAR ANNOTATION TERMINATOR -->
+ </blank>
+<!--
+ Rescan configuration every 30 seconds when FcFontSetList is called
+ -->
+ <rescan>
+ <int>30</int>
+ </rescan>
+ </config>
+
+</fontconfig>
diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile
index 58f7b19..e8e5eb5 100644
--- a/x11-fonts/linux-fontconfig/Makefile
+++ b/x11-fonts/linux-fontconfig/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fontconfig
PORTVERSION= 2.2.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fonts linux
DISTNAME= ${PORTNAME}-${PORTVERSION}-13
@@ -28,6 +28,6 @@ post-extract:
${RM} ${WRKSRC}/etc/fonts/fonts.conf
post-install:
- ${LN} -s ${X11BASE}/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/fonts.conf
+ ${INSTALL_DATA} ${FILESDIR}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf
.include <bsd.port.mk>
diff --git a/x11-fonts/linux-fontconfig/files/fonts.conf b/x11-fonts/linux-fontconfig/files/fonts.conf
new file mode 100644
index 0000000..42770b4
--- /dev/null
+++ b/x11-fonts/linux-fontconfig/files/fonts.conf
@@ -0,0 +1,436 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/fonts.conf file to configure system font access -->
+<fontconfig>
+
+<!--
+ DO NOT EDIT THIS FILE.
+ IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
+ LOCAL CHANGES BELONG IN 'local.conf'.
+
+ The intent of this standard configuration file is to be adequate for
+ most environments. If you have a reasonably normal environment and
+ have found problems with this configuration, they are probably
+ things that others will also want fixed. Please submit any
+ problems to the fontconfig bugzilla system located at fontconfig.org
+
+ Note that the normal 'make install' procedure for fontconfig is to
+ replace any existing fonts.conf file with the new version. Place
+ any local customizations in local.conf which this file references.
+
+ Keith Packard
+-->
+
+<!-- Font directory list -->
+
+ <dir>/usr/X11R6/lib/X11/fonts</dir>
+
+ <dir>~/.fonts</dir>
+
+<!--
+ Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+ <match target="pattern">
+ <test qual="any" name="family">
+ <string>mono</string>
+ </test>
+ <edit name="family" mode="assign">
+ <string>monospace</string>
+ </edit>
+ </match>
+
+<!--
+ Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+ <match target="pattern">
+ <test qual="any" name="family">
+ <string>sans serif</string>
+ </test>
+ <edit name="family" mode="assign">
+ <string>sans-serif</string>
+ </edit>
+ </match>
+
+<!--
+ Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+ <match target="pattern">
+ <test qual="any" name="family">
+ <string>sans</string>
+ </test>
+ <edit name="family" mode="assign">
+ <string>sans-serif</string>
+ </edit>
+ </match>
+
+<!--
+ Mark common families with their generics so we'll get
+ something reasonable
+-->
+
+<!--
+ Serif faces
+ -->
+ <alias>
+ <family>Bitstream Vera Serif</family>
+ <family>Times New Roman</family>
+ <family>Thorndale AMT</family>
+ <family>Times</family>
+ <family>Nimbus Roman No9 L</family>
+ <family>Luxi Serif</family>
+ <family>Kochi Mincho</family>
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
+ <family>ï¼­ï¼³ 明æœ</family>
+ <family>Baekmuk Batang</family>
+ <family>FreeSerif</family>
+ <default><family>serif</family></default>
+ </alias>
+<!--
+ Sans-serif faces
+ -->
+ <alias>
+ <family>Bitstream Vera Sans</family>
+ <family>Helvetica</family>
+ <family>Arial</family>
+ <family>Verdana</family>
+ <family>Albany AMT</family>
+ <family>Nimbus Sans L</family>
+ <family>Luxi Sans</family>
+ <family>Kochi Gothic</family>
+ <family>AR PL KaitiM GB</family>
+ <family>AR PL KaitiM Big5</family>
+ <family>MS ゴシック</family>
+ <family>Baekmuk Dotum</family>
+ <family>SimSun</family>
+ <family>FreeSans</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+<!--
+ Monospace faces
+ -->
+ <alias>
+ <family>Bitstream Vera Sans Mono</family>
+ <family>Courier</family>
+ <family>Courier New</family>
+ <family>Andale Mono</family>
+ <family>Luxi Mono</family>
+ <family>Cumberland AMT</family>
+ <family>Nimbus Mono L</family>
+ <family>NSimSun</family>
+ <family>FreeMono</family>
+ <default><family>monospace</family></default>
+ </alias>
+<!--
+ If the font still has no generic name, add sans-serif
+ -->
+ <match target="pattern">
+ <test qual="all" name="family" compare="not_eq">
+ <string>sans-serif</string>
+ </test>
+ <test qual="all" name="family" compare="not_eq">
+ <string>serif</string>
+ </test>
+ <test qual="all" name="family" compare="not_eq">
+ <string>monospace</string>
+ </test>
+ <edit name="family" mode="append_last">
+ <string>sans-serif</string>
+ </edit>
+ </match>
+
+<!--
+ URW provides metric and shape compatible fonts for these 3 Adobe families.
+ -->
+ <alias>
+ <family>Times</family>
+ <accept><family>Nimbus Roman No9 L</family></accept>
+ </alias>
+ <alias>
+ <family>Helvetica</family>
+ <accept><family>Nimbus Sans L</family></accept>
+ </alias>
+ <alias>
+ <family>Courier</family>
+ <accept><family>Nimbus Mono L</family></accept>
+ </alias>
+
+<!--
+ AMT provides metric and shape compatible fonts for these three web font
+ families.
+ -->
+ <alias>
+ <family>Times New Roman</family>
+ <accept><family>Thorndale AMT</family></accept>
+ </alias>
+ <alias>
+ <family>Arial</family>
+ <accept><family>Albany AMT</family></accept>
+ </alias>
+ <alias>
+ <family>Courier New</family>
+ <accept><family>Cumberland AMT</family></accept>
+ </alias>
+
+<!--
+ Some Asian fonts misadvertise themselves as monospaced when
+ in fact they are dual-spaced (half and full). This makes
+ FreeType very confused as it forces all widths to match.
+ Undo this magic by disabling the width forcing code -->
+ <match target="font">
+ <test name="family"><string>GulimChe</string></test>
+ <edit name="globaladvance"><bool>false</bool></edit>
+ </match>
+
+ <match target="font">
+ <test name="family"><string>DotumChe</string></test>
+ <edit name="globaladvance"><bool>false</bool></edit>
+ </match>
+
+ <match target="font">
+ <test name="family"><string>BatangChe</string></test>
+ <edit name="globaladvance"><bool>false</bool></edit>
+ </match>
+
+ <match target="font">
+ <test name="family"><string>GungsuhChe</string></test>
+ <edit name="globaladvance"><bool>false</bool></edit>
+ </match>
+
+<!--
+ The Bitstream Vera fonts have GASP entries suggesting that hinting be
+ disabled below 8 ppem, but FreeType ignores those, preferring to use
+ the data found in the instructed hints. The initial Vera release
+ didn't include the right instructions in the 'prep' table. Fix this
+ by disabling hinting manually at smaller sizes (< 8ppem)
+ -->
+
+ <match target="font">
+ <test name="family">
+ <string>Bitstream Vera Sans</string>
+ </test>
+ <test name="pixelsize" compare="less">
+ <double>7.5</double>
+ </test>
+ <edit name="hinting">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+ <match target="font">
+ <test name="family">
+ <string>Bitstream Vera Serif</string>
+ </test>
+ <test name="pixelsize" compare="less">
+ <double>7.5</double>
+ </test>
+ <edit name="hinting">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+ <match target="font">
+ <test name="family">
+ <string>Bitstream Vera Sans Mono</string>
+ </test>
+ <test name="pixelsize" compare="less">
+ <double>7.5</double>
+ </test>
+ <edit name="hinting">
+ <bool>false</bool>
+ </edit>
+ </match>
+
+<!--
+ Load per-user customization file
+-->
+ <include ignore_missing="yes">~/.fonts.conf</include>
+
+<!--
+ Load local system customization file
+-->
+ <include ignore_missing="yes">conf.d</include>
+ <include ignore_missing="yes">local.conf</include>
+
+<!--
+ Provide required aliases for standard names
+-->
+ <alias>
+ <family>serif</family>
+ <prefer>
+ <family>Bitstream Vera Serif</family>
+ <family>Times New Roman</family>
+ <family>Thorndale AMT</family>
+ <family>Luxi Serif</family>
+ <family>Nimbus Roman No9 L</family>
+ <family>Times</family>
+ <family>Frank Ruehl</family>
+ <family>Kochi Mincho</family>
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
+ <family>ï¼­ï¼³ 明æœ</family>
+ <family>Baekmuk Batang</family>
+ <family>FreeSerif</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>sans-serif</family>
+ <prefer>
+ <family>Bitstream Vera Sans</family>
+ <family>Verdana</family>
+ <family>Arial</family>
+ <family>Albany AMT</family>
+ <family>Luxi Sans</family>
+ <family>Nimbus Sans L</family>
+ <family>Helvetica</family>
+ <family>Nachlieli</family>
+ <family>Kochi Gothic</family>
+ <family>AR PL KaitiM GB</family>
+ <family>AR PL KaitiM Big5</family>
+ <family>MS ゴシック</family>
+ <family>Baekmuk Dotum</family>
+ <family>SimSun</family>
+ <family>FreeSans</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>monospace</family>
+ <prefer>
+ <family>Bitstream Vera Sans Mono</family>
+ <family>Andale Mono</family>
+ <family>Courier New</family>
+ <family>Cumberland AMT</family>
+ <family>Luxi Mono</family>
+ <family>Nimbus Mono L</family>
+ <family>Courier</family>
+ <family>Miriam Mono</family>
+ <family>Kochi Gothic</family>
+ <family>AR PL KaitiM GB</family>
+ <family>Baekmuk Dotum</family>
+ <family>FreeMono</family>
+ </prefer>
+ </alias>
+
+<!--
+ Artificial oblique for fonts without an italic or oblique version
+ -->
+
+ <match target="font">
+ <!-- check to see if the font is roman -->
+ <test name="slant">
+ <const>roman</const>
+ </test>
+ <!-- check to see if the pattern requested non-roman -->
+ <test target="pattern" name="slant" compare="not_eq">
+ <const>roman</const>
+ </test>
+ <!-- multiply the matrix to slant the font -->
+ <edit name="matrix" mode="assign">
+ <times>
+ <name>matrix</name>
+ <matrix><double>1</double><double>0.2</double>
+ <double>0</double><double>1</double>
+ </matrix>
+ </times>
+ </edit>
+ <!-- pretend the font is oblique now -->
+ <edit name="slant" mode="assign">
+ <const>oblique</const>
+ </edit>
+ </match>
+
+<!--
+ Synthetic emboldening for fonts that do not have bold face available
+ -->
+
+ <match target="font">
+ <!-- check to see if the font is just regular -->
+ <test name="weight" compare="less_eq">
+ <int>100</int>
+ </test>
+ <!-- check to see if the pattern requests bold -->
+ <test target="pattern" name="weight" compare="more_eq">
+ <int>200</int>
+ </test>
+ <!-- set the embolden flag -->
+ <edit name="embolden" mode="assign">
+ <bool>true</bool>
+ </edit>
+ </match>
+
+
+ <config>
+<!--
+ These are the default Unicode chars that are expected to be blank
+ in fonts. All other blank chars are assumed to be broken and
+ won't appear in the resulting charsets
+ -->
+ <blank>
+ <int>0x0020</int> <!-- SPACE -->
+ <int>0x00A0</int> <!-- NO-BREAK SPACE -->
+ <int>0x00AD</int> <!-- SOFT HYPHEN -->
+ <int>0x034F</int> <!-- COMBINING GRAPHEME JOINER -->
+ <int>0x0600</int> <!-- ARABIC NUMBER SIGN -->
+ <int>0x0601</int> <!-- ARABIC SIGN SANAH -->
+ <int>0x0602</int> <!-- ARABIC FOOTNOTE MARKER -->
+ <int>0x0603</int> <!-- ARABIC SIGN SAFHA -->
+ <int>0x06DD</int> <!-- ARABIC END OF AYAH -->
+ <int>0x070F</int> <!-- SYRIAC ABBREVIATION MARK -->
+ <int>0x115F</int> <!-- HANGUL CHOSEONG FILLER -->
+ <int>0x1160</int> <!-- HANGUL JUNGSEONG FILLER -->
+ <int>0x1680</int> <!-- OGHAM SPACE MARK -->
+ <int>0x17B4</int> <!-- KHMER VOWEL INHERENT AQ -->
+ <int>0x17B5</int> <!-- KHMER VOWEL INHERENT AA -->
+ <int>0x180E</int> <!-- MONGOLIAN VOWEL SEPARATOR -->
+ <int>0x2000</int> <!-- EN QUAD -->
+ <int>0x2001</int> <!-- EM QUAD -->
+ <int>0x2002</int> <!-- EN SPACE -->
+ <int>0x2003</int> <!-- EM SPACE -->
+ <int>0x2004</int> <!-- THREE-PER-EM SPACE -->
+ <int>0x2005</int> <!-- FOUR-PER-EM SPACE -->
+ <int>0x2006</int> <!-- SIX-PER-EM SPACE -->
+ <int>0x2007</int> <!-- FIGURE SPACE -->
+ <int>0x2008</int> <!-- PUNCTUATION SPACE -->
+ <int>0x2009</int> <!-- THIN SPACE -->
+ <int>0x200A</int> <!-- HAIR SPACE -->
+ <int>0x200B</int> <!-- ZERO WIDTH SPACE -->
+ <int>0x200C</int> <!-- ZERO WIDTH NON-JOINER -->
+ <int>0x200D</int> <!-- ZERO WIDTH JOINER -->
+ <int>0x200E</int> <!-- LEFT-TO-RIGHT MARK -->
+ <int>0x200F</int> <!-- RIGHT-TO-LEFT MARK -->
+ <int>0x2028</int> <!-- LINE SEPARATOR -->
+ <int>0x2029</int> <!-- PARAGRAPH SEPARATOR -->
+ <int>0x202A</int> <!-- LEFT-TO-RIGHT EMBEDDING -->
+ <int>0x202B</int> <!-- RIGHT-TO-LEFT EMBEDDING -->
+ <int>0x202C</int> <!-- POP DIRECTIONAL FORMATTING -->
+ <int>0x202D</int> <!-- LEFT-TO-RIGHT OVERRIDE -->
+ <int>0x202E</int> <!-- RIGHT-TO-LEFT OVERRIDE -->
+ <int>0x202F</int> <!-- NARROW NO-BREAK SPACE -->
+ <int>0x205F</int> <!-- MEDIUM MATHEMATICAL SPACE -->
+ <int>0x2060</int> <!-- WORD JOINER -->
+ <int>0x2061</int> <!-- FUNCTION APPLICATION -->
+ <int>0x2062</int> <!-- INVISIBLE TIMES -->
+ <int>0x2063</int> <!-- INVISIBLE SEPARATOR -->
+ <int>0x206A</int> <!-- INHIBIT SYMMETRIC SWAPPING -->
+ <int>0x206B</int> <!-- ACTIVATE SYMMETRIC SWAPPING -->
+ <int>0x206C</int> <!-- INHIBIT ARABIC FORM SHAPING -->
+ <int>0x206D</int> <!-- ACTIVATE ARABIC FORM SHAPING -->
+ <int>0x206E</int> <!-- NATIONAL DIGIT SHAPES -->
+ <int>0x206F</int> <!-- NOMINAL DIGIT SHAPES -->
+ <int>0x3000</int> <!-- IDEOGRAPHIC SPACE -->
+ <int>0x3164</int> <!-- HANGUL FILLER -->
+ <int>0xFEFF</int> <!-- ZERO WIDTH NO-BREAK SPACE -->
+ <int>0xFFA0</int> <!-- HALFWIDTH HANGUL FILLER -->
+ <int>0xFFF9</int> <!-- INTERLINEAR ANNOTATION ANCHOR -->
+ <int>0xFFFA</int> <!-- INTERLINEAR ANNOTATION SEPARATOR -->
+ <int>0xFFFB</int> <!-- INTERLINEAR ANNOTATION TERMINATOR -->
+ </blank>
+<!--
+ Rescan configuration every 30 seconds when FcFontSetList is called
+ -->
+ <rescan>
+ <int>30</int>
+ </rescan>
+ </config>
+
+</fontconfig>
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 47ea2681..ab8a81b 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.105 2006/10/06 17:22:31 mezz Exp $
+# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.116 2007/03/15 03:20:01 marcus Exp $
#
PORTNAME= gnome-themes
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0
PORTREVISION= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -17,9 +17,9 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A collection of themes and icons for GNOME2
-BUILD_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2 \
+BUILD_DEPENDS= gtk-engines2>=2.9.0:${PORTSDIR}/x11-themes/gtk-engines2 \
icon-naming-utils>=0.8.0:${PORTSDIR}/x11-themes/icon-naming-utils
-RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
+RUN_DEPENDS= gtk-engines2>=2.9.0:${PORTSDIR}/x11-themes/gtk-engines2
CONFLICTS= clearlooks-metacity-0.*
diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo
index f938c2f..18c42c3 100644
--- a/x11-themes/gnome-themes/distinfo
+++ b/x11-themes/gnome-themes/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-themes-2.16.3.tar.bz2) = ecb4d4b9b90507ba4f3d6e9e63d872d5
-SHA256 (gnome2/gnome-themes-2.16.3.tar.bz2) = 11349339edf84f745a0f24087c01d1ee5b74eb4806f641d1bcd1e77b1d4ffa3f
-SIZE (gnome2/gnome-themes-2.16.3.tar.bz2) = 2352795
+MD5 (gnome2/gnome-themes-2.18.0.tar.bz2) = 00c6cad5cd9927c9b532f49c93ea35f7
+SHA256 (gnome2/gnome-themes-2.18.0.tar.bz2) = 77654ecc14bea31dac4412e5ff32abba4f7553a9fdf39d427eaa5e0f20d546d9
+SIZE (gnome2/gnome-themes-2.18.0.tar.bz2) = 2428451
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index 9971a26..a3a6c7c 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -1,5 +1,6 @@
share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml
share/gnome/themes/Glider/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Glossy/metacity-1/metacity-theme-1.xml
share/gnome/themes/Mist/metacity-1/metacity-theme-1.xml
share/icons/Crux/16x16/actions/back.png
share/icons/Crux/16x16/actions/bottom.png
@@ -347,6 +348,7 @@ share/icons/HighContrast-SVG/scalable/actions/application-exit.svg
share/icons/HighContrast-SVG/scalable/actions/appointment-new.svg
share/icons/HighContrast-SVG/scalable/actions/appointment.svg
share/icons/HighContrast-SVG/scalable/actions/back.svg
+share/icons/HighContrast-SVG/scalable/actions/bookmark-view.svg
share/icons/HighContrast-SVG/scalable/actions/bottom.svg
share/icons/HighContrast-SVG/scalable/actions/button_cancel.svg
share/icons/HighContrast-SVG/scalable/actions/cancel.svg
@@ -499,6 +501,7 @@ share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-out.svg
share/icons/HighContrast-SVG/scalable/actions/help-about.svg
share/icons/HighContrast-SVG/scalable/actions/help-contents.svg
share/icons/HighContrast-SVG/scalable/actions/help-faq.svg
+share/icons/HighContrast-SVG/scalable/actions/history-view.svg
share/icons/HighContrast-SVG/scalable/actions/insert-image.svg
share/icons/HighContrast-SVG/scalable/actions/insert-link.svg
share/icons/HighContrast-SVG/scalable/actions/insert-object.svg
@@ -514,6 +517,7 @@ share/icons/HighContrast-SVG/scalable/actions/mail-mark-important.svg
share/icons/HighContrast-SVG/scalable/actions/mail-mark-junk.svg
share/icons/HighContrast-SVG/scalable/actions/mail-mark-notjunk.svg
share/icons/HighContrast-SVG/scalable/actions/mail-mark-read.svg
+share/icons/HighContrast-SVG/scalable/actions/mail-mark-unread.svg
share/icons/HighContrast-SVG/scalable/actions/mail-message-new.svg
share/icons/HighContrast-SVG/scalable/actions/mail-reply-all.svg
share/icons/HighContrast-SVG/scalable/actions/mail-reply-sender.svg
@@ -580,6 +584,7 @@ share/icons/HighContrast-SVG/scalable/actions/stock_mail-reply-to-all.svg
share/icons/HighContrast-SVG/scalable/actions/stock_mail-reply.svg
share/icons/HighContrast-SVG/scalable/actions/stock_mail-send-receive.svg
share/icons/HighContrast-SVG/scalable/actions/stock_mail-send.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_mail-unread.svg
share/icons/HighContrast-SVG/scalable/actions/stock_media-fwd.svg
share/icons/HighContrast-SVG/scalable/actions/stock_media-next.svg
share/icons/HighContrast-SVG/scalable/actions/stock_media-pause.svg
@@ -905,11 +910,24 @@ share/icons/HighContrast-SVG/scalable/devices/yast_joystick.svg
share/icons/HighContrast-SVG/scalable/devices/yast_mouse.svg
share/icons/HighContrast-SVG/scalable/devices/yast_printer.svg
share/icons/HighContrast-SVG/scalable/devices/yast_soundcard.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-default.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-documents.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-downloads.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-favorite.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-important.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-mail.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-photos.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-readonly.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-symbolic-link.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-system.svg
+share/icons/HighContrast-SVG/scalable/emblems/stock_mail-priority-high.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-glasses.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-plain.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-sad.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-smile-big.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-smile.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-surprise.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-wink.svg
share/icons/HighContrast-SVG/scalable/mimetypes/application-x-executable.svg
share/icons/HighContrast-SVG/scalable/mimetypes/ascii.svg
share/icons/HighContrast-SVG/scalable/mimetypes/audio-x-generic.svg
@@ -1022,6 +1040,10 @@ share/icons/HighContrast-SVG/scalable/places/user-desktop.svg
share/icons/HighContrast-SVG/scalable/places/user-home.svg
share/icons/HighContrast-SVG/scalable/places/user-trash.svg
share/icons/HighContrast-SVG/scalable/places/xfce-trash_empty.svg
+share/icons/HighContrast-SVG/scalable/status/audio-volume-high.svg
+share/icons/HighContrast-SVG/scalable/status/audio-volume-low.svg
+share/icons/HighContrast-SVG/scalable/status/audio-volume-medium.svg
+share/icons/HighContrast-SVG/scalable/status/audio-volume-muted.svg
share/icons/HighContrast-SVG/scalable/status/connect_no.svg
share/icons/HighContrast-SVG/scalable/status/dialog-error.svg
share/icons/HighContrast-SVG/scalable/status/dialog-information.svg
@@ -1068,6 +1090,12 @@ share/icons/HighContrast-SVG/scalable/status/stock_lock-open.svg
share/icons/HighContrast-SVG/scalable/status/stock_lock.svg
share/icons/HighContrast-SVG/scalable/status/stock_open.svg
share/icons/HighContrast-SVG/scalable/status/stock_trash_full.svg
+share/icons/HighContrast-SVG/scalable/status/stock_volume-0.svg
+share/icons/HighContrast-SVG/scalable/status/stock_volume-max.svg
+share/icons/HighContrast-SVG/scalable/status/stock_volume-med.svg
+share/icons/HighContrast-SVG/scalable/status/stock_volume-min.svg
+share/icons/HighContrast-SVG/scalable/status/stock_volume-mute.svg
+share/icons/HighContrast-SVG/scalable/status/stock_volume.svg
share/icons/HighContrast-SVG/scalable/status/trashcan_full.svg
share/icons/HighContrast-SVG/scalable/status/user-trash-full.svg
share/icons/HighContrast-SVG/scalable/status/xfce-trash_full.svg
@@ -2108,18 +2136,18 @@ share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-video-x-msvideo.png
share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-x-font-afm.png
share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-package.png
share/icons/LowContrastLargePrint/index.theme
-share/icons/Mist/16x16/actions/document-open.svg
-share/icons/Mist/16x16/actions/fileopen.svg
-share/icons/Mist/16x16/actions/gtk-open.svg
+share/icons/Mist/16x16/actions/document-open.png
+share/icons/Mist/16x16/actions/fileopen.png
+share/icons/Mist/16x16/actions/gtk-open.png
share/icons/Mist/16x16/places/application-x-gnome-saved-search.png
share/icons/Mist/16x16/places/folder-new.png
share/icons/Mist/16x16/places/folder-remote.png
share/icons/Mist/16x16/places/folder-saved-search.png
share/icons/Mist/16x16/places/folder.png
-share/icons/Mist/16x16/places/folder_home.svg
+share/icons/Mist/16x16/places/folder_home.png
share/icons/Mist/16x16/places/gnome-fs-directory.png
share/icons/Mist/16x16/places/gnome-fs-ftp.png
-share/icons/Mist/16x16/places/gnome-fs-home.svg
+share/icons/Mist/16x16/places/gnome-fs-home.png
share/icons/Mist/16x16/places/gnome-fs-nfs.png
share/icons/Mist/16x16/places/gnome-fs-share.png
share/icons/Mist/16x16/places/gnome-fs-smb.png
@@ -2127,15 +2155,15 @@ share/icons/Mist/16x16/places/gnome-fs-ssh.png
share/icons/Mist/16x16/places/gnome-mime-x-directory-smb-share.png
share/icons/Mist/16x16/places/network.png
share/icons/Mist/16x16/places/stock_folder.png
-share/icons/Mist/16x16/places/user-home.svg
+share/icons/Mist/16x16/places/user-home.png
share/icons/Mist/16x16/status/folder-drag-accept.svg
share/icons/Mist/16x16/status/folder-open.svg
share/icons/Mist/16x16/status/folder_open.svg
share/icons/Mist/16x16/status/gnome-fs-directory-accept.svg
share/icons/Mist/16x16/status/stock_open.svg
-share/icons/Mist/22x22/actions/document-open.svg
-share/icons/Mist/22x22/actions/fileopen.svg
-share/icons/Mist/22x22/actions/gtk-open.svg
+share/icons/Mist/22x22/actions/document-open.png
+share/icons/Mist/22x22/actions/fileopen.png
+share/icons/Mist/22x22/actions/gtk-open.png
share/icons/Mist/22x22/places/application-x-gnome-saved-search.png
share/icons/Mist/22x22/places/folder-new.png
share/icons/Mist/22x22/places/folder-remote.png
@@ -2153,11 +2181,11 @@ share/icons/Mist/22x22/places/gnome-mime-x-directory-smb-share.png
share/icons/Mist/22x22/places/network.png
share/icons/Mist/22x22/places/stock_folder.png
share/icons/Mist/22x22/places/user-home.svg
-share/icons/Mist/22x22/status/folder-drag-accept.svg
-share/icons/Mist/22x22/status/folder-open.svg
-share/icons/Mist/22x22/status/folder_open.svg
-share/icons/Mist/22x22/status/gnome-fs-directory-accept.svg
-share/icons/Mist/22x22/status/stock_open.svg
+share/icons/Mist/22x22/status/folder-drag-accept.png
+share/icons/Mist/22x22/status/folder-open.png
+share/icons/Mist/22x22/status/folder_open.png
+share/icons/Mist/22x22/status/gnome-fs-directory-accept.png
+share/icons/Mist/22x22/status/stock_open.png
share/icons/Mist/24x24/actions/document-open.png
share/icons/Mist/24x24/actions/fileopen.png
share/icons/Mist/24x24/actions/gtk-open.png
@@ -2315,6 +2343,8 @@ share/themes/Clearlooks/index.theme
share/themes/Crux/index.theme
share/themes/Glider/gtk-2.0/gtkrc
share/themes/Glider/index.theme
+share/themes/Glossy/gtk-2.0/gtkrc
+share/themes/Glossy/index.theme
share/themes/HighContrast/gtk-2.0/gtkrc
share/themes/HighContrast/index.theme
share/themes/HighContrastInverse/gtk-2.0/gtkrc
@@ -2598,7 +2628,7 @@ share/themes/HighContrastLargePrintInverse/pixmaps/volume-min.png
share/themes/HighContrastLargePrintInverse/pixmaps/volume-mute.png
share/themes/HighContrastLargePrintInverse/pixmaps/volume-zero.png
share/themes/LargePrint/gtk-2.0/gtkrc
-share/themes/LargePrint/index.theme
+share/themes/LargePrint/index.theme.disabled
share/themes/LargePrint/pixmaps/double-click-maybe.png
share/themes/LargePrint/pixmaps/double-click-off.png
share/themes/LargePrint/pixmaps/double-click-on.png
@@ -2737,7 +2767,7 @@ share/themes/LargePrint/pixmaps/volume-min.png
share/themes/LargePrint/pixmaps/volume-mute.png
share/themes/LargePrint/pixmaps/volume-zero.png
share/themes/LowContrast/gtk-2.0/gtkrc
-share/themes/LowContrast/index.theme.disabled
+share/themes/LowContrast/index.theme
share/themes/LowContrastLargePrint/gtk-2.0/gtkrc
share/themes/LowContrastLargePrint/index.theme.disabled
share/themes/LowContrastLargePrint/pixmaps/double-click-maybe.png
@@ -2900,6 +2930,8 @@ share/themes/Simple/gtk-2.0/gtkrc
@dirrm share/themes/HighContrastInverse
@dirrm share/themes/HighContrast/gtk-2.0
@dirrm share/themes/HighContrast
+@dirrm share/themes/Glossy/gtk-2.0
+@dirrm share/themes/Glossy
@dirrm share/themes/Glider/gtk-2.0
@dirrm share/themes/Glider
@dirrm share/themes/Crux
@@ -2959,6 +2991,7 @@ share/themes/Simple/gtk-2.0/gtkrc
@dirrm share/icons/HighContrast-SVG/scalable/status
@dirrm share/icons/HighContrast-SVG/scalable/places
@dirrm share/icons/HighContrast-SVG/scalable/mimetypes
+@dirrm share/icons/HighContrast-SVG/scalable/emotes
@dirrm share/icons/HighContrast-SVG/scalable/emblems
@dirrm share/icons/HighContrast-SVG/scalable/devices
@dirrm share/icons/HighContrast-SVG/scalable/categories
@@ -2993,6 +3026,8 @@ share/themes/Simple/gtk-2.0/gtkrc
@dirrmtry share/icons
@dirrm share/gnome/themes/Mist/metacity-1
@dirrm share/gnome/themes/Mist
+@dirrm share/gnome/themes/Glossy/metacity-1
+@dirrm share/gnome/themes/Glossy
@dirrm share/gnome/themes/Glider/metacity-1
@dirrm share/gnome/themes/Glider
@dirrm share/gnome/themes/Clearlooks/metacity-1
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 1cf3c19..9868e20 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.29 2006/10/03 01:32:23 ahze Exp $
+# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.37 2007/03/13 12:52:05 ahze Exp $
#
PORTNAME= gtk-engines2
-PORTVERSION= 2.8.2
+PORTVERSION= 2.10.0
CATEGORIES= x11-themes
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/}
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,21 +19,24 @@ COMMENT= Theme engine for the gtk+-2.0 toolkit
CONFLICTS= gtk-smooth-engine-[0-9]* clearlooks-[0-9]*
+USE_GMAKE= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gtk20
+USE_LDCONFIG= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
.if defined(WITH_ANIMATION)
CONFIGURE_ARGS+= --enable-animation
.endif
-pre-everything::
-.if !defined(WITH_ANIMATION)
- @${ECHO_MSG} ""
- @${ECHO_MSG} " You can enable experimental animated progressbars"
- @${ECHO_MSG} " with the clearlooks engine by defining"
- @${ECHO_MSG} " WITH_ANIMATION"
- @${ECHO_MSG} ""
+pre-everything::
+.if !defined(WITH_ANIMATION)
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} " You can enable experimental animated progressbars"
+ @${ECHO_MSG} " with the clearlooks engine by defining"
+ @${ECHO_MSG} " WITH_ANIMATION"
+ @${ECHO_MSG} ""
.endif
# Disable the gtk1 theme.
diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo
index 636989d..4a9b213 100644
--- a/x11-themes/gtk-engines2/distinfo
+++ b/x11-themes/gtk-engines2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk-engines-2.8.2.tar.bz2) = 0c5b0254b57910b1ebcda47ac6a3b1ba
-SHA256 (gnome2/gtk-engines-2.8.2.tar.bz2) = c789ceb35f9972cdc41655d663e579150bfb3703a917a8be254f227c57730734
-SIZE (gnome2/gtk-engines-2.8.2.tar.bz2) = 461623
+MD5 (gnome2/gtk-engines-2.10.0.tar.bz2) = 245d0939025f8f9856c2309071cf075e
+SHA256 (gnome2/gtk-engines-2.10.0.tar.bz2) = 6b605a71d1509f89fae7607ca25849e0d5fceab1af83cc27d521bd2ae2c83abc
+SIZE (gnome2/gtk-engines-2.10.0.tar.bz2) = 641141
diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist
index 0d123b4..e4df805 100644
--- a/x11-themes/gtk-engines2/pkg-plist
+++ b/x11-themes/gtk-engines2/pkg-plist
@@ -17,6 +17,18 @@ lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsmooth.so
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libthinice.la
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libthinice.so
libdata/pkgconfig/gtk-engines-2.pc
+share/gtk-engines/clearlooks.xml
+share/gtk-engines/crux.xml
+share/gtk-engines/glide.xml
+share/gtk-engines/hc.xml
+share/gtk-engines/industrial.xml
+share/gtk-engines/mist.xml
+share/gtk-engines/redmond.xml
+share/gtk-engines/smooth.xml
+share/gtk-engines/thinice.xml
+share/locale/de/LC_MESSAGES/gtk-engines.mo
+share/locale/en_GB/LC_MESSAGES/gtk-engines.mo
+share/locale/nl/LC_MESSAGES/gtk-engines.mo
share/themes/Clearlooks/gtk-2.0/gtkrc
share/themes/Crux/gtk-2.0/gtkrc
share/themes/Industrial/gtk-2.0/gtkrc
@@ -24,14 +36,15 @@ share/themes/Mist/gtk-2.0/gtkrc
share/themes/Redmond/gtk-2.0/gtkrc
share/themes/ThinIce/gtk-2.0/gtkrc
@dirrm share/themes/ThinIce/gtk-2.0
+@dirrmtry share/themes/ThinIce
@dirrm share/themes/Redmond/gtk-2.0
+@dirrmtry share/themes/Redmond
@dirrm share/themes/Mist/gtk-2.0
+@dirrmtry share/themes/Mist
@dirrm share/themes/Industrial/gtk-2.0
+@dirrmtry share/themes/Industrial
@dirrm share/themes/Crux/gtk-2.0
+@dirrmtry share/themes/Crux
@dirrm share/themes/Clearlooks/gtk-2.0
-@unexec /bin/rmdir %D/share/themes/ThinIce 2>/dev/null || true
-@unexec /bin/rmdir %D/share/themes/Redmond 2>/dev/null || true
-@unexec /bin/rmdir %D/share/themes/Mist 2>/dev/null || true
-@unexec /bin/rmdir %D/share/themes/Industrial 2>/dev/null || true
-@unexec /bin/rmdir %D/share/themes/Crux 2>/dev/null || true
-@unexec /bin/rmdir %D/share/themes/Clearlooks 2>/dev/null || true
+@dirrmtry share/themes/Clearlooks
+@dirrm share/gtk-engines
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 4014ef7..a6fdf9a 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -109,6 +109,7 @@
SUBDIR += libgnomeuimm26
SUBDIR += libgtk-java
SUBDIR += libgtkeditor
+ SUBDIR += libgtksourceviewmm
SUBDIR += libpanelappletmm
SUBDIR += libsexy
SUBDIR += libsexymm
@@ -191,6 +192,7 @@
SUBDIR += py-sexy
SUBDIR += py-tkinter
SUBDIR += py-tktreectrl
+ SUBDIR += py-vte
SUBDIR += py-wax
SUBDIR += py-wmgeneral
SUBDIR += py-wxPython24
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index c859f35..f337e1c 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/eel/Makefile,v 1.46 2006/09/07 21:36:05 ahze Exp $
+# $MCom: ports/x11-toolkits/eel/Makefile,v 1.51 2007/03/12 15:59:00 ahze Exp $
#
PORTNAME= eel
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo
index adb97ab..be3bd31 100644
--- a/x11-toolkits/eel/distinfo
+++ b/x11-toolkits/eel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eel-2.16.3.tar.bz2) = 8a5fa25a9c1fb7cb58ea9fae9d27f8f7
-SHA256 (gnome2/eel-2.16.3.tar.bz2) = a23d6c6fe418c7b99152c51fae370cbc6f471054ff25d65681ddccaf9fc3c0b8
-SIZE (gnome2/eel-2.16.3.tar.bz2) = 673029
+MD5 (gnome2/eel-2.18.0.1.tar.bz2) = dd06a56773af79e4292e63c6bcca9449
+SHA256 (gnome2/eel-2.18.0.1.tar.bz2) = 0025fb426b265f052432ddffd4c84f880973e7c04e500478afbc4fe87d32dd79
+SIZE (gnome2/eel-2.18.0.1.tar.bz2) = 673044
diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index 4be4b32..9a05f91 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -11,7 +11,6 @@ include/eel-2/eel/eel-dateedit-extensions.h
include/eel-2/eel/eel-debug-drawing.h
include/eel-2/eel/eel-debug.h
include/eel-2/eel/eel-editable-label.h
-include/eel-2/eel/eel-ellipsizing-label.h
include/eel-2/eel/eel-enumeration.h
include/eel-2/eel/eel-features.h
include/eel-2/eel/eel-gconf-extensions.h
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index cbbf35a..80c1320 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.4 2006/09/10 00:51:16 mezz Exp $
+# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.8 2007/02/16 18:14:27 mezz Exp $
#
PORTNAME= gdl
-PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTVERSION= 0.7.2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -17,6 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Components intended to be shared between GNOME development tools
USE_BZIP2= yes
+USE_GMAKE= yes
USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui
USE_GETTEXT= yes
diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo
index dedc4df..1cd5fbc 100644
--- a/x11-toolkits/gdl/distinfo
+++ b/x11-toolkits/gdl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gdl-0.6.1.tar.bz2) = 6d902981efe30950af8f5033d937c270
-SHA256 (gdl-0.6.1.tar.bz2) = 59bb5d4125986274fe057bd2da8c164fc6975d2d38f97f22fa79387a4f0bcd4e
-SIZE (gdl-0.6.1.tar.bz2) = 429794
+MD5 (gdl-0.7.2.tar.bz2) = bd805f738db2780c63f33e8676cb937e
+SHA256 (gdl-0.7.2.tar.bz2) = 6920eb6ecabb3ca1ffebbc22e21eea8e3c3fa1175c3961359ffcc84bb940593e
+SIZE (gdl-0.7.2.tar.bz2) = 441934
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index faf1a0b..c0b36ed 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -10,19 +10,19 @@ include/libgdl-1.0/gdl/gdl-dock-placeholder.h
include/libgdl-1.0/gdl/gdl-dock-tablabel.h
include/libgdl-1.0/gdl/gdl-dock.h
include/libgdl-1.0/gdl/gdl-icons.h
-include/libgdl-1.0/gdl/gdl-recent.h
+include/libgdl-1.0/gdl/gdl-stock-icons.h
include/libgdl-1.0/gdl/gdl-stock.h
include/libgdl-1.0/gdl/gdl-tools.h
include/libgdl-1.0/gdl/gdl.h
include/libgdl-1.0/gdl/libgdltypebuiltins.h
-lib/libgdl-1.a
lib/libgdl-1.la
lib/libgdl-1.so
lib/libgdl-1.so.0
+lib/libgdl-gnome-1.la
+lib/libgdl-gnome-1.so
+lib/libgdl-gnome-1.so.0
libdata/pkgconfig/gdl-1.0.pc
-%%DATADIR%%/images/stock-close-12.png
-%%DATADIR%%/images/stock-menu-left-12.png
-%%DATADIR%%/images/stock-menu-right-12.png
+libdata/pkgconfig/gdl-gnome-1.0.pc
share/gnome/gdl/glade/layout.glade
share/locale/am/LC_MESSAGES/gdl-1.mo
share/locale/az/LC_MESSAGES/gdl-1.mo
@@ -30,6 +30,7 @@ share/locale/ca/LC_MESSAGES/gdl-1.mo
share/locale/cs/LC_MESSAGES/gdl-1.mo
share/locale/da/LC_MESSAGES/gdl-1.mo
share/locale/de/LC_MESSAGES/gdl-1.mo
+share/locale/dz/LC_MESSAGES/gdl-1.mo
share/locale/el/LC_MESSAGES/gdl-1.mo
share/locale/en_CA/LC_MESSAGES/gdl-1.mo
share/locale/en_GB/LC_MESSAGES/gdl-1.mo
@@ -38,6 +39,7 @@ share/locale/fi/LC_MESSAGES/gdl-1.mo
share/locale/fr/LC_MESSAGES/gdl-1.mo
share/locale/ga/LC_MESSAGES/gdl-1.mo
share/locale/hr/LC_MESSAGES/gdl-1.mo
+share/locale/hu/LC_MESSAGES/gdl-1.mo
share/locale/it/LC_MESSAGES/gdl-1.mo
share/locale/ja/LC_MESSAGES/gdl-1.mo
share/locale/mk/LC_MESSAGES/gdl-1.mo
@@ -58,12 +60,6 @@ share/locale/sr@Latn/LC_MESSAGES/gdl-1.mo
share/locale/sv/LC_MESSAGES/gdl-1.mo
share/locale/vi/LC_MESSAGES/gdl-1.mo
share/locale/zh_CN/LC_MESSAGES/gdl-1.mo
-@dirrm share/gnome/gdl/glade
-@dirrm share/gnome/gdl
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%
-@dirrm include/libgdl-1.0/gdl
-@dirrm include/libgdl-1.0
@dirrmtry share/locale/zh_CN/LC_MESSAGES
@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/sr/LC_MESSAGES
@@ -82,7 +78,13 @@ share/locale/zh_CN/LC_MESSAGES/gdl-1.mo
@dirrmtry share/locale/fi
@dirrmtry share/locale/el/LC_MESSAGES
@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
@dirrmtry share/locale/ca
+@dirrm share/gnome/gdl/glade
+@dirrm share/gnome/gdl
+@dirrm include/libgdl-1.0/gdl
+@dirrm include/libgdl-1.0
diff --git a/x11-toolkits/gnome-sharp20/Makefile b/x11-toolkits/gnome-sharp20/Makefile
index 29716d8..d09ccf5 100644
--- a/x11-toolkits/gnome-sharp20/Makefile
+++ b/x11-toolkits/gnome-sharp20/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-sharp
PORTVERSION= 2.16.0
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.16
@@ -21,11 +22,14 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
USE_PERL5_RUN= yes
-USE_GNOME= gnomehack gnomepanel gtkhtml3 gtksharp20 librsvg2 vte
+USE_GNOME= gnomehack gnomepanel gtkhtml3 gtksharp20 librsvg2 vte \
+ libgnomeprintui
post-patch:
@${FIND} ${WRKSRC} -name '*.pl' | ${XARGS} ${REINPLACE_CMD} -e \
's|^#!/usr/bin/perl|#!${PERL}|'
+ @${REINPLACE_CMD} -e 's|libgtkhtml-3.8|libgtkhtml-3.14|g' \
+ ${WRKSRC}/configure
.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index 08956b4a..4dc7a04 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-sharp
PORTVERSION= 1.0.10
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-toolkits
MASTER_SITES= http://go-mono.com/sources/${PORTNAME}/
@@ -31,7 +31,8 @@ post-patch:
@${FIND} ${WRKSRC} -name '*.pl' | ${XARGS} ${REINPLACE_CMD} -e \
's|^#!/usr/bin/perl|#!${PERL}|'
@${REINPLACE_CMD} -e 's|enable_gda=yes|enable_gda=no|g ; \
- s|enable_gnomedb=yes|enable_gnomedb=no|g' ${WRKSRC}/configure
+ s|enable_gnomedb=yes|enable_gnomedb=no|g ; \
+ s|libgtkhtml-3.8|libgtkhtml-3.14|g' ${WRKSRC}/configure
pre-su-install:
${MKDIR} ${LOCALBASE}/share/gapi
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 0b0c4c7..aaab24d 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.48 2006/09/04 18:33:07 marcus Exp $
+# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.55 2007/03/12 18:11:27 marcus Exp $
#
PORTNAME= libbonoboui
-PORTVERSION= 2.16.0
+PORTVERSION= 2.18.0
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index 0997a7c..bc5fcfe 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/libbonoboui-2.16.0.tar.bz2) = 603ffc92491ef27ccfbc2b69abd3906b
-SHA256 (gnome/libbonoboui-2.16.0.tar.bz2) = 47346162245f79291b7755f82492d75a18f56e07a51b89f1014b83e796ba0ac1
-SIZE (gnome/libbonoboui-2.16.0.tar.bz2) = 937950
+MD5 (gnome/libbonoboui-2.18.0.tar.bz2) = 22bd67a0a8b7f156c02c5fc08fb1fa24
+SHA256 (gnome/libbonoboui-2.18.0.tar.bz2) = 2963b3f0f348faa43eb84083ce93070ec82844205744219dec2df46ed2305775
+SIZE (gnome/libbonoboui-2.18.0.tar.bz2) = 981973
diff --git a/x11-toolkits/libbonoboui/files/patch-Makefile.in b/x11-toolkits/libbonoboui/files/patch-Makefile.in
index 2fff214..023280c 100644
--- a/x11-toolkits/libbonoboui/files/patch-Makefile.in
+++ b/x11-toolkits/libbonoboui/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- 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@
+--- Makefile.in.orig Sun Jan 28 17:47:38 2007
++++ Makefile.in Sun Jan 28 17:47:59 2007
+@@ -254,7 +254,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
-SUBDIRS = bonobo glade samples tests tools po doc
+SUBDIRS = bonobo glade samples tools po doc
-
libincludedir = $(includedir)/libbonoboui-2.0
libinclude_HEADERS = \
+ bonobo.h \
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index f1bdbbe..36b12ac 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -61,6 +61,7 @@ share/locale/cs/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/cy/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/da/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/de/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/dz/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/el/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/en_CA/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/en_GB/LC_MESSAGES/libbonoboui-2.0.mo
@@ -88,6 +89,7 @@ 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/mg/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
@@ -166,6 +168,8 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/li/LC_MESSAGES
@dirrmtry share/locale/li
@dirrmtry share/locale/ku/LC_MESSAGES
@@ -178,6 +182,8 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
@dirrmtry share/locale/fi
@dirrmtry share/locale/el/LC_MESSAGES
@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index d2351db..17326dd 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -3,15 +3,13 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgail-gnome/Makefile,v 1.16 2006/09/10 00:51:17 mezz Exp $
+# $MCom: ports/x11-toolkits/libgail-gnome/Makefile,v 1.18 2007/03/12 13:52:14 ahze Exp $
#
PORTNAME= libgail-gnome
-PORTVERSION= 1.1.3
-PORTREVISION= 2
+PORTVERSION= 1.18.0
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -24,18 +22,10 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack gnomepanel atspi
-CONFIGURE_ARGS= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+PLIST_FILES= lib/gtk-2.0/modules/libgail-gnome.la \
+ lib/gtk-2.0/modules/libgail-gnome.so \
+ libdata/pkgconfig/libgail-gnome.pc
-post-patch:
- @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \
- ${WRKSRC}/Makefile.in
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN= does not build on 4.X
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/libgail-gnome/distinfo b/x11-toolkits/libgail-gnome/distinfo
index 744974b..7232f83 100644
--- a/x11-toolkits/libgail-gnome/distinfo
+++ b/x11-toolkits/libgail-gnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgail-gnome-1.1.3.tar.bz2) = 1d12c5375b3404f4f20b214b763e5225
-SHA256 (gnome2/libgail-gnome-1.1.3.tar.bz2) = 7d44ed7bc041a16505c68db6cdfd1fa81b542cbf9278de7600c74a1bafce22c9
-SIZE (gnome2/libgail-gnome-1.1.3.tar.bz2) = 215082
+MD5 (gnome2/libgail-gnome-1.18.0.tar.bz2) = 2dd239118bf252c7b1e3d1701cd8a954
+SHA256 (gnome2/libgail-gnome-1.18.0.tar.bz2) = c2c921517ea6be997316302df8cd3a7311a436d5101926516ea646dbb054a9b0
+SIZE (gnome2/libgail-gnome-1.18.0.tar.bz2) = 223621
diff --git a/x11-toolkits/libgail-gnome/pkg-plist b/x11-toolkits/libgail-gnome/pkg-plist
deleted file mode 100644
index e096717..0000000
--- a/x11-toolkits/libgail-gnome/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/gtk-2.0/modules/libgail-gnome.a
-lib/gtk-2.0/modules/libgail-gnome.la
-lib/gtk-2.0/modules/libgail-gnome.so
-libdata/pkgconfig/libgail-gnome.pc
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 61a1ee9..16b4685 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -3,15 +3,14 @@
# Whom: Maxim Sobolev <sobomax@FreBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.58 2006/10/10 20:22:27 mezz Exp $
+# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.64 2007/03/12 19:15:02 mezz Exp $
#
PORTNAME= libgnomeprintui
-PORTVERSION= 2.12.1
-PORTREVISION= 2
+PORTVERSION= 2.18.0
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
diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index 41e47c0..4e51935 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeprintui-2.12.1.tar.bz2) = fa0b0410c3ba8b6899c5ed278f02cbe5
-SHA256 (gnome2/libgnomeprintui-2.12.1.tar.bz2) = e898c0bc01b5eff6c04f0ec3ebbed95690fe7ffc971d42500b6b90bb723f1f6a
-SIZE (gnome2/libgnomeprintui-2.12.1.tar.bz2) = 646459
+MD5 (gnome2/libgnomeprintui-2.18.0.tar.bz2) = bea9871059cabee9d108bab32d58d2af
+SHA256 (gnome2/libgnomeprintui-2.18.0.tar.bz2) = dc75c70a998134e2e2a71fe7ce19f52764c2f5daa62a35c30eac1d86694e0975
+SIZE (gnome2/libgnomeprintui-2.18.0.tar.bz2) = 656952
diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index 5233820..cdfdffd 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -12,6 +12,24 @@ lib/libgnomeprintui-2-2.la
lib/libgnomeprintui-2-2.so
lib/libgnomeprintui-2-2.so.0
libdata/pkgconfig/libgnomeprintui-2.2.pc
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libgnomeprintui-gnome-font-dialog.html
+%%DOCSDIR%%/libgnomeprintui-gnome-print-copies.html
+%%DOCSDIR%%/libgnomeprintui-gnome-print-dialog.html
+%%DOCSDIR%%/libgnomeprintui-gnome-print-job-preview.html
+%%DOCSDIR%%/libgnomeprintui-gnome-print-paper-selector.html
+%%DOCSDIR%%/libgnomeprintui-gnome-print-preview.html
+%%DOCSDIR%%/libgnomeprintui-gnome-printer-selector.html
+%%DOCSDIR%%/libgnomeprintui.devhelp
+%%DOCSDIR%%/libgnomeprintui.devhelp2
+%%DOCSDIR%%/libgnomeprintui.html
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
share/gnome/libgnomeprintui/%%VERSION%%/gnome-print-job-preview.xml
share/locale/af/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -20,12 +38,14 @@ share/locale/az/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/be/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/bg/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/bn/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/bn_IN/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/bs/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/ca/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/cs/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/cy/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/da/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/de/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/dz/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/el/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/en_CA/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/en_GB/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -46,6 +66,7 @@ share/locale/id/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/is/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/it/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/ja/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ka/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/kn/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/ko/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/li/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -54,12 +75,13 @@ share/locale/lv/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/mk/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/ml/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/mn/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/mr/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/ms/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/nb/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/ne/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/nl/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/nn/LC_MESSAGES/libgnomeprintui-2.2.mo
-share/locale/no/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/or/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/pa/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/pl/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/pt/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -82,13 +104,17 @@ share/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/wa/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/xh/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/zh_CN/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/zh_HK/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
@dirrm share/gnome/libgnomeprintui/%%VERSION%%
@dirrm share/gnome/libgnomeprintui
+@dirrm %%DOCSDIR%%
@dirrm include/libgnomeprintui-2.2/libgnomeprintui
@dirrm include/libgnomeprintui-2.2
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/zh_CN/LC_MESSAGES
@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@@ -111,12 +137,12 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
@dirrmtry share/locale/pt
@dirrmtry share/locale/pl/LC_MESSAGES
@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
@dirrmtry share/locale/nn/LC_MESSAGES
@dirrmtry share/locale/nn
@dirrmtry share/locale/ne/LC_MESSAGES
@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
@@ -127,9 +153,13 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
@dirrmtry share/locale/fi
@dirrmtry share/locale/el/LC_MESSAGES
@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 4501201..d9e516e 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.91 2006/10/05 17:59:48 mezz Exp $
+# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.99 2007/03/14 03:42:53 marcus Exp $
#
PORTNAME= libgnomeui
-PORTVERSION= 2.16.1
+PORTVERSION= 2.18.1
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 9acf139..5930958 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeui-2.16.1.tar.bz2) = d9b975952bf5feee8818d3fb18cca0b3
-SHA256 (gnome2/libgnomeui-2.16.1.tar.bz2) = 552c34d20f30847429e342e6c6ddeece707b69a5abe9aeeafcfeb65cec2eebd7
-SIZE (gnome2/libgnomeui-2.16.1.tar.bz2) = 1482097
+MD5 (gnome2/libgnomeui-2.18.1.tar.bz2) = dbdb274517ad643d9397dd6868788631
+SHA256 (gnome2/libgnomeui-2.18.1.tar.bz2) = d6eef491e70fcc2c1e5b94f6a8dbb3774443b3b76b1ca5d62bfb5b802df14120
+SIZE (gnome2/libgnomeui-2.18.1.tar.bz2) = 1462027
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index d4ae531..5d2ce71 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -67,6 +67,7 @@ share/locale/am/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ar/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/be/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/be@latin/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/bg/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/bn/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/bn_IN/LC_MESSAGES/libgnomeui-2.0.mo
@@ -77,6 +78,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
@@ -210,11 +212,15 @@ share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
@dirrmtry share/locale/fi
@dirrmtry share/locale/el/LC_MESSAGES
@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index 61983cb..f2cf641 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.8 2006/04/13 07:52:43 bland Exp $
+# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.10 2007/03/10 07:39:37 marcus Exp $
#
PORTNAME= libgnomeuimm
-PORTVERSION= 2.14.0
+PORTVERSION= 2.18.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -27,7 +27,7 @@ LATEST_LINK= libgnomeuimm26
USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GCC= 3.4
USE_GNOME= gnomehack libgnomeui
diff --git a/x11-toolkits/libgnomeuimm26/distinfo b/x11-toolkits/libgnomeuimm26/distinfo
index cd6b5f61..a83623d 100644
--- a/x11-toolkits/libgnomeuimm26/distinfo
+++ b/x11-toolkits/libgnomeuimm26/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/libgnomeuimm-2.18.0.tar.bz2) = ba42d820f535f8e7fc5d31699d484efb
+SHA256 (gnome2/libgnomeuimm-2.18.0.tar.bz2) = 70638f28a4cc6504b9e39a1f80118dacaa029454510a1ae113dc861a665897cc
+SIZE (gnome2/libgnomeuimm-2.18.0.tar.bz2) = 349549
diff --git a/x11-toolkits/libgtksourceviewmm/Makefile b/x11-toolkits/libgtksourceviewmm/Makefile
new file mode 100644
index 0000000..11d1dbe
--- /dev/null
+++ b/x11-toolkits/libgtksourceviewmm/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for: libgtksourceviewmm
+# Date created: 2006-11-11
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11-toolkits/libgtksourceviewmm/Makefile,v 1.2 2006/12/06 00:54:45 ahze Exp $
+
+PORTNAME= libgtksourceviewmm
+PORTVERSION= 0.2.0
+CATEGORIES= x11-toolkits gnome
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= C++ binding of GtkSourceView
+
+LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
+
+USE_LDCONFIG= yes
+USE_BZIP2= yes
+USE_GNOME= gtksourceview gnomeprefix gnomehack
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${WRKSRC}/gtksourceview/ \
+ `pkg-config --cflags gtkmm-2.4 gtksourceview-1.0`" \
+ LDFLAGS="-L${LOCALBAS}/lib \
+ `pkg-config --libs gtkmm-2.4 gtksourceview-1.0`"
+
+.include <bsd.port.pre.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/libgtksourceviewmm/distinfo b/x11-toolkits/libgtksourceviewmm/distinfo
new file mode 100644
index 0000000..3463933
--- /dev/null
+++ b/x11-toolkits/libgtksourceviewmm/distinfo
@@ -0,0 +1,3 @@
+MD5 (libgtksourceviewmm-0.2.0.tar.bz2) = cf035031aeeaa3437ce814efa92a3bd6
+SHA256 (libgtksourceviewmm-0.2.0.tar.bz2) = 706c1831847fe619c67ebc2b71586923e89b11692ecf821c0339276744edeb2f
+SIZE (libgtksourceviewmm-0.2.0.tar.bz2) = 270578
diff --git a/x11-toolkits/libgtksourceviewmm/pkg-descr b/x11-toolkits/libgtksourceviewmm/pkg-descr
new file mode 100644
index 0000000..93aaf71
--- /dev/null
+++ b/x11-toolkits/libgtksourceviewmm/pkg-descr
@@ -0,0 +1,3 @@
+GtkSourceViewMM is a C++ binding of GtkSourceView, a text widget that extends
+the standard gtk+ 2.x text widget. It improves the gtk+ text widget by
+implementing syntax highlighting and other features typical of a source editor.
diff --git a/x11-toolkits/libgtksourceviewmm/pkg-plist b/x11-toolkits/libgtksourceviewmm/pkg-plist
new file mode 100644
index 0000000..52ef235
--- /dev/null
+++ b/x11-toolkits/libgtksourceviewmm/pkg-plist
@@ -0,0 +1,34 @@
+include/gtksourceviewmm-1.0/gtksourceviewmm/init.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcebuffer_p.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcelanguage_p.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcelanguagesmanager_p.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcemarker_p.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcestylescheme_p.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcetag_p.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcetagstyle_p.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcetagtable_p.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourceview_p.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/sourcebuffer.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/sourcelanguage.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/sourcelanguagesmanager.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/sourcemarker.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/sourcestylescheme.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/sourcetag.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/sourcetagstyle.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/sourcetagtable.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/sourceview.h
+include/gtksourceviewmm-1.0/gtksourceviewmm/wrap_init.h
+lib/gtksourceviewmm-1.0/include/gtksourceviewmmconfig.h
+lib/gtksourceviewmm-1.0/proc/m4/convert.m4
+lib/gtksourceviewmm-1.0/proc/m4/convert_gtksourceviewmm.m4
+lib/libgtksourceviewmm-1.0.la
+lib/libgtksourceviewmm-1.0.so
+lib/libgtksourceviewmm-1.0.so.1
+libdata/pkgconfig/libgtksourceviewmm-1.0.pc
+@dirrm lib/gtksourceviewmm-1.0/proc/m4
+@dirrm lib/gtksourceviewmm-1.0/proc
+@dirrm lib/gtksourceviewmm-1.0/include
+@dirrm lib/gtksourceviewmm-1.0
+@dirrm include/gtksourceviewmm-1.0/gtksourceviewmm/private
+@dirrm include/gtksourceviewmm-1.0/gtksourceviewmm
+@dirrm include/gtksourceviewmm-1.0
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index b2d65b0..f62d5bb 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.81 2006/10/03 01:48:04 ahze Exp $
+# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.85 2007/03/12 23:15:43 marcus Exp $
#
PORTNAME= libwnck
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index 059a7af..809470b 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libwnck-2.16.3.tar.bz2) = 0a36d269b19f78df7bd861033792f550
-SHA256 (gnome2/libwnck-2.16.3.tar.bz2) = 6bc99098beb7fe6e90ffc1be0561a4c38dcc36219997e24850b23e54814207a8
-SIZE (gnome2/libwnck-2.16.3.tar.bz2) = 470596
+MD5 (gnome2/libwnck-2.18.0.tar.bz2) = 9b02dea0448a28d73b46a1e8c6eab3d5
+SHA256 (gnome2/libwnck-2.18.0.tar.bz2) = 79e3ba0516b211806cb3e32c5e7df049b5eacfa4794ea1866699fdacafc05e80
+SIZE (gnome2/libwnck-2.18.0.tar.bz2) = 478701
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 8c94310..5e591b4 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -19,6 +19,7 @@ share/locale/am/LC_MESSAGES/libwnck.mo
share/locale/ar/LC_MESSAGES/libwnck.mo
share/locale/az/LC_MESSAGES/libwnck.mo
share/locale/be/LC_MESSAGES/libwnck.mo
+share/locale/be@latin/LC_MESSAGES/libwnck.mo
share/locale/bg/LC_MESSAGES/libwnck.mo
share/locale/bn/LC_MESSAGES/libwnck.mo
share/locale/bn_IN/LC_MESSAGES/libwnck.mo
@@ -151,5 +152,7 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 52467b7..672bd1e 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/pango/Makefile,v 1.84 2006/10/13 19:09:37 marcus Exp $
+# $MCom: ports/x11-toolkits/pango/Makefile,v 1.94 2007/03/13 00:54:42 mezz Exp $
#
PORTNAME= pango
-PORTVERSION= 1.14.10
+PORTVERSION= 1.16.1
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
@@ -40,7 +40,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install
# stuff, with Bad Results[tm]
#
GLIB2_CFLAGS= `pkg-config glib-2.0 --cflags`
-PLIST_SUB= VERSION="1.5.0"
+PLIST_SUB= VERSION="1.6.0"
FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 2ee9224..a56dba6 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.14.10.tar.bz2) = e9fc2f8168e74e2fa0aa8238ee0e9c06
-SHA256 (gnome2/pango-1.14.10.tar.bz2) = 1c53eb4a430c2311b75d6bedef87e452fa3cfea3c51a23a2e898f95e868bc503
-SIZE (gnome2/pango-1.14.10.tar.bz2) = 1294138
+MD5 (gnome2/pango-1.16.1.tar.bz2) = 4aa720633e53701a652f27700a7946dd
+SHA256 (gnome2/pango-1.16.1.tar.bz2) = 8f4f4b4a9359cde35122124d7fa8725e0a8bc69bff0688202ce7d706489daa4b
+SIZE (gnome2/pango-1.16.1.tar.bz2) = 1354214
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index ca740ef..0dfe3c3 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -8,13 +8,16 @@ include/pango-1.0/pango/pango-context.h
include/pango-1.0/pango/pango-coverage.h
include/pango-1.0/pango/pango-engine.h
include/pango-1.0/pango/pango-enum-types.h
+include/pango-1.0/pango/pango-features.h
include/pango-1.0/pango/pango-font.h
include/pango-1.0/pango/pango-fontmap.h
include/pango-1.0/pango/pango-fontset.h
include/pango-1.0/pango/pango-glyph-item.h
include/pango-1.0/pango/pango-glyph.h
+include/pango-1.0/pango/pango-gravity.h
include/pango-1.0/pango/pango-item.h
include/pango-1.0/pango/pango-layout.h
+include/pango-1.0/pango/pango-matrix.h
include/pango-1.0/pango/pango-modules.h
include/pango-1.0/pango/pango-ot.h
include/pango-1.0/pango/pango-renderer.h
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 9d0178d..3310088 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.50 2006/09/05 01:09:07 ahze Exp $
+# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.58 2007/03/18 05:45:44 marcus Exp $
#
PORTNAME= gnome
-PORTVERSION= 2.16.0
+PORTVERSION= 2.18.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,10 +20,12 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A set of Python bindings used by modules in the GNOME Desktop
+BUILD_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
- totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+ totem-plparser.1:${PORTSDIR}/multimedia/totem \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
gnome-keyring:${PORTSDIR}/security/gnome-keyring
+RUN_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy
USE_BZIP2= yes
USE_GMAKE= yes
@@ -30,6 +33,7 @@ USE_PYTHON= yes
USE_GNOME= gnomehack libgnomeprintui gnomepanel gnomedesktop \
gtksourceview libwnck nautiluscdburner pygnome2 metacity
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-metacity
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -52,6 +56,7 @@ 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}
+ ${CHMOD} -R go-w ${EG_DST_DIR}
.endif
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
index 5bfd696..7a6a8dc 100644
--- a/x11-toolkits/py-gnome-desktop/distinfo
+++ b/x11-toolkits/py-gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-desktop-2.16.0.tar.bz2) = ea79fe3e6a65d8380539a9ef6eed963f
-SHA256 (gnome2/gnome-python-desktop-2.16.0.tar.bz2) = 8b2a628e9f4a4827aa51456ab5cdf8839a9fe2522c5cd129aa9b50a712410610
-SIZE (gnome2/gnome-python-desktop-2.16.0.tar.bz2) = 429108
+MD5 (gnome2/gnome-python-desktop-2.18.0.tar.bz2) = ce1b1c095a69c2656177570a2939fabb
+SHA256 (gnome2/gnome-python-desktop-2.18.0.tar.bz2) = 1238ed484620cd29e65695376ebf8a38162b4a94706b956b647e43776820d787
+SIZE (gnome2/gnome-python-desktop-2.18.0.tar.bz2) = 432321
diff --git a/x11-toolkits/py-gnome-desktop/pkg-plist b/x11-toolkits/py-gnome-desktop/pkg-plist
index e720054..7fd7db4 100644
--- a/x11-toolkits/py-gnome-desktop/pkg-plist
+++ b/x11-toolkits/py-gnome-desktop/pkg-plist
@@ -1,3 +1,6 @@
+%%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.pyo
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyo
@@ -37,65 +40,67 @@
%%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/keyring.py
-share/examples/py-gnome/mediaprofiles/profiles.py
-share/examples/py-gnome/nautilusburn/blank_disc.py
-share/examples/py-gnome/nautilusburn/drive_selection.py
-share/examples/py-gnome/nautilusburn/write_iso.py
-share/examples/py-gnome/rsvg/rsvg-cairo.py
+%%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%%/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%%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/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/gtksourceview/test-widget.py
+%%PORTDOCS%%share/examples/py-gnome/keyring-async.py
+%%PORTDOCS%%share/examples/py-gnome/keyring.py
+%%PORTDOCS%%share/examples/py-gnome/mediaprofiles/profiles.py
+%%PORTDOCS%%share/examples/py-gnome/nautilusburn/blank_disc.py
+%%PORTDOCS%%share/examples/py-gnome/nautilusburn/drive_selection.py
+%%PORTDOCS%%share/examples/py-gnome/nautilusburn/write_iso.py
+%%PORTDOCS%%share/examples/py-gnome/rsvg/rsvg-cairo.py
+%%PORTDOCS%%share/examples/py-gnome/wnck_example.py
share/pygtk/2.0/defs/_gnomedesktop.defs
share/pygtk/2.0/defs/applet.defs
share/pygtk/2.0/defs/art.defs
@@ -113,6 +118,7 @@ share/pygtk/2.0/defs/wnck.defs
%%PORTDOCS%%@dirrm share/examples/py-gnome/gtksourceview
%%PORTDOCS%%@dirrm share/examples/py-gnome/gnomeprint
%%PORTDOCS%%@dirrm share/examples/py-gnome/applet
+%%PORTDOCS%%@dirrmtry share/examples/py-gnome
%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtksourceview
%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygnomeprintui
%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygnomeprint
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 1b1c5cc..7ac0d36 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.36 2006/09/04 22:22:09 ahze Exp $
+# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.41 2007/03/12 19:06:44 mezz Exp $
#
PORTNAME= gnome
-PORTVERSION= 2.16.2
+PORTVERSION= 2.18.0
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo
index d452e0e..ba7bff4 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-2.16.2.tar.bz2) = b365a772c8c9eac24b368c7e26845dc8
-SHA256 (gnome2/gnome-python-2.16.2.tar.bz2) = 748394f882acc3b0bd21c2e356ab33fc6753751f465aea052b73e961f250206c
-SIZE (gnome2/gnome-python-2.16.2.tar.bz2) = 401954
+MD5 (gnome2/gnome-python-2.18.0.tar.bz2) = 75400e51abe3cedb785db40960cbad53
+SHA256 (gnome2/gnome-python-2.18.0.tar.bz2) = e90b3df41b39cb615d2f61771ee08c25421897df60fa6b441a313b260900e438
+SIZE (gnome2/gnome-python-2.18.0.tar.bz2) = 408449
diff --git a/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist
index 69b8862..9132426 100644
--- a/x11-toolkits/py-gnome2/pkg-plist
+++ b/x11-toolkits/py-gnome2/pkg-plist
@@ -72,7 +72,7 @@ share/pygtk/2.0/defs/gconf.defs
share/pygtk/2.0/defs/gnome-types.defs
share/pygtk/2.0/defs/gnome.defs
share/pygtk/2.0/defs/ui.defs
-@dirrm share/pygtk/2.0/argtypes
+@dirrmtry share/pygtk/2.0/argtypes
%%PORTDOCS%%@dirrm share/examples/py-gnome/vfs/pygvfsmethod
%%PORTDOCS%%@dirrm share/examples/py-gnome/vfs
%%PORTDOCS%%@dirrm share/examples/py-gnome/popt
diff --git a/x11-toolkits/py-vte/Makefile b/x11-toolkits/py-vte/Makefile
new file mode 100644
index 0000000..eb09aa4
--- /dev/null
+++ b/x11-toolkits/py-vte/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for: py-vte
+# Date created: 18 February 2007
+# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11-toolkits/py-vte/Makefile,v 1.1 2007/02/18 19:12:57 mezz Exp $
+#
+
+PORTREVISION= 0
+CATEGORIES= x11-toolkits gnome python
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Python interface for VTE (Terminal widget)
+
+MASTERDIR= ${.CURDIR}/../vte
+BUILD_WRKSRC= ${WRKSRC}/python
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+
+USE_GNOME= gnomehack gnometarget vte pygtk2
+USE_PYTHON= yes
+CONFIGURE_ARGS= --enable-python \
+ --disable-freetypetest
+
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/py-vte/pkg-descr b/x11-toolkits/py-vte/pkg-descr
new file mode 100644
index 0000000..c01fbb2
--- /dev/null
+++ b/x11-toolkits/py-vte/pkg-descr
@@ -0,0 +1,3 @@
+Python interface for VTE (Terminal widget).
+
+WWW: http://www.gnome.org/
diff --git a/x11-toolkits/py-vte/pkg-plist b/x11-toolkits/py-vte/pkg-plist
new file mode 100644
index 0000000..d67a8a1
--- /dev/null
+++ b/x11-toolkits/py-vte/pkg-plist
@@ -0,0 +1,3 @@
+%%PYTHON_SITELIBDIR%%/gtk-2.0/vtemodule.a
+%%PYTHON_SITELIBDIR%%/gtk-2.0/vtemodule.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/vtemodule.so
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 17ce76d..74e71b9 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,19 +3,19 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/vte/Makefile,v 1.61 2006/10/03 12:33:40 ahze Exp $
+# $MCom: ports/x11-toolkits/vte/Makefile,v 1.72 2007/03/13 00:43:46 mezz Exp $
#
PORTNAME= vte
-PORTVERSION= 0.14.2
-PORTREVISION?= 1
+PORTVERSION= 0.16.0
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Terminal widget with improved accessibility and I18N support
+MAINTAINER?= gnome@FreeBSD.org
+COMMENT?= Terminal widget with improved accessibility and I18N support
USE_BZIP2= yes
@@ -27,17 +27,20 @@ USE_XLIB= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
USE_GETTEXT= yes
-USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack referencehack
+USE_GNOME?= gnomeprefix gnomehack gtk20 ltverhack referencehack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS= --disable-python
+CONFIGURE_ARGS?=--disable-python \
+ --disable-freetypetest
+.if !defined(MASTERDIR)
OPTIONS= GLX "Enable support for DRI/GLX rendering" off
+.endif
.include <bsd.port.pre.mk>
-.if defined(WITH_GLX)
+.if defined(WITH_GLX) && !defined(MASTERDIR)
CONFIGURE_ARGS+= --with-glX
USE_GL= yes
.endif
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index dc59ace..0425069 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vte-0.14.2.tar.bz2) = eceafec1b564cc059fa3407f83631817
-SHA256 (gnome2/vte-0.14.2.tar.bz2) = 1ad92649f848064f903dd60a2d6d2b724d8fbe3c766bf5a4b6fcdbf1f2435088
-SIZE (gnome2/vte-0.14.2.tar.bz2) = 1031948
+MD5 (gnome2/vte-0.16.0.tar.bz2) = 6b85967ba75ed574d0e5782697fbc79f
+SHA256 (gnome2/vte-0.16.0.tar.bz2) = 7f71faf8beb686f940f13125ff5fcc142c7b8ccde81cf80c8f278fdf4a0cacec
+SIZE (gnome2/vte-0.16.0.tar.bz2) = 1095254
diff --git a/x11-toolkits/vte/files/patch-configure b/x11-toolkits/vte/files/patch-configure
index 7cddbbd..e9fe901 100644
--- a/x11-toolkits/vte/files/patch-configure
+++ b/x11-toolkits/vte/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig Tue Oct 3 08:23:12 2006
-+++ configure Tue Oct 3 08:23:12 2006
-@@ -26464,7 +26464,7 @@
+--- configure.orig Tue Feb 13 16:22:38 2007
++++ configure Tue Feb 13 16:23:19 2007
+@@ -24887,7 +24887,7 @@ fi
--for ac_func in cfmakeraw getpgid getpt grantpt unlockpt ptsname ptsname_r
-+for ac_func in cfmakeraw getpgid getpt posix_openpt grantpt unlockpt ptsname ptsname_r
+-for ac_func in cfmakeraw fork setsid setpgid getpgid getpt grantpt unlockpt ptsname ptsname_r tcgetattr tcsetattr
++for ac_func in cfmakeraw fork setsid setpgid getpgid getpt grantpt posix_openpt unlockpt ptsname ptsname_r tcgetattr tcsetattr
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/x11-toolkits/vte/files/patch-python_Makefile.in b/x11-toolkits/vte/files/patch-python_Makefile.in
new file mode 100644
index 0000000..10ee93b
--- /dev/null
+++ b/x11-toolkits/vte/files/patch-python_Makefile.in
@@ -0,0 +1,19 @@
+--- python/Makefile.in.orig Tue Feb 27 12:46:42 2007
++++ python/Makefile.in Tue Feb 27 12:47:11 2007
+@@ -61,7 +61,6 @@
+ LTLIBRARIES = $(pythonsiteexec_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_DEPENDENCIES = \
+-@BUILD_PYTHON_MODULES_TRUE@ $(top_builddir)/src/libvte.la \
+ @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \
+ @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \
+ @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \
+@@ -303,7 +302,7 @@
+ @BUILD_PYTHON_MODULES_TRUE@CLEANFILES = vte.c
+ @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_CFLAGS = $(VTE_CFLAGS) $(X_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS)
+ @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_SOURCES = vtemodule.c
+-@BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LIBADD = $(top_builddir)/src/libvte.la $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS)
++@BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LIBADD = -lvte $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS)
+ @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte
+ @BUILD_PYTHON_MODULES_TRUE@nodist_vtemodule_la_SOURCES = vte.c
+ all: all-am
diff --git a/x11-toolkits/vte/files/patch-src_pty.c b/x11-toolkits/vte/files/patch-src_pty.c
index a31b119..da0f42b 100644
--- a/x11-toolkits/vte/files/patch-src_pty.c
+++ b/x11-toolkits/vte/files/patch-src_pty.c
@@ -1,19 +1,10 @@
---- src/pty.c.orig Tue Jun 3 15:54:15 2003
-+++ src/pty.c Wed Apr 7 02:55:57 2004
-@@ -45,6 +45,7 @@
- #include "pty.h"
+--- src/pty.c.orig Tue Feb 13 16:24:15 2007
++++ src/pty.c Tue Feb 13 16:29:15 2007
+@@ -271,6 +271,7 @@ _vte_pty_run_on_pty (struct vte_pty_chil
+ GPid *pid, GError **error)
+ {
+ gboolean ret = TRUE;
++ extern char **environ;
+ GError *local_error = NULL;
- #ifdef VTE_USE_GNOME_PTY_HELPER
-+#include "../gnome-pty-helper/config.h"
- #include "../gnome-pty-helper/gnome-pty.h"
- #endif
-
-@@ -709,6 +710,8 @@
- #ifdef HAVE_GETPT
- /* Call the system's function for allocating a pty. */
- fd = getpt();
-+#elif defined(HAVE_POSIX_OPENPT)
-+ fd = posix_openpt(O_RDWR | O_NOCTTY);
- #else
- /* Try to allocate a pty by accessing the pty master multiplex. */
- fd = open("/dev/ptmx", O_RDWR | O_NOCTTY);
+ if (command != NULL) {
diff --git a/x11-toolkits/vte/pkg-descr b/x11-toolkits/vte/pkg-descr
index 9c325db..a363e23c 100644
--- a/x11-toolkits/vte/pkg-descr
+++ b/x11-toolkits/vte/pkg-descr
@@ -1,2 +1,4 @@
Terminal widget with improved font, internationalisation and accessibility
support for the GNOME 2 desktop. Designed to replace libzvt.
+
+WWW: http://www.gnome.org/
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index c36847f..7ef70c1 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -25,6 +25,7 @@ share/locale/ang/LC_MESSAGES/vte.mo
share/locale/ar/LC_MESSAGES/vte.mo
share/locale/az/LC_MESSAGES/vte.mo
share/locale/be/LC_MESSAGES/vte.mo
+share/locale/be@latin/LC_MESSAGES/vte.mo
share/locale/bg/LC_MESSAGES/vte.mo
share/locale/bn/LC_MESSAGES/vte.mo
share/locale/bn_IN/LC_MESSAGES/vte.mo
@@ -158,6 +159,8 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
@dirrmtry share/locale/ang/LC_MESSAGES
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 11b33dc7..04866451 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -3,11 +3,11 @@
# Whom: Garrett Rooney <rooneg@electricjellyfish.net>
#
# $FreeBSD$
-# $MCom: ports/x11-wm/metacity/Makefile,v 1.92 2006/10/03 13:39:50 ahze Exp $
+# $MCom: ports/x11-wm/metacity/Makefile,v 1.101 2007/03/14 04:17:20 marcus Exp $
#
PORTNAME= metacity
-PORTVERSION= 2.16.5
+PORTVERSION= 2.18.0
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,8 +23,8 @@ USE_BZIP2= yes
USE_XLIB= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-GNU_CONFIGURE= yes
-USE_GNOME= gnomeprefix intlhack gnomehack gconf2
+USE_AUTOTOOLS= libtool:15
+USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-render
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index fb9cba2..d0b0583 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/metacity-2.16.5.tar.bz2) = 7ac14eb4caffbb15df91b70b0def2f5e
-SHA256 (gnome2/metacity-2.16.5.tar.bz2) = 50a8d91f2bfb24bd58b23d428e1f42b36b639bb5b4841066ef01c7de1e2dd561
-SIZE (gnome2/metacity-2.16.5.tar.bz2) = 1862796
+MD5 (gnome2/metacity-2.18.0.tar.bz2) = 2af31af033618329d093267ac00e49ff
+SHA256 (gnome2/metacity-2.18.0.tar.bz2) = f948a81eb79a93da7ffde870f5823c6e9122e286a2b353131afbd27d2cf1b02e
+SIZE (gnome2/metacity-2.18.0.tar.bz2) = 1945353
diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure
index 09c5cae..9c810e0 100644
--- a/x11-wm/metacity/files/patch-configure
+++ b/x11-wm/metacity/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Mon Jan 10 04:40:58 2005
-+++ configure Mon Jan 10 04:41:11 2005
-@@ -25377,7 +25377,6 @@
+--- configure.orig Tue Mar 13 23:11:45 2007
++++ configure Tue Mar 13 23:13:04 2007
+@@ -29363,7 +29363,6 @@ echo "${ECHO_T}$have_xrender" >&6; }
if test x$have_xrender = xyes; then
echo "Building with Render"
@@ -8,3 +8,12 @@
fi
fi ## have_composite
+@@ -34431,7 +34430,7 @@ metacity-$VERSION:
+ "
+
+ METACITY_MINOR_VERSION=18
+-if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then
++if test $(( $(echo $METACITY_MINOR_VERSION) %2)) = "1"; then
+ stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2))
+ echo "This is the UNSTABLE branch of metacity"
+ echo -n "Use 2.$stable_version.x for stable "
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index 32f737f..664a04d 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -31,6 +31,8 @@ share/gnome/themes/AgingGorilla/metacity-1/inactive-minimize-button.png
share/gnome/themes/AgingGorilla/metacity-1/metacity-theme-1.xml
share/gnome/themes/Atlanta/metacity-1/metacity-theme-1.xml
share/gnome/themes/Bright/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Bright/metacity-1/metacity-theme-2.xml
+share/gnome/themes/Crux/metacity-1/active-above-button.png
share/gnome/themes/Crux/metacity-1/active-border-top-left-border.png
share/gnome/themes/Crux/metacity-1/active-border-top-right-border.png
share/gnome/themes/Crux/metacity-1/active-bottom-left-border.png
@@ -55,6 +57,8 @@ share/gnome/themes/Crux/metacity-1/active-restore-button.png
share/gnome/themes/Crux/metacity-1/active-right-border.png
share/gnome/themes/Crux/metacity-1/active-right-top-border-shaded.png
share/gnome/themes/Crux/metacity-1/active-right-top-border.png
+share/gnome/themes/Crux/metacity-1/active-shade-button.png
+share/gnome/themes/Crux/metacity-1/active-stick-button.png
share/gnome/themes/Crux/metacity-1/active-top-center-left.png
share/gnome/themes/Crux/metacity-1/active-top-center-mid-left.png
share/gnome/themes/Crux/metacity-1/active-top-center-mid-right.png
@@ -65,6 +69,10 @@ share/gnome/themes/Crux/metacity-1/active-top-mid-left-border.png
share/gnome/themes/Crux/metacity-1/active-top-mid-right-border.png
share/gnome/themes/Crux/metacity-1/active-top-right-border.png
share/gnome/themes/Crux/metacity-1/active-top-right-corner.png
+share/gnome/themes/Crux/metacity-1/active-unabove-button.png
+share/gnome/themes/Crux/metacity-1/active-unshade-button.png
+share/gnome/themes/Crux/metacity-1/active-unstick-button.png
+share/gnome/themes/Crux/metacity-1/inactive-above-button.png
share/gnome/themes/Crux/metacity-1/inactive-border-top-left-border.png
share/gnome/themes/Crux/metacity-1/inactive-border-top-right-border.png
share/gnome/themes/Crux/metacity-1/inactive-bottom-left-border.png
@@ -88,6 +96,8 @@ share/gnome/themes/Crux/metacity-1/inactive-restore-button.png
share/gnome/themes/Crux/metacity-1/inactive-right-border.png
share/gnome/themes/Crux/metacity-1/inactive-right-top-border-shaded.png
share/gnome/themes/Crux/metacity-1/inactive-right-top-border.png
+share/gnome/themes/Crux/metacity-1/inactive-shade-button.png
+share/gnome/themes/Crux/metacity-1/inactive-stick-button.png
share/gnome/themes/Crux/metacity-1/inactive-top-center-left.png
share/gnome/themes/Crux/metacity-1/inactive-top-center-mid.png
share/gnome/themes/Crux/metacity-1/inactive-top-center-right.png
@@ -96,7 +106,11 @@ share/gnome/themes/Crux/metacity-1/inactive-top-left-corner.png
share/gnome/themes/Crux/metacity-1/inactive-top-mid-border.png
share/gnome/themes/Crux/metacity-1/inactive-top-right-border.png
share/gnome/themes/Crux/metacity-1/inactive-top-right-corner.png
+share/gnome/themes/Crux/metacity-1/inactive-unabove-button.png
+share/gnome/themes/Crux/metacity-1/inactive-unshade-button.png
+share/gnome/themes/Crux/metacity-1/inactive-unstick-button.png
share/gnome/themes/Crux/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Crux/metacity-1/metacity-theme-2.xml
share/gnome/themes/Esco/metacity-1/metacity-theme-1.xml
share/gnome/themes/Metabox/metacity-1/metacity-theme-1.xml
share/gnome/themes/Simple/metacity-1/close.png
diff --git a/x11/Makefile b/x11/Makefile
index f005655..6125790 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -156,6 +156,7 @@
SUBDIR += libgnome
SUBDIR += libgnome-java
SUBDIR += libgnome-reference
+ SUBDIR += libgnomekbd
SUBDIR += libgnomemm
SUBDIR += libgnomemm26
SUBDIR += libsx
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index c40a7e7..2fa0af6 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -3,11 +3,10 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.17 2006/09/04 22:53:22 ahze Exp $
-#
+# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.22 2007/02/27 20:35:24 mezz Exp $
PORTNAME= fast-user-switch-applet
-PORTVERSION= 2.16.3
+PORTVERSION= 2.17.4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/fast-user-switch-applet/distinfo b/x11/fast-user-switch-applet/distinfo
index 254ba26..49e1fcf 100644
--- a/x11/fast-user-switch-applet/distinfo
+++ b/x11/fast-user-switch-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/fast-user-switch-applet-2.16.3.tar.bz2) = 16fe9bb182fd96ebbc65c53c5aaf6752
-SHA256 (gnome2/fast-user-switch-applet-2.16.3.tar.bz2) = 262155853f82acbfbd0a843393fd5ca533db6c67eeaf5d7b2e8c2659050b1b86
-SIZE (gnome2/fast-user-switch-applet-2.16.3.tar.bz2) = 756732
+MD5 (gnome2/fast-user-switch-applet-2.17.4.tar.bz2) = 23bd4568f7d152ec4364c41ab0e10527
+SHA256 (gnome2/fast-user-switch-applet-2.17.4.tar.bz2) = 110b0c06a9c5c04202fa6c1a902832486ad3b5b3229b5bc07f7b93048dfcce81
+SIZE (gnome2/fast-user-switch-applet-2.17.4.tar.bz2) = 759599
diff --git a/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c b/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c
index 80e25d0..a38c964 100644
--- a/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c
+++ b/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c
@@ -1,10 +1,10 @@
---- src/gdm-queue.c.orig Fri Feb 2 23:52:26 2007
-+++ src/gdm-queue.c Fri Feb 2 23:52:32 2007
-@@ -32,6 +32,7 @@
+--- src/gdm-queue.c.orig Thu Nov 16 12:39:45 2006
++++ src/gdm-queue.c Thu Nov 16 12:40:17 2006
+@@ -31,6 +31,7 @@
+ #include <sys/socket.h>
#include <sys/un.h>
#include <errno.h>
- #include <stdio.h>
+#include <signal.h>
+ #include <stdio.h>
#include "gdm-queue.h"
-
diff --git a/x11/fast-user-switch-applet/pkg-plist b/x11/fast-user-switch-applet/pkg-plist
index d345923..ab45347 100644
--- a/x11/fast-user-switch-applet/pkg-plist
+++ b/x11/fast-user-switch-applet/pkg-plist
@@ -10,6 +10,13 @@ share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-text.
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/en_GB/fast-user-switch-applet.xml
+share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-context.png
+share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-icon.png
+share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-prefs.png
+share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-text.png
+share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-username.png
+share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet.png
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
@@ -46,6 +53,7 @@ share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-text
share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-username.png
share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet.png
share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-C.omf
+share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-en_GB.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-fr.omf
share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-pa.omf
@@ -111,21 +119,6 @@ share/locale/vi/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/zh_CN/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/zh_HK/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/zh_TW/LC_MESSAGES/fast-user-switch-applet.mo
-@dirrm share/gnome/omf/fast-user-switch-applet
-@dirrm share/gnome/help/fast-user-switch-applet/sv/figures
-@dirrm share/gnome/help/fast-user-switch-applet/sv
-@dirrm share/gnome/help/fast-user-switch-applet/sr/figures
-@dirrm share/gnome/help/fast-user-switch-applet/sr
-@dirrm share/gnome/help/fast-user-switch-applet/pa/figures
-@dirrm share/gnome/help/fast-user-switch-applet/pa
-@dirrm share/gnome/help/fast-user-switch-applet/fr/figures
-@dirrm share/gnome/help/fast-user-switch-applet/fr
-@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
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -168,3 +161,20 @@ share/locale/zh_TW/LC_MESSAGES/fast-user-switch-applet.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrm share/gnome/omf/fast-user-switch-applet
+@dirrm share/gnome/help/fast-user-switch-applet/sv/figures
+@dirrm share/gnome/help/fast-user-switch-applet/sv
+@dirrm share/gnome/help/fast-user-switch-applet/sr/figures
+@dirrm share/gnome/help/fast-user-switch-applet/sr
+@dirrm share/gnome/help/fast-user-switch-applet/pa/figures
+@dirrm share/gnome/help/fast-user-switch-applet/pa
+@dirrm share/gnome/help/fast-user-switch-applet/fr/figures
+@dirrm share/gnome/help/fast-user-switch-applet/fr
+@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/en_GB/figures
+@dirrm share/gnome/help/fast-user-switch-applet/en_GB
+@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 adbe16e..fe1b390 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/Makefile,v 1.44 2006/10/03 13:36:08 ahze Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.58 2007/03/12 16:56:06 marcus Exp $
#
PORTNAME= gdm
-PORTVERSION= 2.16.5
+PORTVERSION= 2.18.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -31,7 +31,8 @@ USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
gnomeprefix
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --mandir=${PREFIX}/man
+CONFIGURE_ARGS= --mandir=${PREFIX}/man \
+ --with-console-kit=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
GTKDOC="false"
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 787d2d8..3caa1e9 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.16.5.tar.bz2) = 8f223458b0e957650f6d865a06a271e4
-SHA256 (gnome2/gdm-2.16.5.tar.bz2) = 9347f06782da70352eb7e236613599362aff5b319d23be178b36a0a4424ba010
-SIZE (gnome2/gdm-2.16.5.tar.bz2) = 3136620
+MD5 (gnome2/gdm-2.18.0.tar.bz2) = a569a8275f0e0396e6ef5f63c5f56ad5
+SHA256 (gnome2/gdm-2.18.0.tar.bz2) = 6619ef1ba04f4408f181b1a6c1d8a86f791706e22e0e2803153dbd5554a18053
+SIZE (gnome2/gdm-2.18.0.tar.bz2) = 3461709
diff --git a/x11/gdm/files/extra-patch-daemon_slave.c b/x11/gdm/files/extra-patch-daemon_slave.c
index 81521bb..2d609cf 100644
--- a/x11/gdm/files/extra-patch-daemon_slave.c
+++ b/x11/gdm/files/extra-patch-daemon_slave.c
@@ -1,6 +1,6 @@
---- daemon/slave.c.orig Wed Jun 1 20:49:30 2005
-+++ daemon/slave.c Wed Jun 1 20:50:45 2005
-@@ -344,8 +344,7 @@
+--- daemon/slave.c.orig Sat Oct 28 22:38:51 2006
++++ daemon/slave.c Tue Oct 31 12:33:41 2006
+@@ -321,8 +321,7 @@ run_session_output (gboolean read_until_
break;
}
@@ -10,7 +10,7 @@
continue;
/* write until we succeed in writing something */
-@@ -367,13 +366,6 @@
+@@ -344,13 +343,6 @@ run_session_output (gboolean read_until_
}
d->xsession_errors_bytes += r;
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 8217bb2..21b493a0 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
#!/bin/sh
# $FreeBSD$
-# $MCom: ports/x11/gdm/files/gdm.in,v 1.8 2006/10/10 20:22:24 mezz Exp $
+# $MCom: ports/x11/gdm/files/gdm.in,v 1.12 2007/02/16 18:14:26 mezz Exp $
# PROVIDE: gdm
# REQUIRE: LOGIN cleanvar moused
diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias
index 8de8f08..8f264db 100644
--- a/x11/gdm/files/patch-config_locale.alias
+++ b/x11/gdm/files/patch-config_locale.alias
@@ -1,26 +1,29 @@
--- config/locale.alias.orig Sat Jun 11 02:01:45 2005
+++ config/locale.alias Sat Jun 11 03:34:22 2005
-@@ -14,104 +14,56 @@
+@@ -14,132 +14,57 @@
#
# - George
--Afrikaans af_ZA.UTF-8,af_ZA
--Albanian sq_AL.UTF-8,sq_AL
+-C(POSIX) C,POSIX
+-Afrikaans af_ZA.UTF-8,af_ZA
+-Albanian sq_AL.UTF-8,sq_AL
-Amharic am_ET.UTF-8,am_ET
-Arabic(Egypt) ar_EG.UTF-8,ar_EG
-Arabic(Lebanon) ar_LB.UTF-8,ar_LB
+-Arabic(SaudiArabia) ar_SA.UTF-8,ar_SA
-Armenian hy_AM.UTF-8,hy_AM
-Azerbaijani az_AZ.UTF-8,az_AZ
-Azerbaijani(Iran) az_IR.UTF-8,az_IR
-Basque eu_ES.UTF-8,eu_ES
--Belarusian be_BY.UTF-8,be_BY
+-Belarusian be_BY.UTF-8,be_BY
-Bengali bn_BD.UTF-8,bn_BD
--Bengali(India) bn_IN.UTF-8,bn_IN
+-Bengali(India) bn_IN.UTF-8,bn_IN
-Bosnian bs_BA.UTF-8,bs_BA
-Breton br_FR.UTF-8,br_FR
-Bulgarian bg_BG.UTF-8,bg_BG
-Catalan ca_ES.UTF-8,ca_ES
-Chinese(ChinaMainland) zh_CN.UTF-8,zh_CN
+-Chinese(GB18030) zh_CN.GB18030
-Chinese(Hong-Kong) zh_HK.UTF-8,zh_HK
-Chinese(Singapore) zh_SG.UTF-8,zh_SG
-Chinese(Taiwan) zh_TW.UTF-8,zh_TW
@@ -28,35 +31,42 @@
-Czech cs_CZ.UTF-8,cs_CZ
-Danish da_DK.UTF-8,da_DK
-Dutch nl_NL.UTF-8,nl_NL
--English(USA) en_US.UTF-8,en_US
+-Dutch(Belgium) nl_BE.UTF-8,nl_BE
-English(Australia) en_AU.UTF-8,en_AU
--English(UK) en_GB.UTF-8,en_GB
-English(Canada) en_CA.UTF-8,en_CA
-English(Ireland) en_IE.UTF-8,en_IE
+-English(Malta) en_MT.UTF-8,en_MT
+-English(NewZealand) en_NZ.UTF-8,en_NZ
-English(SouthAfrica) en_ZA.UTF-8,en_ZA
+-English(UK) en_GB.UTF-8,en_GB
+-English(USA) en_US.UTF-8,en_US
-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
-French(Belgium) fr_BE.UTF-8,fr_BE
+-French(Canada) fr_CA.UTF-8,fr_CA
+-French(Luxembourg) fr_LU.UTF-8,fr_LU
-French(Switzerland) fr_CH.UTF-8,fr_CH
-Galician gl_ES.UTF-8,gl_ES
-German de_DE.UTF-8,de_DE
-German(Austria) de_AT.UTF-8,de_AT
-German(Switzerland) de_CH.UTF-8,de_CH
+-German(Luxembourg) de_LU.UTF-8,de_LU
-Greek el_GR.UTF-8,el_GR
--Gujarati gu_IN.UTF-8,gu_IN
+-Greek(Cyprus) el_CY.UTF-8,el_CY
+-Gujarati gu_IN.UTF-8,gu_IN
-Hebrew he_IL.UTF-8,he_IL
-Hindi hi_IN.UTF-8,hi_IN
-Hungarian hu_HU.UTF-8,hu_HU
-Icelandic is_IS.UTF-8,is_IS
--Indonesian id_ID.UTF-8,id_ID
--Interlingua ia.UTF-8,ia
+-Indonesian id_ID.UTF-8,id_ID
+-Interlingua ia.UTF-8,ia
-Irish ga_IE.UTF-8,ga_IE
-Italian it_IT.UTF-8,it_IT
-Japanese ja_JP.UTF-8,ja_JP
-Kannada kn_IN.UTF-8,kn_IN
--Kinyarwanda rw_RW.UTF-8,rw_RW
+-Kinyarwanda rw_RW.UTF-8,rw_RW
-Korean ko_KR.UTF-8,ko_KR
-Latvian lv_LV.UTF-8,lv_LV
-Limburgish li_NL.UTF-8,li_NL
@@ -64,30 +74,48 @@
-Limburgish(Germany) li_DE.UTF-8,li_DE
-Lithuanian lt_LT.UTF-8,lt_LT
-Macedonian mk_MK.UTF-8,mk_MK
--Malayalam ml_IN.UTF-8,ml_IN
+-Malayalam ml_IN.UTF-8,ml_IN
-Malay ms_MY.UTF-8,ms_MY
+-Maltese mt_MT.UTF-8,mt_MT
-Maori mi_NZ.UTF-8,mi_NZ
-Marathi mr_IN.UTF-8,mr_IN
-Mongolian mn_MN.UTF-8,mn_MN
-Nepali ne_NP.UTF-8,ne_NP
--NorthernSotho nso_ZA.UTF-8,nso_ZA
+-NorthernSotho nso_ZA.UTF-8,nso_ZA
-Norwegian(bokmal) nb_NO.UTF-8,nb_NO,no_NO.UTF-8,no_NO
-Norwegian(nynorsk) nn_NO.UTF-8,nn_NO
-Oriya or_IN.UTF-8,or_IN
--Panjabi pa_IN.UTF-8,pa_IN
-Persian fa_IR.UTF-8,fa_IR
-Polish pl_PL.UTF-8,pl_PL
-Portuguese(Brazilian) pt_BR.UTF-8,pt_BR
-Portuguese pt_PT.UTF-8,pt_PT
+-Punjabi pa_IN.UTF-8,pa_IN
-Romanian ro_RO.UTF-8,ro_RO
-Russian ru_RU.UTF-8,ru_RU
-Serbian sr_CS.UTF-8,sr_CS,sr_YU@cyrillic,sr_YU
+-Serbian(Montenegro) sr_ME.UTF-8
+-Serbian(Serbia) sr_RS.UTF-8
+-Serbian(Bosnia) sh_BA.UTF-8,sh_BA
-Serbian(Latin) sr_CS.UTF-8@Latn,sr_CS@Latn,sr_YU@Latn
-Serbian(Jekavian) sr_CS.UTF-8@ije,sr_CS@ije,sr_YU@ije
-Slovak sk_SK.UTF-8,sk_SK
-Slovenian sl_SI.UTF-8,sl_SI
-Spanish es_ES.UTF-8,es_ES
+-Spanish(Argentina) es_AR.UTF-8,es_AR
+-Spanish(Bolivia) es_BO.UTF-8,es_BO
+-Spanish(Chile) es_CL.UTF-8,es_CL
+-Spanish(Colombia) es_CO.UTF-8,es_CO
+-Spanish(CostaRica) es_CR.UTF-8,es_CR
+-Spanish(Ecuador) es_EC.UTF-8,es_EC
+-Spanish(Guatemala) es_GT.UTF-8,es_GT
-Spanish(Mexico) es_MX.UTF-8,es_MX
+-Spanish(Nicaragua) es_NI.UTF-8,es_NI
+-Spanish(Panama) es_PA.UTF-8,es_PA
+-Spanish(Peru) es_PE.UTF-8,es_PE
+-Spanish(Paraguay) es_PY.UTF-8,es_PY
+-Spanish(ElSalvador) es_SV.UTF-8,es_SV
+-Spanish(Uruguay) es_UY.UTF-8,es_UY
+-Spanish(Venezuela) es_VE.UTF-8,es_VE
-Swedish(Finland) sv_FI.UTF-8,sv_FI
-Swedish sv_SE.UTF-8,sv_SE
-Tagalog tl_PH.UTF-8,tl_PH
@@ -105,6 +133,7 @@
-Xhosa xh_ZA.UTF-8,xh_ZA
-Yiddish yi.UTF-8,yi
-Zulu zu_ZA.UTF-8,zu_ZA
++C(POSIX) C,POSIX
+Afrikaans af_ZA.UTF-8,af_ZA.ISO8859-15,af_ZA.ISO8859-1
+Amharic am_ET.UTF-8
+Armenian hy_AM.UTF-8
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index e889e92..4bcfd78 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -206,7 +206,6 @@ share/locale/pt_BR/LC_MESSAGES/gdm.mo
share/locale/ro/LC_MESSAGES/gdm.mo
share/locale/ru/LC_MESSAGES/gdm.mo
share/locale/rw/LC_MESSAGES/gdm.mo
-share/locale/si/LC_MESSAGES/gdm.mo
share/locale/sk/LC_MESSAGES/gdm.mo
share/locale/sl/LC_MESSAGES/gdm.mo
share/locale/sq/LC_MESSAGES/gdm.mo
@@ -264,6 +263,7 @@ share/locale/zu/LC_MESSAGES/gdm.mo
@dirrm etc/gdm
@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
@@ -286,8 +286,6 @@ share/locale/zu/LC_MESSAGES/gdm.mo
@dirrmtry share/locale/sl
@dirrmtry share/locale/sk/LC_MESSAGES
@dirrmtry share/locale/sk
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/ro/LC_MESSAGES
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 65bc73b..ecb39d9 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-applets/Makefile,v 1.141 2006/10/08 02:12:50 marcus Exp $
+# $MCom: ports/x11/gnome-applets/Makefile,v 1.152 2007/03/12 17:47:04 marcus Exp $
#
PORTNAME= gnome-applets
-PORTVERSION= 2.16.2
-PORTREVISION= 1
+PORTVERSION= 2.18.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,13 +16,13 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Applets components for the GNOME 2 Desktop Environment
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/system-tools-backends \
- ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
+ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
xklavier.11:${PORTSDIR}/x11/libxklavier \
- gucharmap.5:${PORTSDIR}/deskutils/gucharmap
-RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/system-tools-backends \
- ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
+ gucharmap.6:${PORTSDIR}/deskutils/gucharmap
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
+ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
USE_GETTEXT= yes
USE_BZIP2= yes
@@ -34,7 +33,7 @@ INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \
- gail gnomedocutils
+ gail gnomedocutils libgnomekbd
WANT_GNOME= yes
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
@@ -101,6 +100,8 @@ PLIST_SUB+= PYTHON="@comment "
post-patch:
@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
${WRKSRC}/libgweather/weather-met.c
+ @${REINPLACE_CMD} -e 's|system-tools-backends|system-tools-backends-2.0|g' \
+ ${WRKSRC}/configure
.if !defined(USE_PYTHON)
@${REINPLACE_CMD} -e 's|HAVE_PYGTK="yes"|HAVE_PYGTK="no"|' \
${WRKSRC}/configure
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index ae985f3..14fb514 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.16.2.tar.bz2) = 1a46b8557ff05ca75e7db6adb4dd6707
-SHA256 (gnome2/gnome-applets-2.16.2.tar.bz2) = de3c9d92c5da1597dbcdc5d4a7554235006d0bf6432f97ab7b0a6a5a47dbb67b
-SIZE (gnome2/gnome-applets-2.16.2.tar.bz2) = 7127753
+MD5 (gnome2/gnome-applets-2.18.0.tar.bz2) = db3ef99c00335798f30fc0a9162c0257
+SHA256 (gnome2/gnome-applets-2.18.0.tar.bz2) = f8f23e0c5e156afb0811d7a7fcbfec8dc667b8e35fa8a1cfff0b4866014c2157
+SIZE (gnome2/gnome-applets-2.18.0.tar.bz2) = 7133902
diff --git a/x11/gnome-applets/files/patch-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd
index 53841b6..e7f0e21 100644
--- a/x11/gnome-applets/files/patch-cpufreq-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-freebsd
@@ -63,52 +63,6 @@
NULL
};
static const gchar *const documenters[] = {
---- cpufreq/src/Makefile.in.orig Sat Jun 17 13:42:50 2006
-+++ cpufreq/src/Makefile.in Sat Jun 17 14:03:45 2006
-@@ -62,7 +62,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre
- cpufreq-monitor-procfs.h cpufreq-monitor-sysfs.c \
- cpufreq-monitor-sysfs.h cpufreq-monitor-libcpufreq.c \
- cpufreq-monitor-libcpufreq.h cpufreq-monitor-cpuinfo.c \
-- cpufreq-monitor-cpuinfo.h
-+ cpufreq-monitor-cpuinfo.h cpufreq-monitor-sysctl.c \
-+ cpufreq-monitor-sysctl.h
- @HAVE_LIBCPUFREQ_TRUE@am__objects_1 = \
- @HAVE_LIBCPUFREQ_TRUE@ cpufreq-monitor-libcpufreq.$(OBJEXT)
- am_cpufreq_applet_OBJECTS = cpufreq-applet.$(OBJEXT) \
-@@ -71,7 +72,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl
- cpufreq-monitor-factory.$(OBJEXT) \
- cpufreq-monitor-procfs.$(OBJEXT) \
- cpufreq-monitor-sysfs.$(OBJEXT) $(am__objects_1) \
-- cpufreq-monitor-cpuinfo.$(OBJEXT)
-+ cpufreq-monitor-cpuinfo.$(OBJEXT) \
-+ cpufreq-monitor-sysctl.$(OBJEXT)
- cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
- am__DEPENDENCIES_1 =
- cpufreq_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -85,6 +87,7 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
-+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-prefs.Po \
-@@ -397,6 +400,7 @@ cpufreq_applet_SOURCES = \
- cpufreq-monitor.c cpufreq-monitor.h \
- cpufreq-monitor-factory.c cpufreq-monitor-factory.h \
- cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \
-+ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \
- cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \
- $(cpufreq_files) \
- cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h
-@@ -482,6 +486,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@
--- cpufreq/src/cpufreq-monitor-sysctl.h.orig Sat Jun 17 14:05:37 2006
+++ cpufreq/src/cpufreq-monitor-sysctl.h Sat Jun 17 14:14:13 2006
@@ -0,0 +1,49 @@
@@ -161,9 +115,111 @@
+CPUFreqMonitor *cpufreq_monitor_sysctl_new (guint cpu);
+
+#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */
---- cpufreq/src/cpufreq-monitor-sysctl.c.orig Sat Jun 17 14:15:55 2006
-+++ cpufreq/src/cpufreq-monitor-sysctl.c Sat Jun 24 01:45:23 2006
-@@ -0,0 +1,161 @@
+--- cpufreq/src/cpufreq-monitor-factory.c.orig Sat Jun 17 06:28:02 2006
++++ cpufreq/src/cpufreq-monitor-factory.c Sat Jun 24 01:45:54 2006
+@@ -17,6 +17,7 @@
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Authors : Carlos García Campos <carlosgc@gnome.org>
++ * Joe Marcus Clarke <marcus@FreeBSD.org>
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -25,11 +26,18 @@
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#endif /* __FreeBSD__ */
+
+ #include "cpufreq-applet.h"
+ #include "cpufreq-utils.h"
+ #include "cpufreq-monitor-sysfs.h"
+ #include "cpufreq-monitor-procfs.h"
++#ifdef __FreeBSD__
++#include "cpufreq-monitor-sysctl.h"
++#endif /* __FreeBSD__ */
+ #include "cpufreq-monitor-cpuinfo.h"
+ #ifdef HAVE_LIBCPUFREQ
+ #include "cpufreq-monitor-libcpufreq.h"
+@@ -40,6 +48,7 @@ CPUFreqMonitor *
+ cpufreq_monitor_factory_create_monitor (guint cpu)
+ {
+ CPUFreqMonitor *monitor = NULL;
++#ifndef __FreeBSD__
+
+ #ifdef HAVE_LIBCPUFREQ
+ monitor = cpufreq_monitor_libcpufreq_new (cpu);
+@@ -63,6 +72,19 @@ cpufreq_monitor_factory_create_monitor (
+
+ monitor = cpufreq_monitor_cpuinfo_new (cpu);
+ }
++#else
++ size_t len;
++
++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
++ monitor = cpufreq_monitor_sysctl_new (cpu);
++ } else {
++ cpufreq_utils_display_error (_("CPU frequency scaling unsupported"),
++ _("You will not be able to modify the frequency of your machine. "
++ "Your machine may be misconfigured or not have hardware support "
++ "for CPU frequency scaling."));
++ monitor = cpufreq_monitor_cpuinfo_new (cpu);
++ }
++#endif /* __FreeBSD__ */
+
+ return monitor;
+ }
+--- cpufreq/src/cpufreq-utils.c.orig Sat Aug 12 21:26:50 2006
++++ cpufreq/src/cpufreq-utils.c Tue Aug 22 11:07:32 2006
+@@ -22,6 +22,9 @@
+ #include <glib.h>
+ #include <gtk/gtkmessagedialog.h>
+ #include <sys/types.h>
++#ifdef __FreeBSD__
++#include <sys/sysctl.h>
++#endif
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+@@ -30,6 +33,24 @@
+
+ #include "cpufreq-utils.h"
+
++#ifdef __FreeBSD__
++guint
++cpufreq_utils_get_n_cpus (void)
++{
++ size_t len;
++ static guint n_cpus = 0;
++
++ if (n_cpus > 0)
++ return n_cpus;
++
++ len = sizeof (n_cpus);
++ if (sysctlbyname ("hw.ncpu", &n_cpus, &len, NULL, 0) == -1) {
++ return 1;
++ }
++
++ return n_cpus;
++}
++#else
+ guint
+ cpufreq_utils_get_n_cpus (void)
+ {
+@@ -72,6 +93,7 @@ cpufreq_utils_get_n_cpus (void)
+
+ return 1;
+ }
++#endif /* __FreeBSD__ */
+
+ void
+ cpufreq_utils_display_error (const gchar *message,
+--- cpufreq/src/cpufreq-monitor-sysctl.c.orig Wed Feb 28 14:03:58 2007
++++ cpufreq/src/cpufreq-monitor-sysctl.c Wed Feb 28 14:28:47 2007
+@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2001, 2002 Free Software Foundation
+ *
@@ -203,6 +259,7 @@
+
+static gboolean cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor);
+static GList *cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor);
++static GList *cpufreq_monitor_sysctl_get_available_governors (CPUFreqMonitor *monitor);
+
+static gboolean cpufreq_monitor_sysctl_get (gpointer gdata);
+
@@ -220,6 +277,7 @@
+
+ monitor_class->run = cpufreq_monitor_sysctl_run;
+ monitor_class->get_available_frequencies = cpufreq_monitor_sysctl_get_available_frequencies;
++ monitor_class->get_available_governors = cpufreq_monitor_sysctl_get_available_governors;
+}
+
+CPUFreqMonitor *
@@ -242,7 +300,7 @@
+ guint mon_cpu;
+ GList *list;
+
-+ list = cpufreq_monitor_get_available_frequencies (CPUFREQ_MONITOR (monitor));
++ list = cpufreq_monitor_sysctl_get_available_frequencies (CPUFREQ_MONITOR (monitor));
+
+ fmax = atoi ((gchar *) list->data);
+ fmin = atoi ((gchar *) g_list_nth_data (list, (g_list_length (list) - 1)));
@@ -263,9 +321,10 @@
+ else if (ifreq == fmin)
+ governor = g_strdup ("economy");
+ else
-+ governor = g_strdup ("other");
++ governor = g_strdup ("userspace");
+
+ g_object_set (G_OBJECT (monitor),
++ "online", TRUE,
+ "governor", governor,
+ "frequency", ifreq,
+ "max-frequency", fmax,
@@ -324,106 +383,62 @@
+
+ return (list);
+}
-+#endif /* __FreeBSD__ */
---- cpufreq/src/cpufreq-monitor-factory.c.orig Sat Jun 17 06:28:02 2006
-+++ cpufreq/src/cpufreq-monitor-factory.c Sat Jun 24 01:45:54 2006
-@@ -17,6 +17,7 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Authors : Carlos García Campos <carlosgc@gnome.org>
-+ * Joe Marcus Clarke <marcus@FreeBSD.org>
- */
-
- #ifdef HAVE_CONFIG_H
-@@ -25,11 +26,18 @@
-
- #include <glib.h>
- #include <glib/gi18n.h>
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif /* __FreeBSD__ */
-
- #include "cpufreq-applet.h"
- #include "cpufreq-utils.h"
- #include "cpufreq-monitor-sysfs.h"
- #include "cpufreq-monitor-procfs.h"
-+#ifdef __FreeBSD__
-+#include "cpufreq-monitor-sysctl.h"
-+#endif /* __FreeBSD__ */
- #include "cpufreq-monitor-cpuinfo.h"
- #ifdef HAVE_LIBCPUFREQ
- #include "cpufreq-monitor-libcpufreq.h"
-@@ -40,6 +48,7 @@ CPUFreqMonitor *
- cpufreq_monitor_factory_create_monitor (guint cpu)
- {
- CPUFreqMonitor *monitor = NULL;
-+#ifndef __FreeBSD__
-
- #ifdef HAVE_LIBCPUFREQ
- monitor = cpufreq_monitor_libcpufreq_new (cpu);
-@@ -63,6 +72,19 @@ cpufreq_monitor_factory_create_monitor (
-
- monitor = cpufreq_monitor_cpuinfo_new (cpu);
- }
-+#else
-+ size_t len;
+
-+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
-+ monitor = cpufreq_monitor_sysctl_new (cpu);
-+ } else {
-+ cpufreq_utils_display_error (_("CPU frequency scaling unsupported"),
-+ _("You will not be able to modify the frequency of your machine. "
-+ "Your machine may be misconfigured or not have hardware support "
-+ "for CPU frequency scaling."));
-+ monitor = cpufreq_monitor_cpuinfo_new (cpu);
-+ }
-+#endif /* __FreeBSD__ */
-
- return monitor;
- }
---- cpufreq/src/cpufreq-utils.c.orig Sat Aug 12 21:26:50 2006
-+++ cpufreq/src/cpufreq-utils.c Tue Aug 22 11:07:32 2006
-@@ -22,6 +22,9 @@
- #include <glib.h>
- #include <gtk/gtkmessagedialog.h>
- #include <sys/types.h>
-+#ifdef __FreeBSD__
-+#include <sys/sysctl.h>
-+#endif
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-@@ -30,6 +33,24 @@
-
- #include "cpufreq-utils.h"
-
-+#ifdef __FreeBSD__
-+guint
-+cpufreq_utils_get_n_cpus (void)
++static GList *
++cpufreq_monitor_sysctl_get_available_governors (CPUFreqMonitor *monitor)
+{
-+ size_t len;
-+ static guint n_cpus = 0;
++ GList *list = NULL;
+
-+ if (n_cpus > 0)
-+ return n_cpus;
++ list = g_list_prepend (list, g_strdup ("performance"));
++ list = g_list_prepend (list, g_strdup ("userspace"));
++ list = g_list_prepend (list, g_strdup ("economy"));
+
-+ len = sizeof (n_cpus);
-+ if (sysctlbyname ("hw.ncpu", &n_cpus, &len, NULL, 0) == -1) {
-+ return 1;
-+ }
-+
-+ return n_cpus;
++ return list;
+}
-+#else
- guint
- cpufreq_utils_get_n_cpus (void)
- {
-@@ -72,6 +93,7 @@ cpufreq_utils_get_n_cpus (void)
-
- return 1;
- }
+#endif /* __FreeBSD__ */
-
- void
- cpufreq_utils_display_error (const gchar *message,
+--- cpufreq/src/Makefile.in.orig Mon Mar 12 11:58:09 2007
++++ cpufreq/src/Makefile.in Mon Mar 12 12:12:06 2007
+@@ -62,7 +62,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre
+ cpufreq-monitor-procfs.h cpufreq-monitor-sysfs.c \
+ cpufreq-monitor-sysfs.h cpufreq-monitor-libcpufreq.c \
+ cpufreq-monitor-libcpufreq.h cpufreq-monitor-cpuinfo.c \
+- cpufreq-monitor-cpuinfo.h
++ cpufreq-monitor-cpuinfo.h cpufreq-monitor-sysctl.c \
++ cpufreq-monitor-sysctl.h
+ @HAVE_LIBCPUFREQ_TRUE@am__objects_1 = \
+ @HAVE_LIBCPUFREQ_TRUE@ cpufreq-monitor-libcpufreq.$(OBJEXT)
+ am_cpufreq_applet_OBJECTS = cpufreq-applet.$(OBJEXT) \
+@@ -71,7 +72,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl
+ cpufreq-monitor-factory.$(OBJEXT) \
+ cpufreq-monitor-procfs.$(OBJEXT) \
+ cpufreq-monitor-sysfs.$(OBJEXT) $(am__objects_1) \
+- cpufreq-monitor-cpuinfo.$(OBJEXT)
++ cpufreq-monitor-cpuinfo.$(OBJEXT) \
++ cpufreq-monitor-sysctl.$(OBJEXT)
+ cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
+ am__DEPENDENCIES_1 =
+ cpufreq_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@@ -85,6 +87,7 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-prefs.Po \
+@@ -411,6 +414,7 @@ cpufreq_applet_SOURCES = \
+ cpufreq-monitor.c cpufreq-monitor.h \
+ cpufreq-monitor-factory.c cpufreq-monitor-factory.h \
+ cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \
++ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \
+ cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \
+ $(cpufreq_files) \
+ cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h
+@@ -496,6 +500,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@
diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
index 8a7ea85..8d459fd 100644
--- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
@@ -1,47 +1,3 @@
---- cpufreq/src/cpufreq-selector/Makefile.in.orig Sat Jun 24 01:52:35 2006
-+++ cpufreq/src/cpufreq-selector/Makefile.in Sat Jun 24 02:14:08 2006
-@@ -58,13 +58,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
- cpufreq-selector.h cpufreq-selector-sysfs.c \
- cpufreq-selector-sysfs.h cpufreq-selector-procfs.c \
- cpufreq-selector-procfs.h cpufreq-selector-libcpufreq.c \
-- cpufreq-selector-libcpufreq.h main.c
-+ cpufreq-selector-libcpufreq.h main.c \
-+ cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h
- @HAVE_LIBCPUFREQ_TRUE@am__objects_1 = \
- @HAVE_LIBCPUFREQ_TRUE@ cpufreq-selector-libcpufreq.$(OBJEXT)
- am_cpufreq_selector_OBJECTS = cpufreq-selector.$(OBJEXT) \
- cpufreq-selector-sysfs.$(OBJEXT) \
- cpufreq-selector-procfs.$(OBJEXT) $(am__objects_1) \
-- main.$(OBJEXT)
-+ main.$(OBJEXT) \
-+ cpufreq-selector-sysctl.$(OBJEXT)
- cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
- am__DEPENDENCIES_1 =
- cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -74,6 +76,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-selector-libcpufreq.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-procfs.Po \
-+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-sysctl.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-sysfs.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/main.Po
-@@ -371,6 +374,7 @@ cpufreq_selector_SOURCES = \
- cpufreq-selector.c cpufreq-selector.h \
- cpufreq-selector-sysfs.c cpufreq-selector-sysfs.h \
- cpufreq-selector-procfs.c cpufreq-selector-procfs.h \
-+ cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h \
- $(cpufreq_files) \
- main.c
-
-@@ -451,6 +455,7 @@ distclean-compile:
-
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-libcpufreq.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysctl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysfs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
--- cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.h.orig Sat Jun 24 01:52:35 2006
+++ cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.h Sat Jun 24 02:13:05 2006
@@ -0,0 +1,53 @@
@@ -234,3 +190,47 @@
+
+ return TRUE;
+}
+--- cpufreq/src/cpufreq-selector/Makefile.in.orig Mon Mar 12 11:58:09 2007
++++ cpufreq/src/cpufreq-selector/Makefile.in Mon Mar 12 12:12:33 2007
+@@ -58,13 +58,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
+ cpufreq-selector.h cpufreq-selector-sysfs.c \
+ cpufreq-selector-sysfs.h cpufreq-selector-procfs.c \
+ cpufreq-selector-procfs.h cpufreq-selector-libcpufreq.c \
+- cpufreq-selector-libcpufreq.h main.c
++ cpufreq-selector-libcpufreq.h main.c \
++ cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h
+ @HAVE_LIBCPUFREQ_TRUE@am__objects_1 = \
+ @HAVE_LIBCPUFREQ_TRUE@ cpufreq-selector-libcpufreq.$(OBJEXT)
+ am_cpufreq_selector_OBJECTS = cpufreq-selector.$(OBJEXT) \
+ cpufreq-selector-sysfs.$(OBJEXT) \
+ cpufreq-selector-procfs.$(OBJEXT) $(am__objects_1) \
+- main.$(OBJEXT)
++ main.$(OBJEXT) \
++ cpufreq-selector-sysctl.$(OBJEXT)
+ cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
+ am__DEPENDENCIES_1 =
+ cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@@ -75,6 +77,7 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-selector-libcpufreq.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-procfs.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-sysfs.Po \
++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-sysctl.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/main.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -385,6 +388,7 @@ cpufreq_selector_SOURCES = \
+ cpufreq-selector.c cpufreq-selector.h \
+ cpufreq-selector-sysfs.c cpufreq-selector-sysfs.h \
+ cpufreq-selector-procfs.c cpufreq-selector-procfs.h \
++ cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h \
+ $(cpufreq_files) \
+ main.c
+
+@@ -466,6 +470,7 @@ distclean-compile:
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-libcpufreq.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-procfs.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysfs.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 91659e1..411ee49 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1,13 +1,6 @@
%%CPUFREQ%%bin/cpufreq-selector
-bin/gswitchit-plugins-capplet
%%PYTHON%%bin/invest-chart
%%BATTERY%%etc/sound/events/battstat_applet.soundlist
-include/libgswitchit/gnome-kbd-indicator.h
-include/libgswitchit/gswitchit-config.h
-include/libgswitchit/gswitchit-plugin.h
-include/libgswitchit/gswitchit-plugins-app.h
-include/libgswitchit/keyboard-config-registry-client.h
-include/libgswitchit/keyboard-config-registry.h
include/libgweather/gweather-gconf.h
include/libgweather/gweather-prefs.h
include/libgweather/weather.h
@@ -59,7 +52,6 @@ libdata/bonobo/servers/GNOME_Panel_TrashApplet.server
libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
libdata/bonobo/servers/GNOME_StickyNotesApplet.server
%%PYTHON%%libdata/bonobo/servers/Invest_Applet.server
-libdata/pkgconfig/gswitchit.pc
libdata/pkgconfig/gweather.pc
libexec/accessx-status-applet
%%BATTERY%%libexec/battstat-applet-2
@@ -78,7 +70,6 @@ libexec/multiload-applet-2
libexec/null_applet
libexec/stickynotes_applet
libexec/trashapplet
-share/gnome/applications/gswitchit-plugins.desktop
%%PYTHON%%share/gnome/applications/invest-chart.desktop
share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml
%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
@@ -116,7 +107,6 @@ share/gnome/gnome-applets/geyes/Tango/tango-pupil.png
%%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade
%%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade
%%PYTHON%%share/gnome/gnome-applets/glade/financialchart.glade
-share/gnome/gnome-applets/glade/gswitchit-plugins.glade
share/gnome/gnome-applets/glade/gswitchit.glade
%%COMMANDER%%share/gnome/gnome-applets/glade/mini-commander.glade
share/gnome/gnome-applets/glade/modemlights.glade
@@ -153,6 +143,18 @@ 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/en_GB/accessx-status.xml
+share/gnome/help/accessx-status/en_GB/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/en_GB/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/en_GB/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
@@ -238,6 +240,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-credits-hal.png
%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-preferences.png
%%BATTERY%%share/gnome/help/battstat/bg/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/en_GB/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/en_GB/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/en_GB/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/en_GB/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/en_GB/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/en_GB/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
@@ -250,6 +258,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-credits-hal.png
%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-preferences.png
%%BATTERY%%share/gnome/help/battstat/fr/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/pa/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/pa/figures/context-menu.png
%%BATTERY%%share/gnome/help/battstat/sv/battstat.xml
%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet-expanded.png
%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png
@@ -273,6 +287,11 @@ 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/en_GB/char-palette.xml
+share/gnome/help/char-palette/en_GB/figures/charpalette_applet.png
+share/gnome/help/char-palette/en_GB/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/en_GB/figures/charpick-preferences.png
+share/gnome/help/char-palette/en_GB/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
@@ -344,6 +363,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/cpufreq-applet.xml
%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-100.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-25.png
@@ -411,6 +440,12 @@ share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png
share/gnome/help/drivemount/C/figures/drivemount-applet_open.png
share/gnome/help/drivemount/C/figures/drivemount-applet_status.png
share/gnome/help/drivemount/C/legal.xml
+share/gnome/help/drivemount/en_GB/drivemount.xml
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_status.png
share/gnome/help/drivemount/es/drivemount.xml
share/gnome/help/drivemount/es/figures/drivemount-applet_eject.png
share/gnome/help/drivemount/es/figures/drivemount-applet_example.png
@@ -435,6 +470,12 @@ share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png
share/gnome/help/drivemount/pa/figures/drivemount-applet_mount.png
share/gnome/help/drivemount/pa/figures/drivemount-applet_open.png
share/gnome/help/drivemount/pa/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/ru/drivemount.xml
+share/gnome/help/drivemount/ru/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_status.png
share/gnome/help/drivemount/sv/drivemount.xml
share/gnome/help/drivemount/sv/figures/drivemount-applet_eject.png
share/gnome/help/drivemount/sv/figures/drivemount-applet_example.png
@@ -458,6 +499,8 @@ 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/en_GB/figures/geyes_applet.png
+share/gnome/help/geyes/en_GB/geyes.xml
share/gnome/help/geyes/es/figures/geyes_applet.png
share/gnome/help/geyes/es/geyes.xml
share/gnome/help/geyes/fr/figures/geyes_applet.png
@@ -472,8 +515,10 @@ share/gnome/help/geyes/uk/figures/geyes_applet.png
share/gnome/help/geyes/uk/geyes.xml
share/gnome/help/gswitchit/C/gswitchit.xml
share/gnome/help/gswitchit/C/legal.xml
+share/gnome/help/gswitchit/en_GB/gswitchit.xml
share/gnome/help/gswitchit/es/gswitchit.xml
share/gnome/help/gswitchit/fr/gswitchit.xml
+share/gnome/help/gswitchit/ru/gswitchit.xml
share/gnome/help/gswitchit/sv/gswitchit.xml
share/gnome/help/gswitchit/uk/gswitchit.xml
share/gnome/help/gweather/C/figures/gweather-details.png
@@ -492,6 +537,21 @@ share/gnome/help/gweather/C/figures/stock_weather-storm.png
share/gnome/help/gweather/C/figures/stock_weather-sunny.png
share/gnome/help/gweather/C/gweather.xml
share/gnome/help/gweather/C/legal.xml
+share/gnome/help/gweather/en_GB/figures/gweather-details.png
+share/gnome/help/gweather/en_GB/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/en_GB/figures/gweather-prefs-general.png
+share/gnome/help/gweather/en_GB/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/en_GB/figures/gweather_applet.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-fog.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-showers.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-snow.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-storm.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-sunny.png
+share/gnome/help/gweather/en_GB/gweather.xml
share/gnome/help/gweather/es/figures/gweather-details.png
share/gnome/help/gweather/es/figures/gweather-menu-prefs.png
share/gnome/help/gweather/es/figures/gweather-prefs-general.png
@@ -537,6 +597,21 @@ share/gnome/help/gweather/nl/figures/stock_weather-snow.png
share/gnome/help/gweather/nl/figures/stock_weather-storm.png
share/gnome/help/gweather/nl/figures/stock_weather-sunny.png
share/gnome/help/gweather/nl/gweather.xml
+share/gnome/help/gweather/pa/figures/gweather-details.png
+share/gnome/help/gweather/pa/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/pa/figures/gweather-prefs-general.png
+share/gnome/help/gweather/pa/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/pa/figures/gweather_applet.png
+share/gnome/help/gweather/pa/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/pa/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/pa/figures/stock_weather-fog.png
+share/gnome/help/gweather/pa/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/pa/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/pa/figures/stock_weather-showers.png
+share/gnome/help/gweather/pa/figures/stock_weather-snow.png
+share/gnome/help/gweather/pa/figures/stock_weather-storm.png
+share/gnome/help/gweather/pa/figures/stock_weather-sunny.png
+share/gnome/help/gweather/pa/gweather.xml
share/gnome/help/gweather/sv/figures/gweather-details.png
share/gnome/help/gweather/sv/figures/gweather-menu-prefs.png
share/gnome/help/gweather/sv/figures/gweather-prefs-general.png
@@ -570,12 +645,18 @@ share/gnome/help/gweather/uk/gweather.xml
share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/C/legal.xml
share/gnome/help/mixer_applet2/C/mixer_applet2.xml
+share/gnome/help/mixer_applet2/en_GB/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/en_GB/mixer_applet2.xml
share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/es/mixer_applet2.xml
share/gnome/help/mixer_applet2/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/pa/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/pa/mixer_applet2.xml
+share/gnome/help/mixer_applet2/ru/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/ru/mixer_applet2.xml
share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/sv/mixer_applet2.xml
share/gnome/help/mixer_applet2/uk/figures/volumecontrol_applet.png
@@ -585,6 +666,10 @@ share/gnome/help/multiload/C/figures/system-monitor-applet_window.png
share/gnome/help/multiload/C/figures/system_monitor.png
share/gnome/help/multiload/C/legal.xml
share/gnome/help/multiload/C/multiload.xml
+share/gnome/help/multiload/en_GB/figures/multiload-preferences.png
+share/gnome/help/multiload/en_GB/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/en_GB/figures/system_monitor.png
+share/gnome/help/multiload/en_GB/multiload.xml
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
@@ -593,6 +678,14 @@ 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/pa/figures/multiload-preferences.png
+share/gnome/help/multiload/pa/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/pa/figures/system_monitor.png
+share/gnome/help/multiload/pa/multiload.xml
+share/gnome/help/multiload/ru/figures/multiload-preferences.png
+share/gnome/help/multiload/ru/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/ru/figures/system_monitor.png
+share/gnome/help/multiload/ru/multiload.xml
share/gnome/help/multiload/sv/figures/multiload-preferences.png
share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png
share/gnome/help/multiload/sv/figures/system_monitor.png
@@ -608,6 +701,12 @@ share/gnome/help/stickynotes_applet/C/figures/stickynotes-prefs.png
share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png
share/gnome/help/stickynotes_applet/C/legal.xml
share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/en_GB/stickynotes_applet.xml
share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-lock.png
share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-new.png
share/gnome/help/stickynotes_applet/es/figures/stickynotes-note-prefs.png
@@ -620,6 +719,12 @@ share/gnome/help/stickynotes_applet/fr/figures/stickynotes-note-prefs.png
share/gnome/help/stickynotes_applet/fr/figures/stickynotes-prefs.png
share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png
share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/pa/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/pa/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/pa/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/pa/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/pa/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/pa/stickynotes_applet.xml
share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-lock.png
share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-new.png
share/gnome/help/stickynotes_applet/sv/figures/stickynotes-note-prefs.png
@@ -635,6 +740,8 @@ share/gnome/help/stickynotes_applet/uk/stickynotes_applet.xml
share/gnome/help/trashapplet/C/figures/trash-applet.png
share/gnome/help/trashapplet/C/legal.xml
share/gnome/help/trashapplet/C/trashapplet.xml
+share/gnome/help/trashapplet/en_GB/figures/trash-applet.png
+share/gnome/help/trashapplet/en_GB/trashapplet.xml
share/gnome/help/trashapplet/es/figures/trash-applet.png
share/gnome/help/trashapplet/es/trashapplet.xml
share/gnome/help/trashapplet/fr/figures/trash-applet.png
@@ -653,6 +760,7 @@ 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-en_GB.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
@@ -661,12 +769,15 @@ share/gnome/omf/accessx-status/accessx-status-sv.omf
share/gnome/omf/accessx-status/accessx-status-uk.omf
%%BATTERY%%share/gnome/omf/battstat/battstat-C.omf
%%BATTERY%%share/gnome/omf/battstat/battstat-bg.omf
+%%BATTERY%%share/gnome/omf/battstat/battstat-en_GB.omf
%%BATTERY%%share/gnome/omf/battstat/battstat-es.omf
%%BATTERY%%share/gnome/omf/battstat/battstat-fr.omf
+%%BATTERY%%share/gnome/omf/battstat/battstat-pa.omf
%%BATTERY%%share/gnome/omf/battstat/battstat-sv.omf
%%BATTERY%%share/gnome/omf/battstat/battstat-uk.omf
share/gnome/omf/char-palette/char-palette-C.omf
share/gnome/omf/char-palette/char-palette-bg.omf
+share/gnome/omf/char-palette/char-palette-en_GB.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
@@ -681,6 +792,7 @@ share/gnome/omf/char-palette/char-palette-uk.omf
%%COMMANDER%%share/gnome/omf/command-line/command-line-sv.omf
%%COMMANDER%%share/gnome/omf/command-line/command-line-uk.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf
+%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-en_GB.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-fr.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-nl.omf
@@ -688,15 +800,18 @@ share/gnome/omf/char-palette/char-palette-uk.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf
share/gnome/omf/drivemount/drivemount-C.omf
+share/gnome/omf/drivemount/drivemount-en_GB.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-ru.omf
share/gnome/omf/drivemount/drivemount-sv.omf
share/gnome/omf/drivemount/drivemount-uk.omf
share/gnome/omf/drivemount/drivemount-zh_CN.omf
share/gnome/omf/geyes/geyes-C.omf
share/gnome/omf/geyes/geyes-bg.omf
+share/gnome/omf/geyes/geyes-en_GB.omf
share/gnome/omf/geyes/geyes-es.omf
share/gnome/omf/geyes/geyes-fr.omf
share/gnome/omf/geyes/geyes-it.omf
@@ -704,33 +819,46 @@ share/gnome/omf/geyes/geyes-ru.omf
share/gnome/omf/geyes/geyes-sv.omf
share/gnome/omf/geyes/geyes-uk.omf
share/gnome/omf/gswitchit/gswitchit-C.omf
+share/gnome/omf/gswitchit/gswitchit-en_GB.omf
share/gnome/omf/gswitchit/gswitchit-es.omf
share/gnome/omf/gswitchit/gswitchit-fr.omf
+share/gnome/omf/gswitchit/gswitchit-ru.omf
share/gnome/omf/gswitchit/gswitchit-sv.omf
share/gnome/omf/gswitchit/gswitchit-uk.omf
share/gnome/omf/gweather/gweather-C.omf
+share/gnome/omf/gweather/gweather-en_GB.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-pa.omf
share/gnome/omf/gweather/gweather-sv.omf
share/gnome/omf/gweather/gweather-uk.omf
share/gnome/omf/mixer_applet2/mixer_applet2-C.omf
+share/gnome/omf/mixer_applet2/mixer_applet2-en_GB.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-pa.omf
+share/gnome/omf/mixer_applet2/mixer_applet2-ru.omf
share/gnome/omf/mixer_applet2/mixer_applet2-sv.omf
share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf
share/gnome/omf/multiload/multiload-C.omf
+share/gnome/omf/multiload/multiload-en_GB.omf
share/gnome/omf/multiload/multiload-es.omf
share/gnome/omf/multiload/multiload-fr.omf
+share/gnome/omf/multiload/multiload-pa.omf
+share/gnome/omf/multiload/multiload-ru.omf
share/gnome/omf/multiload/multiload-sv.omf
share/gnome/omf/multiload/multiload-uk.omf
share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf
+share/gnome/omf/stickynotes_applet/stickynotes_applet-en_GB.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-pa.omf
share/gnome/omf/stickynotes_applet/stickynotes_applet-sv.omf
share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf
share/gnome/omf/trashapplet/trashapplet-C.omf
+share/gnome/omf/trashapplet/trashapplet-en_GB.omf
share/gnome/omf/trashapplet/trashapplet-es.omf
share/gnome/omf/trashapplet/trashapplet-fr.omf
share/gnome/omf/trashapplet/trashapplet-it.omf
@@ -1028,6 +1156,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/trashapplet/fr
@dirrm share/gnome/help/trashapplet/es/figures
@dirrm share/gnome/help/trashapplet/es
+@dirrm share/gnome/help/trashapplet/en_GB/figures
+@dirrm share/gnome/help/trashapplet/en_GB
@dirrm share/gnome/help/trashapplet/C/figures
@dirrm share/gnome/help/trashapplet/C
@dirrm share/gnome/help/trashapplet
@@ -1035,10 +1165,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/stickynotes_applet/uk
@dirrm share/gnome/help/stickynotes_applet/sv/figures
@dirrm share/gnome/help/stickynotes_applet/sv
+@dirrm share/gnome/help/stickynotes_applet/pa/figures
+@dirrm share/gnome/help/stickynotes_applet/pa
@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/en_GB/figures
+@dirrm share/gnome/help/stickynotes_applet/en_GB
@dirrm share/gnome/help/stickynotes_applet/C/figures
@dirrm share/gnome/help/stickynotes_applet/C
@dirrm share/gnome/help/stickynotes_applet
@@ -1046,10 +1180,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/multiload/uk
@dirrm share/gnome/help/multiload/sv/figures
@dirrm share/gnome/help/multiload/sv
+@dirrm share/gnome/help/multiload/ru/figures
+@dirrm share/gnome/help/multiload/ru
+@dirrm share/gnome/help/multiload/pa/figures
+@dirrm share/gnome/help/multiload/pa
@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/en_GB/figures
+@dirrm share/gnome/help/multiload/en_GB
@dirrm share/gnome/help/multiload/C/figures
@dirrm share/gnome/help/multiload/C
@dirrm share/gnome/help/multiload
@@ -1057,12 +1197,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/mixer_applet2/uk
@dirrm share/gnome/help/mixer_applet2/sv/figures
@dirrm share/gnome/help/mixer_applet2/sv
+@dirrm share/gnome/help/mixer_applet2/ru/figures
+@dirrm share/gnome/help/mixer_applet2/ru
+@dirrm share/gnome/help/mixer_applet2/pa/figures
+@dirrm share/gnome/help/mixer_applet2/pa
@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/en_GB/figures
+@dirrm share/gnome/help/mixer_applet2/en_GB
@dirrm share/gnome/help/mixer_applet2/C/figures
@dirrm share/gnome/help/mixer_applet2/C
@dirrm share/gnome/help/mixer_applet2
@@ -1070,19 +1216,25 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/gweather/uk
@dirrm share/gnome/help/gweather/sv/figures
@dirrm share/gnome/help/gweather/sv
+@dirrm share/gnome/help/gweather/pa/figures
+@dirrm share/gnome/help/gweather/pa
@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/en_GB/figures
+@dirrm share/gnome/help/gweather/en_GB
@dirrm share/gnome/help/gweather/C/figures
@dirrm share/gnome/help/gweather/C
@dirrm share/gnome/help/gweather
@dirrm share/gnome/help/gswitchit/uk
@dirrm share/gnome/help/gswitchit/sv
+@dirrm share/gnome/help/gswitchit/ru
@dirrm share/gnome/help/gswitchit/fr
@dirrm share/gnome/help/gswitchit/es
+@dirrm share/gnome/help/gswitchit/en_GB
@dirrm share/gnome/help/gswitchit/C
@dirrm share/gnome/help/gswitchit
@dirrm share/gnome/help/geyes/uk/figures
@@ -1097,6 +1249,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/geyes/fr
@dirrm share/gnome/help/geyes/es/figures
@dirrm share/gnome/help/geyes/es
+@dirrm share/gnome/help/geyes/en_GB/figures
+@dirrm share/gnome/help/geyes/en_GB
@dirrm share/gnome/help/geyes/bg/figures
@dirrm share/gnome/help/geyes/bg
@dirrm share/gnome/help/geyes/C/figures
@@ -1108,6 +1262,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/drivemount/uk
@dirrm share/gnome/help/drivemount/sv/figures
@dirrm share/gnome/help/drivemount/sv
+@dirrm share/gnome/help/drivemount/ru/figures
+@dirrm share/gnome/help/drivemount/ru
@dirrm share/gnome/help/drivemount/pa/figures
@dirrm share/gnome/help/drivemount/pa
@dirrm share/gnome/help/drivemount/it/figures
@@ -1116,6 +1272,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/drivemount/fr
@dirrm share/gnome/help/drivemount/es/figures
@dirrm share/gnome/help/drivemount/es
+@dirrm share/gnome/help/drivemount/en_GB/figures
+@dirrm share/gnome/help/drivemount/en_GB
@dirrm share/gnome/help/drivemount/C/figures
@dirrm share/gnome/help/drivemount/C
@dirrm share/gnome/help/drivemount
@@ -1131,6 +1289,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
@@ -1161,6 +1321,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@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/en_GB/figures
+@dirrm share/gnome/help/char-palette/en_GB
@dirrm share/gnome/help/char-palette/bg/figures
@dirrm share/gnome/help/char-palette/bg
@dirrm share/gnome/help/char-palette/C/figures
@@ -1170,10 +1332,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
%%BATTERY%%@dirrm share/gnome/help/battstat/uk
%%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/sv
+%%BATTERY%%@dirrm share/gnome/help/battstat/pa/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/pa
%%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/en_GB/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/en_GB
%%BATTERY%%@dirrm share/gnome/help/battstat/bg/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/bg
%%BATTERY%%@dirrm share/gnome/help/battstat/C/figures
@@ -1191,6 +1357,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/en_GB/figures
+@dirrm share/gnome/help/accessx-status/en_GB
@dirrm share/gnome/help/accessx-status/bg/figures
@dirrm share/gnome/help/accessx-status/bg
@dirrm share/gnome/help/accessx-status/C/figures
@@ -1209,7 +1377,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/gnome-applets
%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/invest
@dirrm include/libgweather
-@dirrm include/libgswitchit
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 6afa316..576e2a8 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-desktop/Makefile,v 1.105 2006/10/03 01:38:25 ahze Exp $
+# $MCom: ports/x11/gnome-desktop/Makefile,v 1.112 2007/03/13 12:15:44 ahze Exp $
#
PORTNAME= gnome-desktop
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0
PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index bf62a99..fe407ce 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-desktop-2.16.3.tar.bz2) = 42c21d18589f4955bb0d70c82236d999
-SHA256 (gnome2/gnome-desktop-2.16.3.tar.bz2) = 1cff15d7e83572d7d510e6a48277f6741a7612bc3d2b6ac3344af8bd6ecc0769
-SIZE (gnome2/gnome-desktop-2.16.3.tar.bz2) = 1201741
+MD5 (gnome2/gnome-desktop-2.18.0.tar.bz2) = 3fdea4f0188e5b1c19beb0dd0cbd317e
+SHA256 (gnome2/gnome-desktop-2.18.0.tar.bz2) = e8b6e23c2833cf1905c402c79a2aebdbb283cbd0930ec3119e564a18bfe1e98b
+SIZE (gnome2/gnome-desktop-2.18.0.tar.bz2) = 1234276
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 5f7d6d6..0620f7d 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -31,6 +31,7 @@ share/gnome/help/gpl/fr/gpl.xml
share/gnome/help/gpl/pa/gpl.xml
share/gnome/help/gpl/sv/gpl.xml
share/gnome/help/gpl/uk/gpl.xml
+share/gnome/help/gpl/vi/gpl.xml
share/gnome/help/gpl/zh_CN/gpl.xml
share/gnome/help/lgpl/C/lgpl.xml
share/gnome/help/lgpl/es/lgpl.xml
@@ -51,6 +52,7 @@ share/gnome/omf/gpl/gpl-fr.omf
share/gnome/omf/gpl/gpl-pa.omf
share/gnome/omf/gpl/gpl-sv.omf
share/gnome/omf/gpl/gpl-uk.omf
+share/gnome/omf/gpl/gpl-vi.omf
share/gnome/omf/gpl/gpl-zh_CN.omf
share/gnome/omf/lgpl/lgpl-C.omf
share/gnome/omf/lgpl/lgpl-es.omf
@@ -136,6 +138,7 @@ share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bn_IN/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -220,30 +223,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
-@dirrm share/gnome/omf/lgpl
-@dirrm share/gnome/omf/gpl
-@dirrm share/gnome/omf/fdl
-@dirrm share/gnome/help/lgpl/zh_CN
-@dirrm share/gnome/help/lgpl/uk
-@dirrm share/gnome/help/lgpl/sv
-@dirrm share/gnome/help/lgpl/pa
-@dirrm share/gnome/help/lgpl/fr
-@dirrm share/gnome/help/lgpl/es
-@dirrm share/gnome/help/gpl/zh_CN
-@dirrm share/gnome/help/gpl/uk
-@dirrm share/gnome/help/gpl/sv
-@dirrm share/gnome/help/gpl/pa
-@dirrm share/gnome/help/gpl/fr
-@dirrm share/gnome/help/gpl/fi
-@dirrm share/gnome/help/gpl/es
-@dirrm share/gnome/help/fdl/uk
-@dirrm share/gnome/help/fdl/sv
-@dirrm share/gnome/help/fdl/fr
-@dirrm share/gnome/help/fdl/es
-@dirrm share/gnome/gnome-about/headers
-@dirrm include/gnome-desktop-2.0/libgnomeui
-@dirrm include/gnome-desktop-2.0/libgnome
-@dirrm include/gnome-desktop-2.0
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@@ -318,5 +297,32 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
+@dirrm share/gnome/omf/lgpl
+@dirrm share/gnome/omf/gpl
+@dirrm share/gnome/omf/fdl
+@dirrm share/gnome/help/lgpl/zh_CN
+@dirrm share/gnome/help/lgpl/uk
+@dirrm share/gnome/help/lgpl/sv
+@dirrm share/gnome/help/lgpl/pa
+@dirrm share/gnome/help/lgpl/fr
+@dirrm share/gnome/help/lgpl/es
+@dirrm share/gnome/help/gpl/zh_CN
+@dirrm share/gnome/help/gpl/vi
+@dirrm share/gnome/help/gpl/uk
+@dirrm share/gnome/help/gpl/sv
+@dirrm share/gnome/help/gpl/pa
+@dirrm share/gnome/help/gpl/fr
+@dirrm share/gnome/help/gpl/fi
+@dirrm share/gnome/help/gpl/es
+@dirrm share/gnome/help/fdl/uk
+@dirrm share/gnome/help/fdl/sv
+@dirrm share/gnome/help/fdl/fr
+@dirrm share/gnome/help/fdl/es
+@dirrm share/gnome/gnome-about/headers
+@dirrm include/gnome-desktop-2.0/libgnomeui
+@dirrm include/gnome-desktop-2.0/libgnome
+@dirrm include/gnome-desktop-2.0
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 26c86ec..bde46e8 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-menus/Makefile,v 1.39 2006/10/03 11:32:43 ahze Exp $
+# $MCom: ports/x11/gnome-menus/Makefile,v 1.50 2007/03/12 22:36:46 marcus Exp $
#
PORTNAME= gnome-menus
-PORTVERSION= 2.16.1
+PORTVERSION= 2.18.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index 40c8300..752542a 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-menus-2.16.1.tar.bz2) = a5c467abe68003d23ec09a795ebfd29f
-SHA256 (gnome2/gnome-menus-2.16.1.tar.bz2) = 72238f33406ada505fde8555ff93c00e7fec055a41500339b434c5445b09c87b
-SIZE (gnome2/gnome-menus-2.16.1.tar.bz2) = 416053
+MD5 (gnome2/gnome-menus-2.18.0.tar.bz2) = 746f336d4fd427cb2db1691bc53a49d4
+SHA256 (gnome2/gnome-menus-2.18.0.tar.bz2) = f73372cb9f895ae4cee35d56868fcee3e3182aea52f20ce29ffb2aaf86403f1d
+SIZE (gnome2/gnome-menus-2.18.0.tar.bz2) = 434900
diff --git a/x11/gnome-menus/files/patch-layout::preferences.menu b/x11/gnome-menus/files/patch-layout::preferences.menu
index fef1dc0..705e0e6 100644
--- a/x11/gnome-menus/files/patch-layout::preferences.menu
+++ b/x11/gnome-menus/files/patch-layout::preferences.menu
@@ -1,5 +1,5 @@
---- layout/preferences.menu.orig Sat Dec 11 07:58:50 2004
-+++ layout/preferences.menu Tue Mar 1 01:28:57 2005
+--- layout/preferences.menu.orig Tue Feb 13 04:18:01 2007
++++ layout/preferences.menu Tue Feb 13 16:54:35 2007
@@ -9,12 +9,15 @@
<DefaultAppDirs/>
<DefaultDirectoryDirs/>
@@ -24,11 +24,11 @@
<Include>
<And>
+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
++ <Or>
++ <Category>Qt</Category>
++ <Category>KDE</Category>
++ </Or>
++ </Not>
<Category>Settings</Category>
<Category>Accessibility</Category>
</And>
diff --git a/x11/gnome-menus/files/patch-layout::settings.menu b/x11/gnome-menus/files/patch-layout::settings.menu
deleted file mode 100644
index 115f03c..0000000
--- a/x11/gnome-menus/files/patch-layout::settings.menu
+++ /dev/null
@@ -1,22 +0,0 @@
---- layout/settings.menu.orig Thu Apr 14 17:36:13 2005
-+++ layout/settings.menu Tue May 17 18:42:56 2005
-@@ -25,10 +25,19 @@
- <Directory>System-Settings.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Settings</Category>
- <Category>System</Category>
- </And>
- </Include>
- </Menu> <!-- End System Settings -->
-+
-+ <!-- Read in overrides and child menus from settings-merged/ -->
-+ <DefaultMergeDirs/>
-
- </Menu> <!-- End Applications -->
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index 1a63a7c..59cea97 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -19,18 +19,24 @@ share/gnome/desktop-directories/Development.directory
share/gnome/desktop-directories/Education.directory
share/gnome/desktop-directories/Games.directory
share/gnome/desktop-directories/Graphics.directory
+share/gnome/desktop-directories/Hardware.directory
share/gnome/desktop-directories/Internet.directory
+share/gnome/desktop-directories/InternetAndNetwork.directory
share/gnome/desktop-directories/KDE.directory
+share/gnome/desktop-directories/LookAndFeel.directory
share/gnome/desktop-directories/Multimedia.directory
share/gnome/desktop-directories/Office.directory
share/gnome/desktop-directories/Other.directory
+share/gnome/desktop-directories/Personal.directory
share/gnome/desktop-directories/Preferences.directory
share/gnome/desktop-directories/Settings-Accessibility.directory
share/gnome/desktop-directories/Settings.directory
share/gnome/desktop-directories/System-Settings.directory
share/gnome/desktop-directories/System-Tools.directory
+share/gnome/desktop-directories/System.directory
share/locale/ar/LC_MESSAGES/gnome-menus.mo
share/locale/be/LC_MESSAGES/gnome-menus.mo
+share/locale/be@latin/LC_MESSAGES/gnome-menus.mo
share/locale/bg/LC_MESSAGES/gnome-menus.mo
share/locale/bn/LC_MESSAGES/gnome-menus.mo
share/locale/bn_IN/LC_MESSAGES/gnome-menus.mo
@@ -44,14 +50,15 @@ 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
+share/locale/eo/LC_MESSAGES/gnome-menus.mo
share/locale/es/LC_MESSAGES/gnome-menus.mo
share/locale/et/LC_MESSAGES/gnome-menus.mo
share/locale/eu/LC_MESSAGES/gnome-menus.mo
share/locale/fa/LC_MESSAGES/gnome-menus.mo
share/locale/fi/LC_MESSAGES/gnome-menus.mo
share/locale/fr/LC_MESSAGES/gnome-menus.mo
-share/locale/gn/LC_MESSAGES/gnome-menus.mo
share/locale/gl/LC_MESSAGES/gnome-menus.mo
+share/locale/gn/LC_MESSAGES/gnome-menus.mo
share/locale/gu/LC_MESSAGES/gnome-menus.mo
share/locale/he/LC_MESSAGES/gnome-menus.mo
share/locale/hi/LC_MESSAGES/gnome-menus.mo
@@ -105,8 +112,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrm include/gnome-menus
@dirrmtry etc/xdg/menus
@dirrmtry etc/xdg
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -167,5 +172,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 9cf74eb..976d9b8 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-panel/Makefile,v 1.140 2006/10/03 11:29:52 ahze Exp $
+# $MCom: ports/x11/gnome-panel/Makefile,v 1.146 2007/03/14 21:00:05 marcus Exp $
#
PORTNAME= gnome-panel
-PORTVERSION= 2.16.3
-PORTREVISION?= 0
+PORTVERSION= 2.18.0
+PORTREVISION?= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -72,6 +72,8 @@ post-patch:
@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
.endfor
.endif
+ @${REINPLACE_CMD} -e 's|True|true|' \
+ ${WRKSRC}/gnome-panel/gnome-panel.desktop.in
.include <bsd.port.post.mk>
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 2a80242..6585149 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.16.3.tar.bz2) = 4af0a1ecb940f2bb27a27db50e3071c8
-SHA256 (gnome2/gnome-panel-2.16.3.tar.bz2) = 16e44673e3a660585cb007c54d7b5e0aa5fe26e979090926cc55322bb6d0d67e
-SIZE (gnome2/gnome-panel-2.16.3.tar.bz2) = 2692203
+MD5 (gnome2/gnome-panel-2.18.0.tar.bz2) = 67ab5a4df1817fe14572d9e366664665
+SHA256 (gnome2/gnome-panel-2.18.0.tar.bz2) = 856c5205878bd0bee4bc7e62bdc7ecfce560aa233d2acfaf17a61d5ec446ef46
+SIZE (gnome2/gnome-panel-2.18.0.tar.bz2) = 2706385
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 70c9d7a..7737022 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -24,6 +24,7 @@ libexec/clock-applet
libexec/fish-applet-2
libexec/notification-area-applet
libexec/wnck-applet
+share/gnome/applications/gnome-panel.desktop
share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml
share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml
share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
@@ -60,6 +61,9 @@ share/gnome/help/clock/nl/legal.xml
share/gnome/help/clock/pa/clock.xml
share/gnome/help/clock/pa/figures/clock_applet.png
share/gnome/help/clock/pa/legal.xml
+share/gnome/help/clock/ru/clock.xml
+share/gnome/help/clock/ru/figures/clock_applet.png
+share/gnome/help/clock/ru/legal.xml
share/gnome/help/clock/sr/clock.xml
share/gnome/help/clock/sr/figures/clock_applet.png
share/gnome/help/clock/sr/legal.xml
@@ -142,6 +146,14 @@ share/gnome/help/window-list/ko/figures/window_list_group.png
share/gnome/help/window-list/ko/figures/window_list_group_applet.png
share/gnome/help/window-list/ko/legal.xml
share/gnome/help/window-list/ko/window-list.xml
+share/gnome/help/window-list/pa/figures/window_list_applet.png
+share/gnome/help/window-list/pa/figures/window_list_group_applet.png
+share/gnome/help/window-list/pa/legal.xml
+share/gnome/help/window-list/pa/window-list.xml
+share/gnome/help/window-list/ru/figures/window_list_applet.png
+share/gnome/help/window-list/ru/figures/window_list_group_applet.png
+share/gnome/help/window-list/ru/legal.xml
+share/gnome/help/window-list/ru/window-list.xml
share/gnome/help/window-list/sv/figures/window_list_applet.png
share/gnome/help/window-list/sv/figures/window_list_group_applet.png
share/gnome/help/window-list/sv/legal.xml
@@ -185,6 +197,12 @@ share/gnome/help/workspace-switcher/ko/workspace-switcher.xml
share/gnome/help/workspace-switcher/nl/figures/workspace_switcher_applet.png
share/gnome/help/workspace-switcher/nl/legal.xml
share/gnome/help/workspace-switcher/nl/workspace-switcher.xml
+share/gnome/help/workspace-switcher/pa/figures/workspace_switcher_applet.png
+share/gnome/help/workspace-switcher/pa/legal.xml
+share/gnome/help/workspace-switcher/pa/workspace-switcher.xml
+share/gnome/help/workspace-switcher/ru/figures/workspace_switcher_applet.png
+share/gnome/help/workspace-switcher/ru/legal.xml
+share/gnome/help/workspace-switcher/ru/workspace-switcher.xml
share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
share/gnome/help/workspace-switcher/sv/legal.xml
share/gnome/help/workspace-switcher/sv/workspace-switcher.xml
@@ -209,6 +227,7 @@ share/gnome/omf/clock/clock-ja.omf
share/gnome/omf/clock/clock-ko.omf
share/gnome/omf/clock/clock-nl.omf
share/gnome/omf/clock/clock-pa.omf
+share/gnome/omf/clock/clock-ru.omf
share/gnome/omf/clock/clock-sr.omf
share/gnome/omf/clock/clock-sv.omf
share/gnome/omf/clock/clock-uk.omf
@@ -238,6 +257,8 @@ 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-pa.omf
+share/gnome/omf/window-list/window-list-ru.omf
share/gnome/omf/window-list/window-list-sv.omf
share/gnome/omf/window-list/window-list-uk.omf
share/gnome/omf/window-list/window-list-zh_CN.omf
@@ -246,6 +267,8 @@ 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-pa.omf
+share/gnome/omf/workspace-switcher/workspace-switcher-ru.omf
share/gnome/omf/workspace-switcher/workspace-switcher-sv.omf
share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf
share/gnome/panel/glade/fish.glade
@@ -265,6 +288,7 @@ share/icons/hicolor/16x16/apps/gnome-panel-clock.png
share/icons/hicolor/16x16/apps/gnome-panel-drawer.png
share/icons/hicolor/16x16/apps/gnome-panel-fish.png
share/icons/hicolor/16x16/apps/gnome-panel-force-quit.png
+share/icons/hicolor/16x16/apps/gnome-panel-launcher.png
share/icons/hicolor/16x16/apps/gnome-panel-notification-area.png
share/icons/hicolor/16x16/apps/gnome-panel-separator.png
share/icons/hicolor/16x16/apps/gnome-panel-window-list.png
@@ -275,6 +299,7 @@ share/icons/hicolor/22x22/apps/gnome-panel-clock.png
share/icons/hicolor/22x22/apps/gnome-panel-drawer.png
share/icons/hicolor/22x22/apps/gnome-panel-fish.png
share/icons/hicolor/22x22/apps/gnome-panel-force-quit.png
+share/icons/hicolor/22x22/apps/gnome-panel-launcher.png
share/icons/hicolor/22x22/apps/gnome-panel-notification-area.png
share/icons/hicolor/22x22/apps/gnome-panel-separator.png
share/icons/hicolor/22x22/apps/gnome-panel-window-list.png
@@ -285,6 +310,7 @@ share/icons/hicolor/24x24/apps/gnome-panel-clock.png
share/icons/hicolor/24x24/apps/gnome-panel-drawer.png
share/icons/hicolor/24x24/apps/gnome-panel-fish.png
share/icons/hicolor/24x24/apps/gnome-panel-force-quit.png
+share/icons/hicolor/24x24/apps/gnome-panel-launcher.png
share/icons/hicolor/24x24/apps/gnome-panel-notification-area.png
share/icons/hicolor/24x24/apps/gnome-panel-separator.png
share/icons/hicolor/24x24/apps/gnome-panel-window-list.png
@@ -295,6 +321,7 @@ share/icons/hicolor/32x32/apps/gnome-panel-clock.png
share/icons/hicolor/32x32/apps/gnome-panel-drawer.png
share/icons/hicolor/32x32/apps/gnome-panel-fish.png
share/icons/hicolor/32x32/apps/gnome-panel-force-quit.png
+share/icons/hicolor/32x32/apps/gnome-panel-launcher.png
share/icons/hicolor/32x32/apps/gnome-panel-notification-area.png
share/icons/hicolor/32x32/apps/gnome-panel-separator.png
share/icons/hicolor/32x32/apps/gnome-panel-window-list.png
@@ -305,6 +332,7 @@ share/icons/hicolor/scalable/apps/gnome-panel-clock.svg
share/icons/hicolor/scalable/apps/gnome-panel-drawer.svg
share/icons/hicolor/scalable/apps/gnome-panel-fish.svg
share/icons/hicolor/scalable/apps/gnome-panel-force-quit.svg
+share/icons/hicolor/scalable/apps/gnome-panel-launcher.svg
share/icons/hicolor/scalable/apps/gnome-panel-notification-area.svg
share/icons/hicolor/scalable/apps/gnome-panel-separator.svg
share/icons/hicolor/scalable/apps/gnome-panel-window-list.svg
@@ -411,6 +439,10 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/workspace-switcher/uk
@dirrm share/gnome/help/workspace-switcher/sv/figures
@dirrm share/gnome/help/workspace-switcher/sv
+@dirrm share/gnome/help/workspace-switcher/ru/figures
+@dirrm share/gnome/help/workspace-switcher/ru
+@dirrm share/gnome/help/workspace-switcher/pa/figures
+@dirrm share/gnome/help/workspace-switcher/pa
@dirrm share/gnome/help/workspace-switcher/nl/figures
@dirrm share/gnome/help/workspace-switcher/nl
@dirrm share/gnome/help/workspace-switcher/ko/figures
@@ -436,6 +468,10 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/window-list/uk
@dirrm share/gnome/help/window-list/sv/figures
@dirrm share/gnome/help/window-list/sv
+@dirrm share/gnome/help/window-list/ru/figures
+@dirrm share/gnome/help/window-list/ru
+@dirrm share/gnome/help/window-list/pa/figures
+@dirrm share/gnome/help/window-list/pa
@dirrm share/gnome/help/window-list/ko/figures
@dirrm share/gnome/help/window-list/ko
@dirrm share/gnome/help/window-list/ja/figures
@@ -485,6 +521,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/clock/sv
@dirrm share/gnome/help/clock/sr/figures
@dirrm share/gnome/help/clock/sr
+@dirrm share/gnome/help/clock/ru/figures
+@dirrm share/gnome/help/clock/ru
@dirrm share/gnome/help/clock/pa/figures
@dirrm share/gnome/help/clock/pa
@dirrm share/gnome/help/clock/nl/figures
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 2d68d71..8236953 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.58 2006/10/07 19:45:39 marcus Exp $
+# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.71 2007/03/12 21:25:30 marcus Exp $
#
PORTNAME= gnome-screensaver
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,7 +16,6 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME screen saver and locker
-LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
USE_BZIP2= yes
@@ -24,7 +23,8 @@ USE_XLIB= yes
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomemenus
+USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomemenus \
+ libgnomekbd
CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
--with-xscreensaverdir=${XSCREENSAVER_DIR} \
--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
@@ -43,10 +43,6 @@ OPTIONS= PAM "Pluggable Authentication Module support" off
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-BROKEN= Does not build on 4.X
-.endif
-
.if !defined(WITH_PAM)
CONFIGURE_ARGS+= --disable-pam
.endif
@@ -62,6 +58,7 @@ pre-install:
post-install:
${CHOWN} root ${PREFIX}/libexec/gnome-screensaver-dialog
${CHMOD} +s ${PREFIX}/libexec/gnome-screensaver-dialog
+ ${MKDIR} ${PREFIX}/${SCREENSAVER_DIR}
cd ${PREFIX}/${SCREENSAVER_DIR} && \
${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \
${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index 12ac659..ae7e934 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-screensaver-2.16.3.tar.bz2) = cbd3e3b96b24038c7838b89acae318dd
-SHA256 (gnome2/gnome-screensaver-2.16.3.tar.bz2) = c07bb2b7d9e32851fc119092ca604a7054ef88804f831daaf3122a02f38761c7
-SIZE (gnome2/gnome-screensaver-2.16.3.tar.bz2) = 2034974
+MD5 (gnome2/gnome-screensaver-2.18.0.tar.bz2) = c123d954b215d970dad117b15ca46cd7
+SHA256 (gnome2/gnome-screensaver-2.18.0.tar.bz2) = 7651a7c1205d2bc207ac6c317017b469efca9274b4ad4eb6ed739ea6293ce163
+SIZE (gnome2/gnome-screensaver-2.18.0.tar.bz2) = 2012668
diff --git a/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c b/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c
deleted file mode 100644
index 94d68b8..0000000
--- a/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gs-auth-pam.c.orig Mon Aug 14 19:57:29 2006
-+++ src/gs-auth-pam.c Mon Aug 14 20:07:43 2006
-@@ -204,7 +204,7 @@ pam_conversation (int
- if (res) {
- reply [replies].resp_retcode = PAM_SUCCESS;
- } else {
-- reply [replies].resp_retcode = PAM_INCOMPLETE;
-+ reply [replies].resp_retcode = PAM_TRY_AGAIN;
- }
- }
- }
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index 350da74..a60b97f 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -9,211 +9,10 @@ libexec/gnome-screensaver/floaters
libexec/gnome-screensaver/popsquares
libexec/gnome-screensaver/slideshow
share/gnome/applications/gnome-screensaver-preferences.desktop
-share/gnome/applications/screensavers/anemone.desktop
-share/gnome/applications/screensavers/anemotaxis.desktop
-share/gnome/applications/screensavers/antinspect.desktop
-share/gnome/applications/screensavers/antmaze.desktop
-share/gnome/applications/screensavers/antspotlight.desktop
-share/gnome/applications/screensavers/apollonian.desktop
-share/gnome/applications/screensavers/apple2.desktop
-share/gnome/applications/screensavers/atlantis.desktop
-share/gnome/applications/screensavers/attraction.desktop
-share/gnome/applications/screensavers/atunnel.desktop
-share/gnome/applications/screensavers/barcode.desktop
-share/gnome/applications/screensavers/blaster.desktop
-share/gnome/applications/screensavers/blinkbox.desktop
-share/gnome/applications/screensavers/blitspin.desktop
-share/gnome/applications/screensavers/blocktube.desktop
-share/gnome/applications/screensavers/boing.desktop
-share/gnome/applications/screensavers/bouboule.desktop
-share/gnome/applications/screensavers/bouncingcow.desktop
-share/gnome/applications/screensavers/boxed.desktop
-share/gnome/applications/screensavers/boxfit.desktop
-share/gnome/applications/screensavers/braid.desktop
-share/gnome/applications/screensavers/bsod.desktop
-share/gnome/applications/screensavers/bubble3d.desktop
-share/gnome/applications/screensavers/bubbles.desktop
-share/gnome/applications/screensavers/bumps.desktop
-share/gnome/applications/screensavers/cage.desktop
-share/gnome/applications/screensavers/carousel.desktop
-share/gnome/applications/screensavers/ccurve.desktop
-share/gnome/applications/screensavers/celtic.desktop
-share/gnome/applications/screensavers/circuit.desktop
-share/gnome/applications/screensavers/cloudlife.desktop
-share/gnome/applications/screensavers/compass.desktop
-share/gnome/applications/screensavers/coral.desktop
share/gnome/applications/screensavers/cosmos-slideshow.desktop
-share/gnome/applications/screensavers/crackberg.desktop
-share/gnome/applications/screensavers/critical.desktop
-share/gnome/applications/screensavers/crystal.desktop
-share/gnome/applications/screensavers/cube21.desktop
-share/gnome/applications/screensavers/cubenetic.desktop
-share/gnome/applications/screensavers/cubestorm.desktop
-share/gnome/applications/screensavers/cynosure.desktop
-share/gnome/applications/screensavers/dangerball.desktop
-share/gnome/applications/screensavers/decayscreen.desktop
-share/gnome/applications/screensavers/deco.desktop
-share/gnome/applications/screensavers/deluxe.desktop
-share/gnome/applications/screensavers/demon.desktop
-share/gnome/applications/screensavers/discrete.desktop
-share/gnome/applications/screensavers/distort.desktop
-share/gnome/applications/screensavers/drift.desktop
-share/gnome/applications/screensavers/endgame.desktop
-share/gnome/applications/screensavers/engine.desktop
-share/gnome/applications/screensavers/epicycle.desktop
-share/gnome/applications/screensavers/eruption.desktop
-share/gnome/applications/screensavers/euler2d.desktop
-share/gnome/applications/screensavers/extrusion.desktop
-share/gnome/applications/screensavers/fadeplot.desktop
-share/gnome/applications/screensavers/fiberlamp.desktop
-share/gnome/applications/screensavers/fireworkx.desktop
-share/gnome/applications/screensavers/flag.desktop
-share/gnome/applications/screensavers/flame.desktop
-share/gnome/applications/screensavers/flipflop.desktop
-share/gnome/applications/screensavers/flipscreen3d.desktop
-share/gnome/applications/screensavers/fliptext.desktop
-share/gnome/applications/screensavers/flow.desktop
-share/gnome/applications/screensavers/fluidballs.desktop
-share/gnome/applications/screensavers/flurry.desktop
-share/gnome/applications/screensavers/flyingtoasters.desktop
-share/gnome/applications/screensavers/fontglide.desktop
share/gnome/applications/screensavers/footlogo-floaters.desktop
-share/gnome/applications/screensavers/forest.desktop
-share/gnome/applications/screensavers/fuzzyflakes.desktop
-share/gnome/applications/screensavers/galaxy.desktop
-share/gnome/applications/screensavers/gears.desktop
-share/gnome/applications/screensavers/gflux.desktop
-share/gnome/applications/screensavers/glblur.desktop
-share/gnome/applications/screensavers/gleidescope.desktop
-share/gnome/applications/screensavers/glforestfire.desktop
-share/gnome/applications/screensavers/glhanoi.desktop
-share/gnome/applications/screensavers/glknots.desktop
-share/gnome/applications/screensavers/glmatrix.desktop
-share/gnome/applications/screensavers/glplanet.desktop
-share/gnome/applications/screensavers/glslideshow.desktop
-share/gnome/applications/screensavers/glsnake.desktop
-share/gnome/applications/screensavers/gltext.desktop
-share/gnome/applications/screensavers/goop.desktop
-share/gnome/applications/screensavers/grav.desktop
-share/gnome/applications/screensavers/greynetic.desktop
-share/gnome/applications/screensavers/halftone.desktop
-share/gnome/applications/screensavers/halo.desktop
-share/gnome/applications/screensavers/helix.desktop
-share/gnome/applications/screensavers/hopalong.desktop
-share/gnome/applications/screensavers/hyperball.desktop
-share/gnome/applications/screensavers/hypercube.desktop
-share/gnome/applications/screensavers/hypertorus.desktop
-share/gnome/applications/screensavers/ifs.desktop
-share/gnome/applications/screensavers/imsmap.desktop
-share/gnome/applications/screensavers/interaggregate.desktop
-share/gnome/applications/screensavers/interference.desktop
-share/gnome/applications/screensavers/intermomentary.desktop
-share/gnome/applications/screensavers/jigglypuff.desktop
-share/gnome/applications/screensavers/jigsaw.desktop
-share/gnome/applications/screensavers/juggle.desktop
-share/gnome/applications/screensavers/juggler3d.desktop
-share/gnome/applications/screensavers/julia.desktop
-share/gnome/applications/screensavers/kaleidescope.desktop
-share/gnome/applications/screensavers/klein.desktop
-share/gnome/applications/screensavers/kumppa.desktop
-share/gnome/applications/screensavers/lament.desktop
-share/gnome/applications/screensavers/laser.desktop
-share/gnome/applications/screensavers/lavalite.desktop
-share/gnome/applications/screensavers/lightning.desktop
-share/gnome/applications/screensavers/lisa.desktop
-share/gnome/applications/screensavers/lissie.desktop
-share/gnome/applications/screensavers/lmorph.desktop
-share/gnome/applications/screensavers/loop.desktop
-share/gnome/applications/screensavers/maze.desktop
-share/gnome/applications/screensavers/memscroller.desktop
-share/gnome/applications/screensavers/menger.desktop
-share/gnome/applications/screensavers/metaballs.desktop
-share/gnome/applications/screensavers/mirrorblob.desktop
-share/gnome/applications/screensavers/mismunch.desktop
-share/gnome/applications/screensavers/moebius.desktop
-share/gnome/applications/screensavers/moire.desktop
-share/gnome/applications/screensavers/moire2.desktop
-share/gnome/applications/screensavers/molecule.desktop
-share/gnome/applications/screensavers/morph3d.desktop
-share/gnome/applications/screensavers/mountain.desktop
-share/gnome/applications/screensavers/munch.desktop
-share/gnome/applications/screensavers/nerverot.desktop
-share/gnome/applications/screensavers/noof.desktop
-share/gnome/applications/screensavers/noseguy.desktop
-share/gnome/applications/screensavers/pacman.desktop
-share/gnome/applications/screensavers/pedal.desktop
-share/gnome/applications/screensavers/penetrate.desktop
-share/gnome/applications/screensavers/penrose.desktop
share/gnome/applications/screensavers/personal-slideshow.desktop
-share/gnome/applications/screensavers/petri.desktop
-share/gnome/applications/screensavers/phosphor.desktop
-share/gnome/applications/screensavers/piecewise.desktop
-share/gnome/applications/screensavers/pinion.desktop
-share/gnome/applications/screensavers/pipes.desktop
-share/gnome/applications/screensavers/polyhedra.desktop
-share/gnome/applications/screensavers/polyominoes.desktop
-share/gnome/applications/screensavers/polytopes.desktop
-share/gnome/applications/screensavers/pong.desktop
share/gnome/applications/screensavers/popsquares.desktop
-share/gnome/applications/screensavers/providence.desktop
-share/gnome/applications/screensavers/pulsar.desktop
-share/gnome/applications/screensavers/pyro.desktop
-share/gnome/applications/screensavers/qix.desktop
-share/gnome/applications/screensavers/queens.desktop
-share/gnome/applications/screensavers/rd-bomb.desktop
-share/gnome/applications/screensavers/ripples.desktop
-share/gnome/applications/screensavers/rocks.desktop
-share/gnome/applications/screensavers/rorschach.desktop
-share/gnome/applications/screensavers/rotor.desktop
-share/gnome/applications/screensavers/rotzoomer.desktop
-share/gnome/applications/screensavers/rubik.desktop
-share/gnome/applications/screensavers/sballs.desktop
-share/gnome/applications/screensavers/shadebobs.desktop
-share/gnome/applications/screensavers/sierpinski.desktop
-share/gnome/applications/screensavers/sierpinski3d.desktop
-share/gnome/applications/screensavers/slidescreen.desktop
-share/gnome/applications/screensavers/slip.desktop
-share/gnome/applications/screensavers/sonar.desktop
-share/gnome/applications/screensavers/speedmine.desktop
-share/gnome/applications/screensavers/sphere.desktop
-share/gnome/applications/screensavers/spheremonics.desktop
-share/gnome/applications/screensavers/spiral.desktop
-share/gnome/applications/screensavers/spotlight.desktop
-share/gnome/applications/screensavers/sproingies.desktop
-share/gnome/applications/screensavers/squiral.desktop
-share/gnome/applications/screensavers/stairs.desktop
-share/gnome/applications/screensavers/starfish.desktop
-share/gnome/applications/screensavers/starwars.desktop
-share/gnome/applications/screensavers/stonerview.desktop
-share/gnome/applications/screensavers/strange.desktop
-share/gnome/applications/screensavers/substrate.desktop
-share/gnome/applications/screensavers/superquadrics.desktop
-share/gnome/applications/screensavers/swirl.desktop
-share/gnome/applications/screensavers/t3d.desktop
-share/gnome/applications/screensavers/tangram.desktop
-share/gnome/applications/screensavers/thornbird.desktop
-share/gnome/applications/screensavers/timetunnel.desktop
-share/gnome/applications/screensavers/triangle.desktop
-share/gnome/applications/screensavers/truchet.desktop
-share/gnome/applications/screensavers/twang.desktop
-share/gnome/applications/screensavers/vermiculate.desktop
-share/gnome/applications/screensavers/vidwhacker.desktop
-share/gnome/applications/screensavers/vines.desktop
-share/gnome/applications/screensavers/wander.desktop
-share/gnome/applications/screensavers/webcollage.desktop
-share/gnome/applications/screensavers/whirlwindwarp.desktop
-share/gnome/applications/screensavers/whirlygig.desktop
-share/gnome/applications/screensavers/worm.desktop
-share/gnome/applications/screensavers/wormhole.desktop
-share/gnome/applications/screensavers/xanalogtv.desktop
-share/gnome/applications/screensavers/xflame.desktop
-share/gnome/applications/screensavers/xjack.desktop
-share/gnome/applications/screensavers/xlyap.desktop
-share/gnome/applications/screensavers/xmatrix.desktop
-share/gnome/applications/screensavers/xrayswarm.desktop
-share/gnome/applications/screensavers/xspirograph.desktop
-share/gnome/applications/screensavers/xteevee.desktop
-share/gnome/applications/screensavers/zoom.desktop
share/gnome/desktop-directories/gnome-screensaver.directory
share/gnome/gnome-screensaver/gnome-screensaver-preferences.glade
share/gnome/gnome-screensaver/lock-dialog-default.glade
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 0aecfac..de1faae 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,17 +3,16 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-session/Makefile,v 1.96 2006/10/07 19:45:39 marcus Exp $
+# $MCom: ports/x11/gnome-session/Makefile,v 1.110 2007/03/18 20:55:55 marcus Exp $
#
PORTNAME= gnome-session
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0
+PORTREVISION= 3
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/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
- adamw/:local
+ http://www.marcuscom.com/downloads/:local
+MASTER_SITE_SUBDIR= sources/gnome-session/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${SPLASHES}:local
DIST_SUBDIR= gnome2
@@ -27,6 +26,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
+INSTALLS_ICONS= yes
USE_GETTEXT= yes
USE_BZIP2= yes
USE_XLIB= yes
@@ -34,6 +34,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --mandir=${PREFIX}/man
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
@@ -42,18 +43,18 @@ MAN1= gnome-session.1 gnome-wm.1 session-properties.1 \
MAN5= default.session.5
GCONF_SCHEMAS= gnome-session.schemas
-SPLASHES= freebsd-splashes-gnome-2.12.1.tar
+SPLASHES= freebsd-splashes-gnome-2.18_1.tar
post-extract:
cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES}
post-install:
- ${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \
+ ${INSTALL_DATA} ${WRKSRC}/data/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/${splash} \
+.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png franz-splash_218.png adamw-bat-2.18.jpg adamw-conky-2.18.png adamw-cow-2.18.png adamw-mouth-2.18.png adamw-swing-2.18.png
+ ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.18/${splash} \
${PREFIX}/share/gnome/pixmaps/splash
.endfor
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index b6f8d04..b4bcd8e 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.16.3.tar.bz2) = d35a7f541adecc112b7c73f95353a183
-SHA256 (gnome2/gnome-session-2.16.3.tar.bz2) = 00135b65275f17343bcfc25f37249d3f6449a3c9243f60b4cd4e3d6b4505b142
-SIZE (gnome2/gnome-session-2.16.3.tar.bz2) = 683140
-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
+MD5 (gnome2/gnome-session-2.18.0.tar.bz2) = 830dbabe74474da49018889d27eefaae
+SHA256 (gnome2/gnome-session-2.18.0.tar.bz2) = 4a1ce73fedcfae94673eeef2655937ff6c9ebc2f52ba817466659d2b583df330
+SIZE (gnome2/gnome-session-2.18.0.tar.bz2) = 707392
+MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5
+SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508
+SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720
diff --git a/x11/gnome-session/files/patch-data_Makefile.in b/x11/gnome-session/files/patch-data_Makefile.in
new file mode 100644
index 0000000..17d12d3
--- /dev/null
+++ b/x11/gnome-session/files/patch-data_Makefile.in
@@ -0,0 +1,20 @@
+--- data/Makefile.in.orig Sun Jan 28 20:39:50 2007
++++ data/Makefile.in Sun Jan 28 20:41:03 2007
+@@ -253,7 +253,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = icons
+-defaultdir = $(datadir)/gnome
++defaultdir = $(datadir)
+ default_in_files = default.session.in
+ default_DATA = $(default_in_files:.session.in=.session)
+ settingsdir = $(datadir)/applications
+@@ -271,7 +271,7 @@ EXTRA_DIST = \
+ session-properties.desktop.in
+
+ CLEANFILES = default.session gnome-session.schemas session-properties.desktop
+-all: all-recursive
++all: all-recursive default.session
+
+ .SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
diff --git a/x11/gnome-session/files/patch-dbus b/x11/gnome-session/files/patch-dbus
deleted file mode 100644
index e798216..0000000
--- a/x11/gnome-session/files/patch-dbus
+++ /dev/null
@@ -1,429 +0,0 @@
---- 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);
-+}
---- gnome-session/main.c.orig Wed Jul 26 08:46:36 2006
-+++ gnome-session/main.c Mon Aug 7 21:17:49 2006
-@@ -43,6 +43,7 @@
- #include "command.h"
- #include "splash-widget.h"
- #include "util.h"
-+#include "gsm-dbus.h"
- #include "gsm-sound.h"
- #include "gsm-gsd.h"
- #include "gsm-keyring.h"
-@@ -329,6 +330,7 @@
- Session *the_session;
- gboolean splashing;
- gboolean a_t_support;
-+ gboolean dbus_daemon_owner;
- GError *err;
- int status;
- char *display_str;
-@@ -419,6 +421,7 @@
- fprintf (stderr, "SESSION_MANAGER=%s\n", getenv ("SESSION_MANAGER"));
- gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-session.png");
-
-+ dbus_daemon_owner = gsm_dbus_daemon_start ();
-
- /* Make sure children see the right value for DISPLAY. This is
- useful if --display was specified on the command line. */
-@@ -502,6 +505,9 @@
- gsm_sound_logout ();
-
- gsm_keyring_daemon_stop ();
-+
-+ if (dbus_daemon_owner)
-+ gsm_dbus_daemon_stop ();
-
- g_object_unref (gconf_client);
- gsm_shutdown_gconfd ();
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
index a80f576..b07ad02 100644
--- a/x11/gnome-session/files/patch-gnome-session_Makefile.in
+++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in
@@ -1,14 +1,5 @@
--- 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@
@@ -18,20 +9,3 @@
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-dbus.c b/x11/gnome-session/files/patch-gnome-session_gsm-dbus.c
new file mode 100644
index 0000000..76de78b
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_gsm-dbus.c
@@ -0,0 +1,35 @@
+--- gnome-session/gsm-dbus.c.orig Mon Jan 8 17:32:28 2007
++++ gnome-session/gsm-dbus.c Thu Jan 11 13:17:41 2007
+@@ -281,6 +281,7 @@ start_parent (int address_fd, int pid_fd
+ int exitstat;
+ unsigned long tmp_num;
+ ssize_t bytes;
++ int i;
+
+ g_assert (child > 0);
+
+@@ -326,14 +327,17 @@ start_parent (int address_fd, int pid_fd
+ /*
+ * Fetch dbus-daemon pid.
+ */
+- bytes = read_line (pid_fd, pid_str, sizeof (pid_str));
+- if (bytes == -1 || bytes == 0)
++ for (i = 0; i < 2; i++)
+ {
+- close (address_fd);
+- close (pid_fd);
+-
+- g_printerr ("Failed to get dbus-daemon's pid\n");
+- return;
++ 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);
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 71e9b30..14d40f3 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -5,7 +5,6 @@ bin/gnome-session-save
bin/gnome-wm
share/gnome/applications/session-properties.desktop
share/gnome/default.session
-share/gnome/default.wm
share/gnome/pixmaps/splash/MaMBaNgGaoX-2.12.png
share/gnome/pixmaps/splash/adamw-piggy-2.12.png
share/gnome/pixmaps/splash/adamw-trophy-2.12.png
@@ -13,6 +12,7 @@ share/gnome/pixmaps/splash/andreas-slogan-2.12.png
share/gnome/pixmaps/splash/andreas-splash-2.12.png
share/gnome/pixmaps/splash/domix-splash-2.12.png
share/gnome/pixmaps/splash/domix-splash2-2.12.png
+share/gnome/pixmaps/splash/franz-splash_218.png
share/gnome/pixmaps/splash/gnome-splash.png
share/gnome/pixmaps/splash/mumija-2.12.png
share/gnome/pixmaps/splash/mumija2-2.12.png
@@ -21,6 +21,11 @@ share/gnome/pixmaps/splash/original-gnome-splash.png
share/gnome/pixmaps/splash/tremulant-2.12.png
share/gnome/pixmaps/splash/tremulant-blood-2.12.png
share/gnome/pixmaps/splash/tremulant-brushed-metal-2.12.png
+share/icons/hicolor/16x16/apps/session-properties.png
+share/icons/hicolor/22x22/apps/session-properties.png
+share/icons/hicolor/24x24/apps/session-properties.png
+share/icons/hicolor/32x32/apps/session-properties.png
+share/icons/hicolor/scalable/apps/session-properties.svg
share/locale/af/LC_MESSAGES/gnome-session-2.0.mo
share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 4d4ef11..d2ffb54 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-terminal/Makefile,v 1.81 2006/10/03 10:31:27 ahze Exp $
+# $MCom: ports/x11/gnome-terminal/Makefile,v 1.86 2007/03/13 00:46:19 mezz Exp $
#
PORTNAME= gnome-terminal
-PORTVERSION= 2.16.1
-PORTREVISION= 1
+PORTVERSION= 2.18.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 8338f72..e260d03 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-terminal-2.16.1.tar.bz2) = 861e1b780819214b4d5a398e7999c093
-SHA256 (gnome2/gnome-terminal-2.16.1.tar.bz2) = 814ab099689aabdc6351565215ce6e5a2fc93e8b05fafd3ca70f4cefe167caf0
-SIZE (gnome2/gnome-terminal-2.16.1.tar.bz2) = 1840537
+MD5 (gnome2/gnome-terminal-2.18.0.tar.bz2) = 15ba4f3a9851d63d8c06b8f67210dde9
+SHA256 (gnome2/gnome-terminal-2.18.0.tar.bz2) = 75414d332003d19b003a47c0e93f3983a5586f1bb28dceec350cdcd7d3450834
+SIZE (gnome2/gnome-terminal-2.18.0.tar.bz2) = 1906547
diff --git a/x11/gnome-terminal/files/patch-src_terminal-window.c b/x11/gnome-terminal/files/patch-src_terminal-window.c
deleted file mode 100644
index 8052c81..0000000
--- a/x11/gnome-terminal/files/patch-src_terminal-window.c
+++ /dev/null
@@ -1,276 +0,0 @@
---- src/terminal-window.c.orig Fri Sep 1 01:34:03 2006
-+++ src/terminal-window.c Wed Oct 18 15:32:15 2006
-@@ -157,6 +157,9 @@
- const char *dir);
- static void new_window_callback (GtkWidget *menuitem,
- TerminalWindow *window);
-+static void size_request_callback (GtkWidget *widget,
-+ GtkRequisition *requisition,
-+ TerminalWindow *window);
- static void new_tab_callback (GtkWidget *menuitem,
- TerminalWindow *window);
- static gboolean key_press_callback (GtkWidget *widget,
-@@ -237,6 +240,8 @@
-
- static void terminal_window_show (GtkWidget *widget);
-
-+static void update_geometry (TerminalWindow *window);
-+
- static gboolean confirm_close_window (TerminalWindow *window);
-
- static gpointer parent_class;
-@@ -871,7 +876,12 @@
- gtk_box_pack_end (GTK_BOX (window->priv->main_vbox),
- window->priv->notebook,
- TRUE, TRUE, 0);
--
-+
-+ g_signal_connect (G_OBJECT (window->priv->main_vbox),
-+ "size_request",
-+ G_CALLBACK (size_request_callback),
-+ window);
-+
- mi = append_menuitem (window->priv->menubar,
- "", NULL,
- NULL, NULL);
-@@ -1506,14 +1516,6 @@
- gtk_widget_hide (window->priv->menubar);
- }
- reset_menubar_labels (window);
--
-- if (window->priv->active_term)
-- {
--#ifdef DEBUG_GEOMETRY
-- g_fprintf (stderr,"setting size after toggling menubar visibility\n");
--#endif
-- terminal_window_set_size (window, window->priv->active_term, TRUE);
-- }
- }
-
- gboolean
-@@ -1531,98 +1533,21 @@
- }
-
- void
--terminal_window_set_size (TerminalWindow *window,
-- TerminalScreen *screen,
-- gboolean even_if_mapped)
--{
-- terminal_window_set_size_force_grid (window, screen, even_if_mapped, -1, -1);
--}
--
--void
--terminal_window_set_size_force_grid (TerminalWindow *window,
-- TerminalScreen *screen,
-- gboolean even_if_mapped,
-- int force_grid_width,
-- int force_grid_height)
--{
-- /* Owen's hack from gnome-terminal */
-- GtkWidget *widget;
-- GtkWidget *app;
-- GtkRequisition toplevel_request;
-- GtkRequisition widget_request;
-- int w, h;
-- int char_width;
-- int char_height;
-- int grid_width;
-- int grid_height;
-- int xpad;
-- int ypad;
--
-- /* be sure our geometry is up-to-date */
-- terminal_window_update_geometry (window);
-- widget = terminal_screen_get_widget (screen);
--
-- app = gtk_widget_get_toplevel (widget);
-- g_assert (app != NULL);
--
-- gtk_widget_size_request (app, &toplevel_request);
-- gtk_widget_size_request (widget, &widget_request);
--
--#ifdef DEBUG_GEOMETRY
-- g_fprintf (stderr,"set size: toplevel %dx%d widget %dx%d\n",
-- toplevel_request.width, toplevel_request.height,
-- widget_request.width, widget_request.height);
--#endif
--
-- w = toplevel_request.width - widget_request.width;
-- h = toplevel_request.height - widget_request.height;
--
-- terminal_widget_get_cell_size (widget, &char_width, &char_height);
-- terminal_widget_get_size (widget, &grid_width, &grid_height);
--
-- if (force_grid_width >= 0)
-- grid_width = force_grid_width;
-- if (force_grid_height >= 0)
-- grid_height = force_grid_height;
--
-- terminal_widget_get_padding (widget, &xpad, &ypad);
--
-- w += xpad + char_width * grid_width;
-- h += ypad + char_height * grid_height;
--
--#ifdef DEBUG_GEOMETRY
-- g_fprintf (stderr,"set size: grid %dx%d force %dx%d setting %dx%d pixels\n",
-- grid_width, grid_height, force_grid_width, force_grid_height, w, h);
--#endif
--
-- if (even_if_mapped && GTK_WIDGET_MAPPED (app)) {
-- gtk_window_resize (GTK_WINDOW (app), w, h);
-- }
-- else {
-- gtk_window_set_default_size (GTK_WINDOW (app), w, h);
-- }
--}
--
--void
- terminal_window_set_active (TerminalWindow *window,
- TerminalScreen *screen)
- {
-- GtkWidget *widget;
- TerminalProfile *profile;
-+ GtkWidget *old_widget, *new_widget;
-
- if (window->priv->active_term == screen)
- return;
-
-- widget = terminal_screen_get_widget (screen);
--
- profile = terminal_screen_get_profile (screen);
-
-- if (!GTK_WIDGET_REALIZED (widget))
-- gtk_widget_realize (widget); /* we need this for the char width */
--
-+ old_widget = terminal_screen_get_widget (window->priv->active_term);
- window->priv->active_term = screen;
-+ new_widget = terminal_screen_get_widget (window->priv->active_term);
-
-- terminal_window_update_geometry (window);
- terminal_window_update_icon (window);
-
- /* Override menubar setting if it wasn't restored from session */
-@@ -1641,11 +1566,13 @@
- gtk_notebook_page_num (GTK_NOTEBOOK (window->priv->notebook),
- GTK_WIDGET (screen)));
-
-- /* set size of window to current grid size */
--#ifdef DEBUG_GEOMETRY
-- g_fprintf (stderr,"setting size after flipping notebook pages\n");
--#endif
-- terminal_window_set_size (window, screen, TRUE);
-+ /* Make sure that the widget is no longer hidden due to the workaround */
-+ gtk_widget_show (new_widget);
-+ /* Workaround to remove gtknotebook's feature of computing its size based on
-+ * all pages. When the widget is hidden, its size will not be taken into
-+ * account.
-+ */
-+ if (old_widget != NULL) gtk_widget_hide (old_widget);
-
- update_copy_sensitivity (window);
-
-@@ -1704,18 +1631,12 @@
- GtkWidget* page_widget;
- TerminalScreen *screen;
- GtkWidget *menu_item;
-- int old_grid_width, old_grid_height;
-- GtkWidget *old_widget;
--
-- old_widget = NULL;
-- old_grid_width = -1;
-- old_grid_height = -1;
-+ GtkWidget *old_widget, *new_widget;
-
- if (window->priv->active_term == NULL)
- return;
-
- old_widget = terminal_screen_get_widget (window->priv->active_term);
-- terminal_widget_get_size (old_widget, &old_grid_width, &old_grid_height);
-
- page_widget = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook),
- page_num);
-@@ -1725,17 +1646,19 @@
- screen = TERMINAL_SCREEN (page_widget);
-
- g_assert (screen);
--
-+
- terminal_window_set_active (window, screen);
--
-- /* This is so we maintain the same grid moving among tabs with
-- * different fonts.
-- */
--#ifdef DEBUG_GEOMETRY
-- g_fprintf (stderr,"setting size in switch_page handler\n");
--#endif
-- terminal_window_set_size_force_grid (window, screen, TRUE, old_grid_width, old_grid_height);
-
-+ new_widget = terminal_screen_get_widget (screen);
-+
-+ if (old_widget != new_widget) {
-+ int old_grid_width, old_grid_height;
-+ /* This is so that we maintain the same grid */
-+ terminal_widget_get_size (old_widget, &old_grid_width, &old_grid_height);
-+ terminal_widget_set_size (new_widget, old_grid_width, old_grid_height);
-+ gtk_widget_queue_resize_no_redraw (new_widget);
-+ }
-+
- update_tab_sensitivity (window);
-
- menu_item = screen_get_menuitem (screen);
-@@ -1836,7 +1759,6 @@
- TerminalScreen *screen,
- TerminalWindow *window)
- {
-- gboolean single;
- /* Called from terminal_notebook_move_tab() */
- if (find_screen (window, screen) != NULL) {
- g_assert (terminal_screen_get_window (screen) == window);
-@@ -1868,11 +1790,6 @@
- reset_tab_menuitems (window);
- update_tab_sensitivity (window);
-
-- /* The tab bar may have disappeared */
-- single = g_list_length (window->priv->terms) == 1;
-- if (single)
-- terminal_window_set_size (window, window->priv->active_term, TRUE);
--
- /* Close window if no more terminals */
- if (window->priv->terms == NULL)
- gtk_widget_destroy (GTK_WIDGET (window));
-@@ -1921,7 +1838,7 @@
- }
-
- void
--terminal_window_update_geometry (TerminalWindow *window)
-+update_geometry (TerminalWindow *window)
- {
- GdkGeometry hints;
- GtkWidget *widget;
-@@ -2264,6 +2181,26 @@
- NULL, name, -1);
-
- g_free (geometry);
-+}
-+
-+static void
-+size_request_callback (GtkWidget *widget,
-+ GtkRequisition *requisition,
-+ TerminalWindow *window)
-+{
-+ if (!window->priv->active_term)
-+ return;
-+
-+#ifdef DEBUG_GEOMETRY
-+ g_fprintf (stderr, "vbox size-request callback with size %dx%d\n",
-+ requisition->width, requisition->height);
-+#endif
-+
-+ if (GTK_WIDGET_MAPPED (window)) {
-+ gtk_window_resize (GTK_WINDOW (window), requisition->width,
-+ requisition->height);
-+ }
-+ update_geometry (window);
- }
-
- static void
diff --git a/x11/gnome-terminal/files/patch-src_terminal-window.h b/x11/gnome-terminal/files/patch-src_terminal-window.h
deleted file mode 100644
index f62e9f6..0000000
--- a/x11/gnome-terminal/files/patch-src_terminal-window.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/terminal-window.h.orig Mon Jul 10 20:32:21 2006
-+++ src/terminal-window.h Wed Oct 18 15:32:15 2006
-@@ -77,15 +77,6 @@
- int terminal_window_get_screen_count (TerminalWindow *window);
-
- void terminal_window_update_icon (TerminalWindow *window);
--void terminal_window_update_geometry (TerminalWindow *window);
--void terminal_window_set_size (TerminalWindow *window,
-- TerminalScreen *screen,
-- gboolean even_if_mapped);
--void terminal_window_set_size_force_grid (TerminalWindow *window,
-- TerminalScreen *screen,
-- gboolean even_if_mapped,
-- int force_grid_width,
-- int force_grid_height);
-
- void terminal_window_set_fullscreen (TerminalWindow *window,
- gboolean setting);
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index efd1e99..30f3fb1 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -4,7 +4,6 @@ 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
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
@@ -19,18 +18,13 @@ share/gnome/help/gnome-terminal/de/gnome-terminal.xml
share/gnome/help/gnome-terminal/de/legal.xml
share/gnome/help/gnome-terminal/es/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/es/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/es/figures/terminal_window.png
share/gnome/help/gnome-terminal/es/gnome-terminal.xml
-share/gnome/help/gnome-terminal/es/legal.xml
share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/fr/figures/terminal_window.png
share/gnome/help/gnome-terminal/fr/gnome-terminal.xml
share/gnome/help/gnome-terminal/it/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/it/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/it/figures/terminal_window.png
share/gnome/help/gnome-terminal/it/gnome-terminal.xml
-share/gnome/help/gnome-terminal/it/legal.xml
share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/ja/figures/terminal_window.png
@@ -48,12 +42,10 @@ share/gnome/help/gnome-terminal/ro/gnome-terminal.xml
share/gnome/help/gnome-terminal/ro/legal.xml
share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/sv/figures/terminal_window.png
share/gnome/help/gnome-terminal/sv/gnome-terminal.xml
share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/uk/gnome-terminal.xml
-share/gnome/help/gnome-terminal/uk/legal.xml
share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/zh_CN/figures/terminal_window.png
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index dd7c0e4..eedff80 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.79 2006/07/19 06:00:46 ahze Exp $
+# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.81 2007/03/14 21:39:30 marcus Exp $
#
PORTREVISION= 0
@@ -21,7 +21,6 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan \
${LOCALBASE}/lib/gaim/docklet.so:${PORTSDIR}/net-im/gaim \
tsclient:${PORTSDIR}/net/tsclient \
galeon:${PORTSDIR}/www/galeon \
- seahorse:${PORTSDIR}/security/seahorse \
${LOCALBASE}/share/gnome/themes/Gorilla/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/gnome-themes-extras \
bluefish:${PORTSDIR}/www/bluefish \
gossip:${PORTSDIR}/net-im/gossip \
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 2ecbf0e..c30e821 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.50 2006/10/14 06:34:16 marcus Exp $
+# $MCom: ports/x11/gnome2-lite/Makefile,v 1.54 2007/03/02 15:38:59 ahze Exp $
#
PORTREVISION= 0
@@ -32,7 +32,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applet
gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
- totem:${PORTSDIR}/multimedia/totem-gstreamer
+ totem:${PORTSDIR}/multimedia/totem
MASTERDIR= ${.CURDIR}/../gnome2
CONFLICTS= gnome2-[0-9]*
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index 355346c..3572e83 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.73 2006/10/08 03:46:18 mezz Exp $
+# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.76 2007/03/14 21:39:31 marcus Exp $
#
PORTREVISION= 0
@@ -12,7 +12,7 @@ PKGNAMESUFFIX= -power-tools
COMMENT= The 'Geektoys' for the GNOME 2 power user
-RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.16/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
+RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.18/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \
${LOCALBASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \
${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 8f950c0..96d9406 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.182 2006/10/14 06:34:16 marcus Exp $
+# $MCom: ports/x11/gnome2/Makefile,v 1.201 2007/03/14 21:39:30 marcus Exp $
#
PORTNAME= gnome2
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0
PORTREVISION?= 0
CATEGORIES?= x11 gnome
MASTER_SITES= # empty
@@ -43,15 +43,15 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
${LOCALBASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \
dasher:${PORTSDIR}/accessibility/dasher \
- evolution-2.8:${PORTSDIR}/mail/evolution \
+ evolution-2.10:${PORTSDIR}/mail/evolution \
${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \
network-admin:${PORTSDIR}/sysutils/gnome-system-tools \
gnome-nettool:${PORTSDIR}/net/gnome-nettool \
vino-session:${PORTSDIR}/net/vino \
- exchange-connector-setup-2.8:${PORTSDIR}/mail/evolution-exchange \
+ exchange-connector-setup-2.10:${PORTSDIR}/mail/evolution-exchange \
${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
${LOCALBASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
- totem:${PORTSDIR}/multimedia/totem-gstreamer \
+ totem:${PORTSDIR}/multimedia/totem \
gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
${LOCALBASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
sound-juicer:${PORTSDIR}/audio/sound-juicer \
@@ -65,8 +65,8 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
gnome-volume-manager:${PORTSDIR}/sysutils/gnome-volume-manager \
orca:${PORTSDIR}/accessibility/orca \
gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
- ekiga:${PORTSDIR}/net/ekiga \
- ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
+ ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon \
+ seahorse:${PORTSDIR}/security/seahorse
NO_BUILD= yes
@@ -88,9 +88,12 @@ RUN_DEPENDS+= yelp:${PORTSDIR}/x11/yelp \
epiphany:${PORTSDIR}/www/epiphany
.endif
.if ${.CURDIR:T}!="gnome2-lite"
-.if ${ARCH} == "i386"
+.if ${ARCH} == "i386" || ${ARCH} == "amd64"
RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy
.endif
+.if ${OSVERSION}>=600000
+RUN_DEPENDS+= ekiga:${PORTSDIR}/net/ekiga
+.endif
.endif
.endif
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 9f75d13..663e96d 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,11 +3,11 @@
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnome/Makefile,v 1.86 2006/09/04 18:09:21 marcus Exp $
+# $MCom: ports/x11/libgnome/Makefile,v 1.100 2007/03/12 15:49:09 ahze Exp $
#
PORTNAME= libgnome
-PORTVERSION= 2.16.0
+PORTVERSION= 2.18.0
PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -52,7 +52,9 @@ GCONF_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas \
desktop_gnome_peripherals_keyboard.schemas \
desktop_gnome_peripherals_mouse.schemas \
desktop_gnome_sound.schemas desktop_gnome_thumbnailers.schemas \
- desktop_gnome_typing_break.schemas
+ desktop_gnome_typing_break.schemas \
+ desktop_gnome_applications_at_mobility.schemas \
+ desktop_gnome_applications_at_visual.schemas
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index b1d8dd0..c9dc30c 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnome-2.16.0.tar.bz2) = b3f030f6c677b0e1bcfca7c7e58d6c4a
-SHA256 (gnome2/libgnome-2.16.0.tar.bz2) = 78a2d66bea1d856f06fbd3348abceded8975f09c767a17f58e1d9cd8011ab710
-SIZE (gnome2/libgnome-2.16.0.tar.bz2) = 1011194
+MD5 (gnome2/libgnome-2.18.0.tar.bz2) = 73426589d7c6fa3266fe4e8f3be2f5b5
+SHA256 (gnome2/libgnome-2.18.0.tar.bz2) = 53e3b241343c7ea9c4a8db4ca898fd7020c281f1400826d899b841d760dd5ba9
+SIZE (gnome2/libgnome-2.18.0.tar.bz2) = 1082802
diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in
index c1cc375..3cfaf60 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.7 2006/07/23 17:22:34 mezz Exp $
+# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.10 2007/02/16 18:14:27 mezz Exp $
#
# Restore gconf keys of gnomevfs2.
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 246d332..bfd82da 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -38,9 +38,11 @@ share/locale/cs/LC_MESSAGES/libgnome-2.0.mo
share/locale/cy/LC_MESSAGES/libgnome-2.0.mo
share/locale/da/LC_MESSAGES/libgnome-2.0.mo
share/locale/de/LC_MESSAGES/libgnome-2.0.mo
+share/locale/dz/LC_MESSAGES/libgnome-2.0.mo
share/locale/el/LC_MESSAGES/libgnome-2.0.mo
share/locale/en_CA/LC_MESSAGES/libgnome-2.0.mo
share/locale/en_GB/LC_MESSAGES/libgnome-2.0.mo
+share/locale/eo/LC_MESSAGES/libgnome-2.0.mo
share/locale/es/LC_MESSAGES/libgnome-2.0.mo
share/locale/et/LC_MESSAGES/libgnome-2.0.mo
share/locale/eu/LC_MESSAGES/libgnome-2.0.mo
@@ -144,6 +146,8 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrmtry share/locale/fi
@dirrmtry share/locale/el/LC_MESSAGES
@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
new file mode 100644
index 0000000..db661e4
--- /dev/null
+++ b/x11/libgnomekbd/Makefile
@@ -0,0 +1,33 @@
+# New ports collection makefile for: libgnomekbd
+# Date created: 2006-11-07
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11/libgnomekbd/Makefile,v 1.5 2007/03/12 01:37:17 mezz Exp $
+#
+
+PORTNAME= libgnomekbd
+PORTVERSION= 2.18.0
+CATEGORIES= x11 gnome
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME keyboard shared library
+
+LIB_DEPENDS= xklavier.11:${PORTSDIR}/x11/libxklavier \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+
+USE_BZIP2= yes
+USE_GNOME= libgnomeui gnometarget gnomeprefix gnomehack
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
+USE_GETTEXT= yes
+USE_LDCONFIG= yes
+USE_GMAKE= yes
+
+GCONF_SCHEMAS= desktop_gnome_peripherals_keyboard_xkb.schemas
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+.include <bsd.port.mk>
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
new file mode 100644
index 0000000..378f82c
--- /dev/null
+++ b/x11/libgnomekbd/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/libgnomekbd-2.18.0.tar.bz2) = f176e026158f678144511fb343ec7269
+SHA256 (gnome2/libgnomekbd-2.18.0.tar.bz2) = a5f6c32671c8b4870e407d16f1c709564d486cf9ac7617163430d7a7f7af331e
+SIZE (gnome2/libgnomekbd-2.18.0.tar.bz2) = 332463
diff --git a/x11/libgnomekbd/pkg-descr b/x11/libgnomekbd/pkg-descr
new file mode 100644
index 0000000..a4b625c
--- /dev/null
+++ b/x11/libgnomekbd/pkg-descr
@@ -0,0 +1 @@
+GNOME keyboard shared library
diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist
new file mode 100644
index 0000000..f4ca7d9
--- /dev/null
+++ b/x11/libgnomekbd/pkg-plist
@@ -0,0 +1,30 @@
+bin/gkbd-indicator-plugins-capplet
+include/libgnomekbd/gkbd-config-registry-client.h
+include/libgnomekbd/gkbd-config-registry.h
+include/libgnomekbd/gkbd-desktop-config.h
+include/libgnomekbd/gkbd-indicator-config.h
+include/libgnomekbd/gkbd-indicator-plugin.h
+include/libgnomekbd/gkbd-indicator.h
+include/libgnomekbd/gkbd-keyboard-config.h
+include/libgnomekbd/gkbd-keyboard-drawing.h
+include/libgnomekbd/gkbd-util.h
+lib/libgnomekbd.a
+lib/libgnomekbd.la
+lib/libgnomekbd.so
+lib/libgnomekbd.so.1
+lib/libgnomekbdui.a
+lib/libgnomekbdui.la
+lib/libgnomekbdui.so
+lib/libgnomekbdui.so.1
+libdata/pkgconfig/libgnomekbd.pc
+libdata/pkgconfig/libgnomekbdui.pc
+share/gnome/applications/gkbd-indicator-plugins-capplet.desktop
+share/gnome/libgnomekbd/glade/gkbd-indicator-plugins.glade
+share/icons/hicolor/48x48/apps/gkbd-indicator-plugins-capplet.png
+share/locale/bg/LC_MESSAGES/libgnomekbd.mo
+share/locale/ja/LC_MESSAGES/libgnomekbd.mo
+share/locale/nb/LC_MESSAGES/libgnomekbd.mo
+share/locale/ru/LC_MESSAGES/libgnomekbd.mo
+@dirrm share/gnome/libgnomekbd/glade
+@dirrm share/gnome/libgnomekbd
+@dirrm include/libgnomekbd
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 6ec24e0..dadd822 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnomemm26/Makefile,v 1.10 2006/08/21 15:25:07 ahze Exp $
+# $MCom: ports/x11/libgnomemm26/Makefile,v 1.12 2007/03/10 05:37:03 marcus Exp $
#
PORTNAME= libgnomemm
-PORTVERSION= 2.16.0
+PORTVERSION= 2.18.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo
index 0b20f59..afa6cee 100644
--- a/x11/libgnomemm26/distinfo
+++ b/x11/libgnomemm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomemm-2.16.0.tar.bz2) = 2971eea9ebe6041735375e765322c51f
-SHA256 (gnome2/libgnomemm-2.16.0.tar.bz2) = 4a90c066a09539e159e1abfd2acbc189e814f558e4e0ef33e46b5fc8af57b2d5
-SIZE (gnome2/libgnomemm-2.16.0.tar.bz2) = 256478
+MD5 (gnome2/libgnomemm-2.18.0.tar.bz2) = da6d481fc4a7fb0084d0e48f5c182112
+SHA256 (gnome2/libgnomemm-2.18.0.tar.bz2) = 043a9bedcc55296981934acf19ecfb428bdc1710baaed6c82470ea38f7bca182
+SIZE (gnome2/libgnomemm-2.18.0.tar.bz2) = 252070
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index ea20a71..b61e50b 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -3,14 +3,13 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/libxklavier/Makefile,v 1.28 2006/09/10 00:51:15 mezz Exp $
+# $MCom: ports/x11/libxklavier/Makefile,v 1.32 2007/02/24 21:00:46 mezz Exp $
#
PORTNAME= libxklavier
-PORTVERSION= 2.91
-PORTREVISION= 5
+PORTVERSION= 3.1
PORTEPOCH= 1
-CATEGORIES= x11
+CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gswitchit
@@ -34,10 +33,4 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
PLIST_SUB= VERSION=${PORTVERSION}
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-IGNORE= does not build on 4.X
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 8456fa5..8300407 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxklavier-2.91.tar.gz) = 53d9864d165c86edb6a67f7ebe140814
-SHA256 (libxklavier-2.91.tar.gz) = 25c51adea53aed005d8b586289759e7402594d3326cd2f89bcdac54568c38f9b
-SIZE (libxklavier-2.91.tar.gz) = 455935
+MD5 (libxklavier-3.1.tar.gz) = 56c4bea91ccbd0d09e3bcf58dff5732a
+SHA256 (libxklavier-3.1.tar.gz) = 0aa3bbc4d374cb5b24cf081eabe9b79d1caa5e5c1ea80c57ebd82f08eb56670e
+SIZE (libxklavier-3.1.tar.gz) = 472712
diff --git a/x11/libxklavier/files/patch-configure b/x11/libxklavier/files/patch-configure
index 4de85e1..d6d10d9 100644
--- a/x11/libxklavier/files/patch-configure
+++ b/x11/libxklavier/files/patch-configure
@@ -1,33 +1,35 @@
---- configure.orig Mon Dec 13 00:57:33 2004
-+++ configure Mon Dec 13 00:58:14 2004
-@@ -20135,9 +20135,9 @@
+--- configure.orig Sat Nov 4 15:13:39 2006
++++ configure Sat Nov 4 15:14:10 2006
+@@ -23045,9 +23045,9 @@ fi
- echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5
- echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5
+ echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6; }
-if test \( "$enable_xkb_support" == "yes" -a \
-- "$xkb_headers_present" == "yes" \) -o \
-- "$enable_xmm_support" == "yes" ; then
+- "$libxkbfile_present" == "yes" \) -o \
+- "$enable_xmodmap_support" == "yes" ; then
+if test \( "$enable_xkb_support" = "yes" -a \
-+ "$xkb_headers_present" = "yes" \) -o \
-+ "$enable_xmm_support" = "yes" ; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
++ "$libxkbfile_present" = "yes" \) -o \
++ "$enable_xmodmap_support" = "yes" ; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
else
-@@ -21744,14 +21744,14 @@
+@@ -24885,8 +24885,8 @@ fi
echo '**********************************************************'
echo ' Libxklavier is configured with the following backends:'
-if test "$enable_xkb_support" == "yes" ; then
-- if test "$xkb_headers_present" == "yes" ; then
+- if test "$libxkbfile_present" == "yes" ; then
+if test "$enable_xkb_support" = "yes" ; then
-+ if test "$xkb_headers_present" = "yes" ; then
- echo ' XKB (libxkbfile headers are present)'
- else
- echo ' XKB (but libxkbfile headers are NOT present)'
++ if test "$libxkbfile_present" = "yes" ; then
+ echo " XKB, libxkbfile is present"
+ echo " default ruleset: $xkb_default_ruleset"
+ echo " base: $xkb_base"
+@@ -24894,7 +24894,7 @@ if test "$enable_xkb_support" == "yes" ;
+ echo " XKB, libxkbfile is NOT present"
fi
fi
--if test "$enable_xmm_support" == "yes" ; then
-+if test "$enable_xmm_support" = "yes" ; then
- echo ' xmodmap'
+-if test "$enable_xmodmap_support" == "yes" ; then
++if test "$enable_xmodmap_support" = "yes" ; then
+ echo " xmodmap, default ruleset: $xmodmap_default_ruleset"
+ echo " base: $xmodmap_base"
fi
- echo '**********************************************************'
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config.c
deleted file mode 100644
index fe26e5c..0000000
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_config.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- libxklavier/xklavier_config.c.orig Sat Apr 15 21:04:38 2006
-+++ libxklavier/xklavier_config.c Tue Feb 27 14:57:27 2007
-@@ -243,7 +243,7 @@
- return FALSE;
-
- nodes = xpath_obj->nodesetval;
-- if (nodes != NULL && nodes->nodeTab != NULL) {
-+ if (nodes != NULL && nodes->nodeTab != NULL && nodes->nodeNr > 0) {
- rv = xkl_read_config_item(*nodes->nodeTab, pitem);
- if (pnode != NULL) {
- *pnode = *nodes->nodeTab;
-@@ -275,7 +275,11 @@
- gchar *
- xkl_strings_concat_comma_separated(gchar ** array)
- {
-- return g_strjoinv(",", array);
-+ if (array) {
-+ return g_strjoinv(",", array);
-+ } else {
-+ return g_strdup("");
-+ }
- }
-
- void
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
deleted file mode 100644
index 91d73cf..0000000
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxklavier/xklavier_config_i18n.c.orig Tue Jun 13 00:12:44 2006
-+++ libxklavier/xklavier_config_i18n.c Tue Jun 13 00:13:05 2006
-@@ -108,7 +108,7 @@ xkl_locale_from_utf8(const gchar * utf8s
- iconv_t converter;
- gchar converted[XKL_MAX_CI_DESC_LENGTH];
- gchar *converted_start = converted;
-- gchar *utf_start = (char *) utf8string;
-+ const gchar *utf_start = (const char *) utf8string;
- size_t clen = XKL_MAX_CI_DESC_LENGTH - 1;
- const gchar *charset;
-
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
deleted file mode 100644
index 200a1bd..0000000
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxklavier/xklavier_xmm.c.orig Sat Dec 16 01:25:29 2006
-+++ libxklavier/xklavier_xmm.c Sat Dec 16 01:29:39 2006
-@@ -107,7 +107,7 @@ xkl_xmm_find_switch_option(XklEngine * e
- const XmmSwitchOption *rv = xkl_xmm_shortcut_get_current(engine);
-
- if (rv != NULL) {
-- XmmShortcut *sc = rv->shortcuts;
-+ const XmmShortcut *sc = rv->shortcuts;
- while (sc->keysym != XK_VoidSymbol) {
- if ((XKeysymToKeycode
- (xkl_engine_get_display(engine),
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
index 8b2c1b1..af1dcbc 100644
--- a/x11/libxklavier/pkg-plist
+++ b/x11/libxklavier/pkg-plist
@@ -10,6 +10,7 @@ lib/libxklavier.so
lib/libxklavier.so.11
libdata/pkgconfig/libxklavier.pc
%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 03195f9..67eadf0 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/yelp/Makefile,v 1.105 2006/10/07 17:10:08 marcus Exp $
+# $MCom: ports/x11/yelp/Makefile,v 1.110 2007/03/14 17:45:40 marcus Exp $
#
PORTNAME= yelp
-PORTVERSION= 2.16.2
+PORTVERSION= 2.18.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index ca399af..71d58cb 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/yelp-2.16.2.tar.bz2) = ac55332d62c1871b3de92b5c1f0befaa
-SHA256 (gnome2/yelp-2.16.2.tar.bz2) = d3582665af98c8f4fd2f3c62d378360ea4de699bfe9e7213054071462f0650d5
-SIZE (gnome2/yelp-2.16.2.tar.bz2) = 858693
+MD5 (gnome2/yelp-2.18.0.tar.bz2) = bc40ea281cdfa256c7da0d0b7fe8191b
+SHA256 (gnome2/yelp-2.18.0.tar.bz2) = b02e8f518830d5f2f1a2106995c6ccaefa02c1bc4be2767356f4c386b2579836
+SIZE (gnome2/yelp-2.18.0.tar.bz2) = 897798
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index a65b994..c931ad4 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,11 +3,11 @@
# Whom: Franz Klammer <klammer@webonaut.com>
#
# $FreeBSD$
-# $MCom: ports/x11/zenity/Makefile,v 1.69 2006/10/03 11:37:08 ahze Exp $
+# $MCom: ports/x11/zenity/Makefile,v 1.77 2007/03/11 19:58:27 mezz Exp $
#
PORTNAME= zenity
-PORTVERSION= 2.16.3
+PORTVERSION= 2.18.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 98ca415..1b6ad66 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/zenity-2.16.3.tar.bz2) = 773579408f3237b38fa4d18a182c0ca6
-SHA256 (gnome2/zenity-2.16.3.tar.bz2) = 8055b439842db072c4d38e042c3786e80ebad5429180a46625e6cc4bfb648273
-SIZE (gnome2/zenity-2.16.3.tar.bz2) = 1525997
+MD5 (gnome2/zenity-2.18.0.tar.bz2) = f1a69577b9802b4031f53ff1bdd4989c
+SHA256 (gnome2/zenity-2.18.0.tar.bz2) = c2a3312317502a1e727ab9473d201ca6a11bdaf817aac4c8dcf6453b172ccec7
+SIZE (gnome2/zenity-2.18.0.tar.bz2) = 1534768
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 3fdb667..336291c 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -134,6 +134,7 @@ share/locale/ko/LC_MESSAGES/zenity.mo
share/locale/ku/LC_MESSAGES/zenity.mo
share/locale/lt/LC_MESSAGES/zenity.mo
share/locale/lv/LC_MESSAGES/zenity.mo
+share/locale/mg/LC_MESSAGES/zenity.mo
share/locale/mi/LC_MESSAGES/zenity.mo
share/locale/mk/LC_MESSAGES/zenity.mo
share/locale/ml/LC_MESSAGES/zenity.mo
@@ -215,6 +216,8 @@ share/locale/zh_TW/LC_MESSAGES/zenity.mo
@dirrmtry share/locale/ne
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/ko/LC_MESSAGES
OpenPOWER on IntegriCloud