aboutsummaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/gconf-editor/Makefile4
-rw-r--r--sysutils/gconf-editor/distinfo2
-rw-r--r--sysutils/gconf-editor/pkg-plist5
-rw-r--r--sysutils/gnome-control-center/Makefile18
-rw-r--r--sysutils/gnome-control-center/distinfo2
-rw-r--r--sysutils/gnome-control-center/files/patch-configure8
-rw-r--r--sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in11
-rw-r--r--sysutils/gnome-control-center/files/patch-libbackground_Makefile.in11
-rw-r--r--sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in11
-rw-r--r--sysutils/gnome-control-center/files/patch-ltmain.sh51
-rw-r--r--sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c10
-rw-r--r--sysutils/gnome-control-center/pkg-plist86
-rw-r--r--sysutils/gnome-system-monitor/Makefile7
-rw-r--r--sysutils/gnome-system-monitor/distinfo2
-rw-r--r--sysutils/gnome-system-monitor/files/patch-configure15
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist8
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile18
-rw-r--r--sysutils/gnomecontrolcenter2/distinfo2
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-configure8
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in11
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in11
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in11
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-ltmain.sh51
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c10
-rw-r--r--sysutils/gnomecontrolcenter2/pkg-plist86
-rw-r--r--sysutils/gnomesystemmonitor/Makefile7
-rw-r--r--sysutils/gnomesystemmonitor/distinfo2
-rw-r--r--sysutils/gnomesystemmonitor/files/patch-configure15
-rw-r--r--sysutils/gnomesystemmonitor/pkg-plist8
-rw-r--r--sysutils/gok/Makefile7
-rw-r--r--sysutils/gok/distinfo2
-rw-r--r--sysutils/gok/files/patch-gok_gok-data.c12
-rw-r--r--sysutils/gok/pkg-plist144
33 files changed, 459 insertions, 197 deletions
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 561c4edcd44b..2f38204e4160 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= gconf-editor
-PORTVERSION= 0.4.1
+PORTVERSION= 2.4.0
PORTEPOCH= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index b643444c5f49..837b0be5f8ae 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gconf-editor-0.4.1.tar.bz2) = 3ccff570fb185134452e04a35e6af6b4
+MD5 (gnome2/gconf-editor-2.4.0.tar.bz2) = 7ebc352062fc8b6d3c09a69ad6e963a7
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index b1c82d484abb..55767281a4e8 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -15,8 +15,10 @@ 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/bg/LC_MESSAGES/gconf-editor.mo
+share/locale/bn/LC_MESSAGES/gconf-editor.mo
share/locale/ca/LC_MESSAGES/gconf-editor.mo
share/locale/cs/LC_MESSAGES/gconf-editor.mo
+share/locale/cy/LC_MESSAGES/gconf-editor.mo
share/locale/da/LC_MESSAGES/gconf-editor.mo
share/locale/de/LC_MESSAGES/gconf-editor.mo
share/locale/el/LC_MESSAGES/gconf-editor.mo
@@ -35,7 +37,10 @@ share/locale/it/LC_MESSAGES/gconf-editor.mo
share/locale/ja/LC_MESSAGES/gconf-editor.mo
share/locale/kn/LC_MESSAGES/gconf-editor.mo
share/locale/ko/LC_MESSAGES/gconf-editor.mo
+share/locale/li/LC_MESSAGES/gconf-editor.mo
+share/locale/lt/LC_MESSAGES/gconf-editor.mo
share/locale/lv/LC_MESSAGES/gconf-editor.mo
+share/locale/mk/LC_MESSAGES/gconf-editor.mo
share/locale/ml/LC_MESSAGES/gconf-editor.mo
share/locale/mn/LC_MESSAGES/gconf-editor.mo
share/locale/ms/LC_MESSAGES/gconf-editor.mo
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index a740f6b1916c..5af729474976 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,25 +6,29 @@
#
PORTNAME= gnomecontrolcenter2
-PORTVERSION= 2.2.2
+PORTVERSION= 2.4.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/control-center/2.2
+MASTER_SITE_SUBDIR= sources/control-center/2.4
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Control center for GNOME 2.0 project
+COMMENT= Control center for GNOME 2 project
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop metacity
-USE_LIBTOOL= yes
+USE_GNOME= gnomeprefix gnomehack gnomehier metacity nautilus2
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+post-patch:
+ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
.include <bsd.port.mk>
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 348a7f947f01..660289920173 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.2.2.tar.bz2) = d5288d0e4249a5afdef494d5c59cb1bc
+MD5 (gnome2/control-center-2.4.0.tar.bz2) = 44115d3174d2f603f34a336ada562bae
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 1f63c8a48e05..83ef8876cbb3 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,13 +1,5 @@
--- configure.orig Wed Dec 18 16:10:09 2002
+++ configure Sun Dec 22 16:36:03 2002
-@@ -8516,6 +8516,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'
@@ -12607,7 +12608,7 @@
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
deleted file mode 100644
index 49e81252a028..000000000000
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-settings-daemon/Makefile.in.orig Fri Jan 17 12:30:39 2003
-+++ gnome-settings-daemon/Makefile.in Fri Jan 17 12:33:06 2003
-@@ -195,7 +195,7 @@
- $(GNOME_SETTINGS_DAEMON_LIBS) \
- $(top_builddir)/libbackground/libbackground.la \
- $(top_builddir)/libsounds/libsounds.a \
-- -L$(top_builddir)/libwindow-settings/ -lgnome-window-settings \
-+ -L$(top_builddir)/libwindow-settings/.libs -lgnome-window-settings \
- $(XF86MISC_LIBS)
-
-
diff --git a/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in b/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in
deleted file mode 100644
index d8ece4b307ac..000000000000
--- a/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbackground/Makefile.in.orig Fri Jan 17 12:33:42 2003
-+++ libbackground/Makefile.in Fri Jan 17 12:34:13 2003
-@@ -151,7 +151,7 @@
-
- INCLUDES = \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-+ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \
- -DG_LOG_DOMAIN=\"capplet-common\" \
- -I$(top_srcdir)/ \
- @CAPPLET_CFLAGS@
diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in b/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in
deleted file mode 100644
index c4d9211b70e2..000000000000
--- a/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwindow-settings/Makefile.in.orig Fri Jan 17 12:34:44 2003
-+++ libwindow-settings/Makefile.in Fri Jan 17 12:35:43 2003
-@@ -151,7 +151,7 @@
-
- INCLUDES = \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-+ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \
- -DG_LOG_DOMAIN=\"capplet-common\" \
- -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" \
- -I$(top_srcdir)/ \
diff --git a/sysutils/gnome-control-center/files/patch-ltmain.sh b/sysutils/gnome-control-center/files/patch-ltmain.sh
new file mode 100644
index 000000000000..49efbb5decf5
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig Thu May 1 11:30:14 2003
++++ ltmain.sh Mon Aug 11 14:38:46 2003
+@@ -1280,7 +1280,7 @@
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd4*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1290,8 +1290,16 @@
+ continue
+ ;;
+
++ -pthread)
++ compile_command="$compile_command -pthread"
++ finalize_command="$finalize_command -pthread"
++ compiler_flags="$compiler_flags -pthread"
++ continue
++ ;;
++
+ -module)
+ module=yes
++ build_old_libs=no
+ continue
+ ;;
+
+@@ -3000,6 +3008,9 @@
+ # problems, so we reset it completely
+ verstring=
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ verstring="0.0"
+ ;;
+@@ -5428,10 +5439,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c b/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c
new file mode 100644
index 000000000000..a9add20e26dd
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c
@@ -0,0 +1,10 @@
+--- vfs-methods/themus/theme-method.c.orig Fri Jun 13 07:52:44 2003
++++ vfs-methods/themus/theme-method.c Sat Jun 28 12:50:39 2003
+@@ -19,6 +19,7 @@
+
+ #include <string.h>
+ #include <errno.h>
++#include <libintl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index bddf0905df36..00cba32274e8 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -1,42 +1,76 @@
bin/gnome-accessibility-keyboard-properties
+bin/gnome-at-properties
bin/gnome-background-properties
bin/gnome-control-center
bin/gnome-default-applications-properties
+bin/gnome-display-properties
bin/gnome-file-types-properties
bin/gnome-font-properties
+bin/gnome-font-viewer
bin/gnome-keybinding-properties
bin/gnome-keyboard-properties
bin/gnome-mouse-properties
bin/gnome-network-preferences
bin/gnome-settings-daemon
bin/gnome-sound-properties
+bin/themus-theme-applier
bin/gnome-theme-manager
+bin/gnome-theme-thumbnailer
+bin/gnome-thumbnail-font
+bin/gnome-typing-monitor
bin/gnome-ui-properties
bin/gnome-window-properties
etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
etc/gconf/schemas/desktop_gnome_font_rendering.schemas
+etc/gconf/schemas/fontilus.schemas
+etc/gconf/schemas/themus.schemas
+etc/gnome-vfs-2.0/modules/font-method.conf
+etc/gnome-vfs-2.0/modules/theme-method.conf
include/gnome-window-settings-2.0/gnome-window-manager.h
include/gnome-window-settings-2.0/gnome-wm-manager.h
+lib/bonobo/libthemus-theme-properties-view.so
+lib/gnome-vfs-2.0/modules/libfont-method.so
+lib/gnome-vfs-2.0/modules/libtheme-method.so
lib/libgnome-window-settings.a
lib/libgnome-window-settings.so
lib/libgnome-window-settings.so.1
+lib/window-manager-settings/libmetacity.a
lib/window-manager-settings/libmetacity.so
libdata/bonobo/servers/GNOME_SettingsDaemon.server
+libdata/bonobo/servers/Themus_Properties_View.server
+libdata/bonobo/servers/fontilus.server
libdata/pkgconfig/gnome-window-settings-2.0.pc
+libexec/fontilus-context-menu
+share/gnome/application-registry/fontilus.applications
+share/gnome/application-registry/themus.applications
share/gnome/applications/gnomecc.desktop
share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
+share/gnome/control-center-2.0/capplets/at-properties.desktop
share/gnome/control-center-2.0/capplets/background.desktop
share/gnome/control-center-2.0/capplets/behavior.desktop
share/gnome/control-center-2.0/capplets/default-applications.desktop
+share/gnome/control-center-2.0/capplets/display-properties.desktop
share/gnome/control-center-2.0/capplets/file-types.desktop
share/gnome/control-center-2.0/capplets/font-properties.desktop
share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop
@@ -48,13 +82,17 @@ share/gnome/control-center-2.0/capplets/sound.desktop
share/gnome/control-center-2.0/capplets/window-properties.desktop
share/gnome/control-center-2.0/icons/accessibility-directory.png
share/gnome/control-center-2.0/icons/accessibility-keyboard-capplet.png
+share/gnome/control-center-2.0/icons/at-enable-capplet.png
share/gnome/control-center-2.0/icons/background-capplet.png
share/gnome/control-center-2.0/icons/behavior-capplet.png
share/gnome/control-center-2.0/icons/default-applications-capplet.png
+share/gnome/control-center-2.0/icons/display-capplet.png
share/gnome/control-center-2.0/icons/font-capplet.png
+share/gnome/control-center-2.0/icons/gnome-network-capplet.png
share/gnome/control-center-2.0/icons/mouse-capplet.png
share/gnome/control-center-2.0/icons/sound-capplet.png
share/gnome/control-center-2.0/icons/window-capplet.png
+share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade
share/gnome/control-center-2.0/interfaces/background-properties.glade
share/gnome/control-center-2.0/interfaces/file-types-properties.glade
share/gnome/control-center-2.0/interfaces/font-properties.glade
@@ -65,15 +103,22 @@ 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/sound-properties.glade
share/gnome/control-center-2.0/interfaces/theme-install.glade
share/gnome/control-center-2.0/interfaces/theme-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-window-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/at-enable-capplet.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
@@ -88,23 +133,40 @@ 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/sound-capplet.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/apply-font.glade
share/gnome/cursor-fonts/cursor-large-white.pcf
share/gnome/cursor-fonts/cursor-large.pcf
share/gnome/cursor-fonts/cursor-white.pcf
share/gnome/gnome-2.0/ui/gnomecc-ui.xml
share/gnome/idl/ConfigArchiver.idl
share/gnome/idl/GNOME_SettingsDaemon.idl
+share/gnome/mime-info/fontilus.keys
+share/gnome/mime-info/fontilus.mime
+share/gnome/mime-info/themus.keys
share/gnome/pixmaps/accessibility-keyboard-capplet.png
+share/gnome/pixmaps/at-enable-capplet.png
share/gnome/pixmaps/background-capplet.png
share/gnome/pixmaps/behavior-capplet.png
share/gnome/pixmaps/control-center2.png
share/gnome/pixmaps/default-applications-capplet.png
+share/gnome/pixmaps/display-capplet.png
share/gnome/pixmaps/font-capplet.png
+share/gnome/pixmaps/gnome-ccthemes.png
share/gnome/pixmaps/gnomecc-2/active.png
share/gnome/pixmaps/gnomecc-2/bcg_top.png
share/gnome/pixmaps/gnomecc-2/blank.png
@@ -112,17 +174,20 @@ share/gnome/pixmaps/gnomecc-2/title.png
share/gnome/pixmaps/keyboard-capplet.png
share/gnome/pixmaps/keyboard-shortcut.png
share/gnome/pixmaps/mouse-capplet.png
-share/gnome/pixmaps/sound-capplet.png
share/gnome/pixmaps/window-capplet.png
share/gnome/vfolders/Accessibility.directory
share/gnome/vfolders/Advanced.directory
+share/gnome/vfolders/font-method.directory
+share/gnome/vfolders/theme-method.directory
share/locale/am/LC_MESSAGES/control-center-2.0.mo
share/locale/ar/LC_MESSAGES/control-center-2.0.mo
share/locale/az/LC_MESSAGES/control-center-2.0.mo
share/locale/be/LC_MESSAGES/control-center-2.0.mo
share/locale/bg/LC_MESSAGES/control-center-2.0.mo
+share/locale/bn/LC_MESSAGES/control-center-2.0.mo
share/locale/ca/LC_MESSAGES/control-center-2.0.mo
share/locale/cs/LC_MESSAGES/control-center-2.0.mo
+share/locale/cy/LC_MESSAGES/control-center-2.0.mo
share/locale/da/LC_MESSAGES/control-center-2.0.mo
share/locale/de/LC_MESSAGES/control-center-2.0.mo
share/locale/el/LC_MESSAGES/control-center-2.0.mo
@@ -135,8 +200,11 @@ share/locale/fr/LC_MESSAGES/control-center-2.0.mo
share/locale/ga/LC_MESSAGES/control-center-2.0.mo
share/locale/gl/LC_MESSAGES/control-center-2.0.mo
share/locale/he/LC_MESSAGES/control-center-2.0.mo
+share/locale/hi/LC_MESSAGES/control-center-2.0.mo
share/locale/hr/LC_MESSAGES/control-center-2.0.mo
share/locale/hu/LC_MESSAGES/control-center-2.0.mo
+share/locale/id/LC_MESSAGES/control-center-2.0.mo
+share/locale/is/LC_MESSAGES/control-center-2.0.mo
share/locale/it/LC_MESSAGES/control-center-2.0.mo
share/locale/ja/LC_MESSAGES/control-center-2.0.mo
share/locale/ko/LC_MESSAGES/control-center-2.0.mo
@@ -161,6 +229,7 @@ share/locale/sr/LC_MESSAGES/control-center-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
share/locale/sv/LC_MESSAGES/control-center-2.0.mo
share/locale/ta/LC_MESSAGES/control-center-2.0.mo
+share/locale/th/LC_MESSAGES/control-center-2.0.mo
share/locale/tr/LC_MESSAGES/control-center-2.0.mo
share/locale/uk/LC_MESSAGES/control-center-2.0.mo
share/locale/vi/LC_MESSAGES/control-center-2.0.mo
@@ -169,16 +238,29 @@ share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
@dirrm share/gnome/pixmaps/gnomecc-2
@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
@dirrm share/gnome/control-center-2.0/icons
@dirrm share/gnome/applications
@dirrm lib/window-manager-settings
@dirrm include/gnome-window-settings-2.0
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 570f8c96e235..1cfc0ea85e44 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -6,16 +6,15 @@
#
PORTNAME= gnomesystemmonitor
-PORTVERSION= 2.0.5
-PORTREVISION= 1
+PORTVERSION= 2.4.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.0
+MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.4
DISTNAME= gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= GNOME 2.0 system monitor program
+COMMENT= GNOME 2 system monitor program
LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 0e6bd079ac54..3063caabeafe 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-system-monitor-2.0.5.tar.bz2) = 42d4ea444ecda4ba95d27baae3532583
+MD5 (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = f855d85adcc2eb0f20f639cbc2f00cbf
diff --git a/sysutils/gnome-system-monitor/files/patch-configure b/sysutils/gnome-system-monitor/files/patch-configure
index ec8d268afa07..504276306bba 100644
--- a/sysutils/gnome-system-monitor/files/patch-configure
+++ b/sysutils/gnome-system-monitor/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Sat Jun 7 01:23:06 2003
-+++ configure Sat Jun 7 01:23:17 2003
-@@ -4014,7 +4014,7 @@
+--- configure.orig Mon Nov 25 21:02:50 2002
++++ configure Fri Nov 29 20:30:44 2002
+@@ -3731,7 +3731,7 @@
cat >>confdefs.h <<_ACEOF
@@ -9,3 +9,12 @@
_ACEOF
+@@ -6630,7 +6630,7 @@
+ s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
+ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@PROCMAN_CFLAGS@,$PROCMAN_CFLAGS,;t t
+-s,@PROCMAN_LIBS@,$PROCMAN_LIBS,;t t
++s,@PROCMAN_LIBS@, $PROCMAN_LIBS,;t t
+ s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
+ s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t
+ s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index 2ab1491579c8..d035ed3953c7 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -34,14 +34,15 @@ share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo
share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo
share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/et/LC_MESSAGES/gnome-system-monitor.mo
share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo
share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
share/locale/he/LC_MESSAGES/gnome-system-monitor.mo
share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo
@@ -50,6 +51,7 @@ share/locale/id/LC_MESSAGES/gnome-system-monitor.mo
share/locale/it/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/li/LC_MESSAGES/gnome-system-monitor.mo
share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo
share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
@@ -64,10 +66,10 @@ share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo
share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo
share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index a740f6b1916c..5af729474976 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,25 +6,29 @@
#
PORTNAME= gnomecontrolcenter2
-PORTVERSION= 2.2.2
+PORTVERSION= 2.4.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/control-center/2.2
+MASTER_SITE_SUBDIR= sources/control-center/2.4
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Control center for GNOME 2.0 project
+COMMENT= Control center for GNOME 2 project
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop metacity
-USE_LIBTOOL= yes
+USE_GNOME= gnomeprefix gnomehack gnomehier metacity nautilus2
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+post-patch:
+ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
.include <bsd.port.mk>
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 348a7f947f01..660289920173 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.2.2.tar.bz2) = d5288d0e4249a5afdef494d5c59cb1bc
+MD5 (gnome2/control-center-2.4.0.tar.bz2) = 44115d3174d2f603f34a336ada562bae
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
index 1f63c8a48e05..83ef8876cbb3 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-configure
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -1,13 +1,5 @@
--- configure.orig Wed Dec 18 16:10:09 2002
+++ configure Sun Dec 22 16:36:03 2002
-@@ -8516,6 +8516,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'
@@ -12607,7 +12608,7 @@
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in
deleted file mode 100644
index 49e81252a028..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-settings-daemon/Makefile.in.orig Fri Jan 17 12:30:39 2003
-+++ gnome-settings-daemon/Makefile.in Fri Jan 17 12:33:06 2003
-@@ -195,7 +195,7 @@
- $(GNOME_SETTINGS_DAEMON_LIBS) \
- $(top_builddir)/libbackground/libbackground.la \
- $(top_builddir)/libsounds/libsounds.a \
-- -L$(top_builddir)/libwindow-settings/ -lgnome-window-settings \
-+ -L$(top_builddir)/libwindow-settings/.libs -lgnome-window-settings \
- $(XF86MISC_LIBS)
-
-
diff --git a/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in
deleted file mode 100644
index d8ece4b307ac..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbackground/Makefile.in.orig Fri Jan 17 12:33:42 2003
-+++ libbackground/Makefile.in Fri Jan 17 12:34:13 2003
-@@ -151,7 +151,7 @@
-
- INCLUDES = \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-+ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \
- -DG_LOG_DOMAIN=\"capplet-common\" \
- -I$(top_srcdir)/ \
- @CAPPLET_CFLAGS@
diff --git a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in
deleted file mode 100644
index c4d9211b70e2..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwindow-settings/Makefile.in.orig Fri Jan 17 12:34:44 2003
-+++ libwindow-settings/Makefile.in Fri Jan 17 12:35:43 2003
-@@ -151,7 +151,7 @@
-
- INCLUDES = \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-+ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \
- -DG_LOG_DOMAIN=\"capplet-common\" \
- -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" \
- -I$(top_srcdir)/ \
diff --git a/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh b/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..49efbb5decf5
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig Thu May 1 11:30:14 2003
++++ ltmain.sh Mon Aug 11 14:38:46 2003
+@@ -1280,7 +1280,7 @@
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd4*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1290,8 +1290,16 @@
+ continue
+ ;;
+
++ -pthread)
++ compile_command="$compile_command -pthread"
++ finalize_command="$finalize_command -pthread"
++ compiler_flags="$compiler_flags -pthread"
++ continue
++ ;;
++
+ -module)
+ module=yes
++ build_old_libs=no
+ continue
+ ;;
+
+@@ -3000,6 +3008,9 @@
+ # problems, so we reset it completely
+ verstring=
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ verstring="0.0"
+ ;;
+@@ -5428,10 +5439,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c b/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c
new file mode 100644
index 000000000000..a9add20e26dd
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c
@@ -0,0 +1,10 @@
+--- vfs-methods/themus/theme-method.c.orig Fri Jun 13 07:52:44 2003
++++ vfs-methods/themus/theme-method.c Sat Jun 28 12:50:39 2003
+@@ -19,6 +19,7 @@
+
+ #include <string.h>
+ #include <errno.h>
++#include <libintl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index bddf0905df36..00cba32274e8 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -1,42 +1,76 @@
bin/gnome-accessibility-keyboard-properties
+bin/gnome-at-properties
bin/gnome-background-properties
bin/gnome-control-center
bin/gnome-default-applications-properties
+bin/gnome-display-properties
bin/gnome-file-types-properties
bin/gnome-font-properties
+bin/gnome-font-viewer
bin/gnome-keybinding-properties
bin/gnome-keyboard-properties
bin/gnome-mouse-properties
bin/gnome-network-preferences
bin/gnome-settings-daemon
bin/gnome-sound-properties
+bin/themus-theme-applier
bin/gnome-theme-manager
+bin/gnome-theme-thumbnailer
+bin/gnome-thumbnail-font
+bin/gnome-typing-monitor
bin/gnome-ui-properties
bin/gnome-window-properties
etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
etc/gconf/schemas/desktop_gnome_font_rendering.schemas
+etc/gconf/schemas/fontilus.schemas
+etc/gconf/schemas/themus.schemas
+etc/gnome-vfs-2.0/modules/font-method.conf
+etc/gnome-vfs-2.0/modules/theme-method.conf
include/gnome-window-settings-2.0/gnome-window-manager.h
include/gnome-window-settings-2.0/gnome-wm-manager.h
+lib/bonobo/libthemus-theme-properties-view.so
+lib/gnome-vfs-2.0/modules/libfont-method.so
+lib/gnome-vfs-2.0/modules/libtheme-method.so
lib/libgnome-window-settings.a
lib/libgnome-window-settings.so
lib/libgnome-window-settings.so.1
+lib/window-manager-settings/libmetacity.a
lib/window-manager-settings/libmetacity.so
libdata/bonobo/servers/GNOME_SettingsDaemon.server
+libdata/bonobo/servers/Themus_Properties_View.server
+libdata/bonobo/servers/fontilus.server
libdata/pkgconfig/gnome-window-settings-2.0.pc
+libexec/fontilus-context-menu
+share/gnome/application-registry/fontilus.applications
+share/gnome/application-registry/themus.applications
share/gnome/applications/gnomecc.desktop
share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
+share/gnome/control-center-2.0/capplets/at-properties.desktop
share/gnome/control-center-2.0/capplets/background.desktop
share/gnome/control-center-2.0/capplets/behavior.desktop
share/gnome/control-center-2.0/capplets/default-applications.desktop
+share/gnome/control-center-2.0/capplets/display-properties.desktop
share/gnome/control-center-2.0/capplets/file-types.desktop
share/gnome/control-center-2.0/capplets/font-properties.desktop
share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop
@@ -48,13 +82,17 @@ share/gnome/control-center-2.0/capplets/sound.desktop
share/gnome/control-center-2.0/capplets/window-properties.desktop
share/gnome/control-center-2.0/icons/accessibility-directory.png
share/gnome/control-center-2.0/icons/accessibility-keyboard-capplet.png
+share/gnome/control-center-2.0/icons/at-enable-capplet.png
share/gnome/control-center-2.0/icons/background-capplet.png
share/gnome/control-center-2.0/icons/behavior-capplet.png
share/gnome/control-center-2.0/icons/default-applications-capplet.png
+share/gnome/control-center-2.0/icons/display-capplet.png
share/gnome/control-center-2.0/icons/font-capplet.png
+share/gnome/control-center-2.0/icons/gnome-network-capplet.png
share/gnome/control-center-2.0/icons/mouse-capplet.png
share/gnome/control-center-2.0/icons/sound-capplet.png
share/gnome/control-center-2.0/icons/window-capplet.png
+share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade
share/gnome/control-center-2.0/interfaces/background-properties.glade
share/gnome/control-center-2.0/interfaces/file-types-properties.glade
share/gnome/control-center-2.0/interfaces/font-properties.glade
@@ -65,15 +103,22 @@ 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/sound-properties.glade
share/gnome/control-center-2.0/interfaces/theme-install.glade
share/gnome/control-center-2.0/interfaces/theme-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-window-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/at-enable-capplet.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
@@ -88,23 +133,40 @@ 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/sound-capplet.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/apply-font.glade
share/gnome/cursor-fonts/cursor-large-white.pcf
share/gnome/cursor-fonts/cursor-large.pcf
share/gnome/cursor-fonts/cursor-white.pcf
share/gnome/gnome-2.0/ui/gnomecc-ui.xml
share/gnome/idl/ConfigArchiver.idl
share/gnome/idl/GNOME_SettingsDaemon.idl
+share/gnome/mime-info/fontilus.keys
+share/gnome/mime-info/fontilus.mime
+share/gnome/mime-info/themus.keys
share/gnome/pixmaps/accessibility-keyboard-capplet.png
+share/gnome/pixmaps/at-enable-capplet.png
share/gnome/pixmaps/background-capplet.png
share/gnome/pixmaps/behavior-capplet.png
share/gnome/pixmaps/control-center2.png
share/gnome/pixmaps/default-applications-capplet.png
+share/gnome/pixmaps/display-capplet.png
share/gnome/pixmaps/font-capplet.png
+share/gnome/pixmaps/gnome-ccthemes.png
share/gnome/pixmaps/gnomecc-2/active.png
share/gnome/pixmaps/gnomecc-2/bcg_top.png
share/gnome/pixmaps/gnomecc-2/blank.png
@@ -112,17 +174,20 @@ share/gnome/pixmaps/gnomecc-2/title.png
share/gnome/pixmaps/keyboard-capplet.png
share/gnome/pixmaps/keyboard-shortcut.png
share/gnome/pixmaps/mouse-capplet.png
-share/gnome/pixmaps/sound-capplet.png
share/gnome/pixmaps/window-capplet.png
share/gnome/vfolders/Accessibility.directory
share/gnome/vfolders/Advanced.directory
+share/gnome/vfolders/font-method.directory
+share/gnome/vfolders/theme-method.directory
share/locale/am/LC_MESSAGES/control-center-2.0.mo
share/locale/ar/LC_MESSAGES/control-center-2.0.mo
share/locale/az/LC_MESSAGES/control-center-2.0.mo
share/locale/be/LC_MESSAGES/control-center-2.0.mo
share/locale/bg/LC_MESSAGES/control-center-2.0.mo
+share/locale/bn/LC_MESSAGES/control-center-2.0.mo
share/locale/ca/LC_MESSAGES/control-center-2.0.mo
share/locale/cs/LC_MESSAGES/control-center-2.0.mo
+share/locale/cy/LC_MESSAGES/control-center-2.0.mo
share/locale/da/LC_MESSAGES/control-center-2.0.mo
share/locale/de/LC_MESSAGES/control-center-2.0.mo
share/locale/el/LC_MESSAGES/control-center-2.0.mo
@@ -135,8 +200,11 @@ share/locale/fr/LC_MESSAGES/control-center-2.0.mo
share/locale/ga/LC_MESSAGES/control-center-2.0.mo
share/locale/gl/LC_MESSAGES/control-center-2.0.mo
share/locale/he/LC_MESSAGES/control-center-2.0.mo
+share/locale/hi/LC_MESSAGES/control-center-2.0.mo
share/locale/hr/LC_MESSAGES/control-center-2.0.mo
share/locale/hu/LC_MESSAGES/control-center-2.0.mo
+share/locale/id/LC_MESSAGES/control-center-2.0.mo
+share/locale/is/LC_MESSAGES/control-center-2.0.mo
share/locale/it/LC_MESSAGES/control-center-2.0.mo
share/locale/ja/LC_MESSAGES/control-center-2.0.mo
share/locale/ko/LC_MESSAGES/control-center-2.0.mo
@@ -161,6 +229,7 @@ share/locale/sr/LC_MESSAGES/control-center-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
share/locale/sv/LC_MESSAGES/control-center-2.0.mo
share/locale/ta/LC_MESSAGES/control-center-2.0.mo
+share/locale/th/LC_MESSAGES/control-center-2.0.mo
share/locale/tr/LC_MESSAGES/control-center-2.0.mo
share/locale/uk/LC_MESSAGES/control-center-2.0.mo
share/locale/vi/LC_MESSAGES/control-center-2.0.mo
@@ -169,16 +238,29 @@ share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
@dirrm share/gnome/pixmaps/gnomecc-2
@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
@dirrm share/gnome/control-center-2.0/icons
@dirrm share/gnome/applications
@dirrm lib/window-manager-settings
@dirrm include/gnome-window-settings-2.0
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 570f8c96e235..1cfc0ea85e44 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -6,16 +6,15 @@
#
PORTNAME= gnomesystemmonitor
-PORTVERSION= 2.0.5
-PORTREVISION= 1
+PORTVERSION= 2.4.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.0
+MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.4
DISTNAME= gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= GNOME 2.0 system monitor program
+COMMENT= GNOME 2 system monitor program
LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
index 0e6bd079ac54..3063caabeafe 100644
--- a/sysutils/gnomesystemmonitor/distinfo
+++ b/sysutils/gnomesystemmonitor/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-system-monitor-2.0.5.tar.bz2) = 42d4ea444ecda4ba95d27baae3532583
+MD5 (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = f855d85adcc2eb0f20f639cbc2f00cbf
diff --git a/sysutils/gnomesystemmonitor/files/patch-configure b/sysutils/gnomesystemmonitor/files/patch-configure
index ec8d268afa07..504276306bba 100644
--- a/sysutils/gnomesystemmonitor/files/patch-configure
+++ b/sysutils/gnomesystemmonitor/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Sat Jun 7 01:23:06 2003
-+++ configure Sat Jun 7 01:23:17 2003
-@@ -4014,7 +4014,7 @@
+--- configure.orig Mon Nov 25 21:02:50 2002
++++ configure Fri Nov 29 20:30:44 2002
+@@ -3731,7 +3731,7 @@
cat >>confdefs.h <<_ACEOF
@@ -9,3 +9,12 @@
_ACEOF
+@@ -6630,7 +6630,7 @@
+ s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
+ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@PROCMAN_CFLAGS@,$PROCMAN_CFLAGS,;t t
+-s,@PROCMAN_LIBS@,$PROCMAN_LIBS,;t t
++s,@PROCMAN_LIBS@, $PROCMAN_LIBS,;t t
+ s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
+ s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t
+ s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
index 2ab1491579c8..d035ed3953c7 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -34,14 +34,15 @@ share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo
share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo
share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/et/LC_MESSAGES/gnome-system-monitor.mo
share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo
share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
share/locale/he/LC_MESSAGES/gnome-system-monitor.mo
share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo
@@ -50,6 +51,7 @@ share/locale/id/LC_MESSAGES/gnome-system-monitor.mo
share/locale/it/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/li/LC_MESSAGES/gnome-system-monitor.mo
share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo
share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
@@ -64,10 +66,10 @@ share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo
share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo
share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
diff --git a/sysutils/gok/Makefile b/sysutils/gok/Makefile
index 020a95a5f68e..405fba06569d 100644
--- a/sysutils/gok/Makefile
+++ b/sysutils/gok/Makefile
@@ -6,15 +6,16 @@
#
PORTNAME= gok
-PORTVERSION= 0.7.5
-CATEGORIES= sysutils gnome
+PORTVERSION= 0.8.2
+CATEGORIES= sysutils gnome accessibility
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.7
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME On-Screen Keyboard (GOK)
+USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui atspi libwnck
USE_REINPLACE= yes
diff --git a/sysutils/gok/distinfo b/sysutils/gok/distinfo
index 243d98493042..76fde0ba0bf1 100644
--- a/sysutils/gok/distinfo
+++ b/sysutils/gok/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gok-0.7.5.tar.gz) = 8ae32031b253371eb76be5f59c26bafd
+MD5 (gnome2/gok-0.8.2.tar.bz2) = 3b495c7b8f8e10e370246c95d75f58eb
diff --git a/sysutils/gok/files/patch-gok_gok-data.c b/sysutils/gok/files/patch-gok_gok-data.c
index 901b763b08ab..e69de29bb2d1 100644
--- a/sysutils/gok/files/patch-gok_gok-data.c
+++ b/sysutils/gok/files/patch-gok_gok-data.c
@@ -1,12 +0,0 @@
---- gok/gok-data.c.orig Mon Jun 2 21:49:16 2003
-+++ gok/gok-data.c Mon Jun 2 21:49:26 2003
-@@ -707,8 +707,8 @@
- */
- void gok_data_set_is_dock (GokDockType val)
- {
-- m_eDockType = val;
- gchar *typestring;
-+ m_eDockType = val;
- switch (val) {
- case GOK_DOCK_TOP:
- typestring = "top";
diff --git a/sysutils/gok/pkg-plist b/sysutils/gok/pkg-plist
index 35335cb46f8b..bdcaccbfbc81 100644
--- a/sysutils/gok/pkg-plist
+++ b/sysutils/gok/pkg-plist
@@ -19,6 +19,7 @@ etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/goksound2/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/key_flashing/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/none/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gok/layout/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gok/spy/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gok/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/dwell/%gconf.xml
@@ -39,65 +40,77 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/goksound2/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/key_flashing/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gok/spy/%gconf.xml
etc/gconf/schemas/gok.schemas
libdata/pkgconfig/gok-1.0.pc
-share/doc/gok/c4.html
-share/doc/gok/gok-arraylist.html
-share/doc/gok/gok-callbacks.html
-share/doc/gok/gok-command-common.html
-share/doc/gok/gok-command-edge-data.html
-share/doc/gok/gok-command-edge.html
-share/doc/gok/gok-command-graph.html
-share/doc/gok/gok-command-predictor.html
-share/doc/gok/gok-command-vertex-data.html
-share/doc/gok/gok-command-vertex.html
-share/doc/gok/gok-global.html
-share/doc/gok/gok-gok-action.html
-share/doc/gok/gok-gok-branchback-stack.html
-share/doc/gok/gok-gok-chunker.html
-share/doc/gok/gok-gok-control.html
-share/doc/gok/gok-gok-data.html
-share/doc/gok/gok-gok-editor.html
-share/doc/gok/gok-gok-feedback.html
-share/doc/gok/gok-gok-file-util.html
-share/doc/gok/gok-gok-gconf-keys.html
-share/doc/gok/gok-gok-gconf.html
-share/doc/gok/gok-gok-key.html
-share/doc/gok/gok-gok-keyboard.html
-share/doc/gok/gok-gok-keyslotter.html
-share/doc/gok/gok-gok-log-priv.html
-share/doc/gok/gok-gok-log-reader.html
-share/doc/gok/gok-gok-log.html
-share/doc/gok/gok-gok-modifier.html
-share/doc/gok/gok-gok-output.html
-share/doc/gok/gok-gok-page-accessmethod.html
-share/doc/gok/gok-gok-page-actions.html
-share/doc/gok/gok-gok-page-feedbacks.html
-share/doc/gok/gok-gok-page-keysizespace.html
-share/doc/gok/gok-gok-page-wordcomplete.html
-share/doc/gok/gok-gok-predictor.html
-share/doc/gok/gok-gok-scanner.html
-share/doc/gok/gok-gok-settings-dialog.html
-share/doc/gok/gok-gok-sound.html
-share/doc/gok/gok-gok-spy-priv.html
-share/doc/gok/gok-gok-spy.html
-share/doc/gok/gok-gok-word-complete.html
-share/doc/gok/gok-gok.html
-share/doc/gok/gok-gokbutton.html
-share/doc/gok/gok-gtkjoyswitch.html
-share/doc/gok/gok-interface.html
-share/doc/gok/gok-main.html
-share/doc/gok/gok-support.html
-share/doc/gok/gok-switchapi.html
-share/doc/gok/gok-word-complete.html
-share/doc/gok/index.html
-share/doc/gok/index.sgml
+%%DOCSDIR%%/c4.html
+%%DOCSDIR%%/gok-arraylist.html
+%%DOCSDIR%%/gok-callbacks.html
+%%DOCSDIR%%/gok-command-common.html
+%%DOCSDIR%%/gok-command-edge-data.html
+%%DOCSDIR%%/gok-command-edge.html
+%%DOCSDIR%%/gok-command-graph.html
+%%DOCSDIR%%/gok-command-predictor.html
+%%DOCSDIR%%/gok-command-vertex-data.html
+%%DOCSDIR%%/gok-command-vertex.html
+%%DOCSDIR%%/gok-global.html
+%%DOCSDIR%%/gok-gok-action.html
+%%DOCSDIR%%/gok-gok-branchback-stack.html
+%%DOCSDIR%%/gok-gok-chunker.html
+%%DOCSDIR%%/gok-gok-control.html
+%%DOCSDIR%%/gok-gok-data.html
+%%DOCSDIR%%/gok-gok-editor.html
+%%DOCSDIR%%/gok-gok-feedback.html
+%%DOCSDIR%%/gok-gok-file-util.html
+%%DOCSDIR%%/gok-gok-gconf-keys.html
+%%DOCSDIR%%/gok-gok-gconf.html
+%%DOCSDIR%%/gok-gok-key.html
+%%DOCSDIR%%/gok-gok-keyboard.html
+%%DOCSDIR%%/gok-gok-keyslotter.html
+%%DOCSDIR%%/gok-gok-log-priv.html
+%%DOCSDIR%%/gok-gok-log-reader.html
+%%DOCSDIR%%/gok-gok-log.html
+%%DOCSDIR%%/gok-gok-modifier.html
+%%DOCSDIR%%/gok-gok-output.html
+%%DOCSDIR%%/gok-gok-page-accessmethod.html
+%%DOCSDIR%%/gok-gok-page-actions.html
+%%DOCSDIR%%/gok-gok-page-feedbacks.html
+%%DOCSDIR%%/gok-gok-page-keysizespace.html
+%%DOCSDIR%%/gok-gok-page-wordcomplete.html
+%%DOCSDIR%%/gok-gok-predictor.html
+%%DOCSDIR%%/gok-gok-scanner.html
+%%DOCSDIR%%/gok-gok-settings-dialog.html
+%%DOCSDIR%%/gok-gok-sound.html
+%%DOCSDIR%%/gok-gok-spy-priv.html
+%%DOCSDIR%%/gok-gok-spy.html
+%%DOCSDIR%%/gok-gok-word-complete.html
+%%DOCSDIR%%/gok-gok.html
+%%DOCSDIR%%/gok-gokbutton.html
+%%DOCSDIR%%/gok-gtkjoyswitch.html
+%%DOCSDIR%%/gok-interface.html
+%%DOCSDIR%%/gok-main.html
+%%DOCSDIR%%/gok-support.html
+%%DOCSDIR%%/gok-switchapi.html
+%%DOCSDIR%%/gok-word-complete.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+share/gnome/applications/gok.desktop
+share/gnome/gok/East.png
share/gnome/gok/Keyboard.kbd
+share/gnome/gok/NE.png
+share/gnome/gok/NW.png
+share/gnome/gok/North.png
+share/gnome/gok/SE.png
+share/gnome/gok/SW.png
+share/gnome/gok/South.png
+share/gnome/gok/West.png
share/gnome/gok/alphabet.kbd
share/gnome/gok/automatic-scanning.xam
share/gnome/gok/dictionary.txt
share/gnome/gok/direct-selection.xam
share/gnome/gok/dwell-selection.xam
+share/gnome/gok/empty.png
+share/gnome/gok/gok.png
share/gnome/gok/gok.rc
share/gnome/gok/gok-controls.kbd
share/gnome/gok/goklogo.png
@@ -105,38 +118,60 @@ share/gnome/gok/goksound1.wav
share/gnome/gok/goksound2.wav
share/gnome/gok/inverse-scanning.xam
share/gnome/gok/hide.kbd
+share/gnome/gok/latched.png
share/gnome/gok/launcher.kbd
+share/gnome/gok/locked.png
share/gnome/gok/main.kbd
share/gnome/gok/manage.kbd
+share/gnome/gok/mouse.kbd
share/gnome/gok/move-resize.kbd
+share/gnome/gok/quit.kbd
share/gnome/gok/qwerty.kbd
+share/gnome/gok/small-empty.png
+share/gnome/gok/text-operations.kbd
share/gnome/help/gok/C/gok.xml
share/gnome/omf/gok/gok-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gok/gok-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true
+share/gnome/pixmaps/gok.png
share/locale/am/LC_MESSAGES/gok.mo
+share/locale/az/LC_MESSAGES/gok.mo
+share/locale/be/LC_MESSAGES/gok.mo
share/locale/ca/LC_MESSAGES/gok.mo
share/locale/cs/LC_MESSAGES/gok.mo
+share/locale/cy/LC_MESSAGES/gok.mo
share/locale/da/LC_MESSAGES/gok.mo
share/locale/de/LC_MESSAGES/gok.mo
+share/locale/el/LC_MESSAGES/gok.mo
share/locale/es/LC_MESSAGES/gok.mo
share/locale/fr/LC_MESSAGES/gok.mo
+share/locale/hi/LC_MESSAGES/gok.mo
share/locale/it/LC_MESSAGES/gok.mo
share/locale/ja/LC_MESSAGES/gok.mo
+share/locale/ko/LC_MESSAGES/gok.mo
+share/locale/mk/LC_MESSAGES/gok.mo
+share/locale/ml/LC_MESSAGES/gok.mo
+share/locale/ms/LC_MESSAGES/gok.mo
share/locale/nl/LC_MESSAGES/gok.mo
share/locale/no/LC_MESSAGES/gok.mo
+share/locale/pl/LC_MESSAGES/gok.mo
share/locale/pt/LC_MESSAGES/gok.mo
share/locale/pt_BR/LC_MESSAGES/gok.mo
+share/locale/sl/LC_MESSAGES/gok.mo
+share/locale/sq/LC_MESSAGES/gok.mo
share/locale/sr/LC_MESSAGES/gok.mo
share/locale/sr@Latn/LC_MESSAGES/gok.mo
share/locale/sv/LC_MESSAGES/gok.mo
share/locale/uk/LC_MESSAGES/gok.mo
share/locale/vi/LC_MESSAGES/gok.mo
+share/locale/zh_CN/LC_MESSAGES/gok.mo
+share/locale/zh_TW/LC_MESSAGES/gok.mo
@dirrm share/gnome/omf/gok
@dirrm share/gnome/help/gok/C/figures
@dirrm share/gnome/help/gok/C
@dirrm share/gnome/help/gok
@dirrm share/gnome/gok
-@dirrm share/doc/gok
+@dirrm %%DOCSDIR%%
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/spy
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/key_flashing
@@ -157,6 +192,7 @@ share/locale/vi/LC_MESSAGES/gok.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/dwell
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok
+@dirrm etc/gconf/gconf.xml.defaults/apps/gok/spy
@dirrm etc/gconf/gconf.xml.defaults/apps/gok/layout
@dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/none
@dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/key_flashing
@@ -177,4 +213,4 @@ share/locale/vi/LC_MESSAGES/gok.mo
@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/dwell
@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions
@dirrm etc/gconf/gconf.xml.defaults/apps/gok
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true