summaryrefslogtreecommitdiff
path: root/x11-themes
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-04-05 03:11:39 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-04-05 03:11:39 +0000
commitc4851e78e4f63338fe9a4883e5b7a0370dce27f7 (patch)
tree3910aa2e83f782cec94f15b4547dadb741cd29ce /x11-themes
parentAdd gnomekeyring, an API and daemon for managing lists of credentials. This (diff)
Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release
ever. It fixes many bugs, and adds some features missing in previous FreeBSD ports. To help users upgrade from GNOME 2.4, we have constructed an upgrade FAQ at: http://www.freebsd.org/gnome/docs/faq26.html Please read it carefully. GNOME 2.6 packages are also available for all supported i386 versions of FreeBSD at: http://www.marcuscom.com/tinderbox/ The FreeBSD GNOME Team would like the thank the following users for their wonderful testing and patching efforts. We would especially like to thank Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen. Without these people, our team, and our team alumni, GNOME on FreeBSD would not be possible. Jeremy Messenger <mezz7@cox.net> Khairil Yusof <kaeru@pd.jaring.my> Koop Mast <kwm@rainbow-runner.nl> Simon Barner <barner@in.tum.de> Tom McLaughlin <tmclaugh@sdf.lonestar.org> Scott Dodson <sdodson@sdodson.com> Vladimir Grebenschikov <vova@sw.ru>
Notes
Notes: svn path=/head/; revision=106172
Diffstat (limited to 'x11-themes')
-rw-r--r--x11-themes/gnome-themes/Makefile9
-rw-r--r--x11-themes/gnome-themes/distinfo4
-rw-r--r--x11-themes/gnome-themes/files/patch-configure10
-rw-r--r--x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in6
-rw-r--r--x11-themes/gnome-themes/pkg-descr4
-rw-r--r--x11-themes/gnome-themes/pkg-plist133
-rw-r--r--x11-themes/gtk-engines2/Makefile4
-rw-r--r--x11-themes/gtk-engines2/pkg-plist8
8 files changed, 108 insertions, 70 deletions
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index c4e6ffbabcf0..9c40ebfcd0f7 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gnome-themes
-PORTVERSION= 2.4.1
-PORTREVISION= 2
+PORTVERSION= 2.6.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -23,10 +22,12 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_LIBTOOL_VER=13
-USE_GNOME= gnomehack metacity libgnomeui
+USE_GNOME= gnomehack lthack metacity libgnomeui
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+PLIST_SUB= GTK_VERSION="2.4.0"
+
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo
index 38b749dccb7d..34aec8dc8691 100644
--- a/x11-themes/gnome-themes/distinfo
+++ b/x11-themes/gnome-themes/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-themes-2.4.1.tar.bz2) = 304237994a5bdd8b89628f4387cd0d10
-SIZE (gnome2/gnome-themes-2.4.1.tar.bz2) = 2485378
+MD5 (gnome2/gnome-themes-2.6.0.tar.bz2) = 17817f602713b9ac8ebaff9a7f0cb996
+SIZE (gnome2/gnome-themes-2.6.0.tar.bz2) = 2597765
diff --git a/x11-themes/gnome-themes/files/patch-configure b/x11-themes/gnome-themes/files/patch-configure
deleted file mode 100644
index 3a3c068040c5..000000000000
--- a/x11-themes/gnome-themes/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Fri May 16 15:56:25 2003
-+++ configure Fri May 16 23:10:03 2003
-@@ -18073,6 +18073,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'
diff --git a/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in b/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in
index 02365472fd62..090c18883e26 100644
--- a/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in
+++ b/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in
@@ -1,6 +1,6 @@
---- metacity-themes/Makefile.in.orig Mon Feb 3 20:16:59 2003
-+++ metacity-themes/Makefile.in Mon Feb 3 20:17:33 2003
-@@ -120,7 +120,7 @@
+--- metacity-themes/Makefile.in.orig Tue Dec 9 22:11:42 2003
++++ metacity-themes/Makefile.in Tue Dec 9 22:12:00 2003
+@@ -122,7 +122,7 @@
THEMES = Mist Sandwish Smokey
diff --git a/x11-themes/gnome-themes/pkg-descr b/x11-themes/gnome-themes/pkg-descr
index f3fa6135cc4b..333388e7853d 100644
--- a/x11-themes/gnome-themes/pkg-descr
+++ b/x11-themes/gnome-themes/pkg-descr
@@ -1,2 +1,2 @@
-New package of default themes for GNOME, which currently includes GTK+ and
-icon themes designed for accessibility.
+A collection of themes for metacity and Gtk, and some basic icon
+sets.
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index 2b7248fd0106..a2e046b7ac75 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -1,8 +1,8 @@
-lib/gtk-2.0/2.2.0/engines/libcrux-engine.so
-lib/gtk-2.0/2.2.0/engines/libhcengine.so
-lib/gtk-2.0/2.2.0/engines/liblighthouseblue.so
-lib/gtk-2.0/2.2.0/engines/libmist.so
-lib/gtk-2.0/2.2.0/engines/libthinice.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.so
share/eazel-engine/arrow_down-spinner.png
share/eazel-engine/arrow_down.png
share/eazel-engine/arrow_left.png
@@ -241,13 +241,14 @@ share/icons/Flat-Blue/scalable/emblems/emblem-urgent.svg
share/icons/HighContrast/index.theme
share/icons/HighContrastInverse/index.theme
share/icons/HighContrastLargePrint/48x48/apps/accessibility-directory.png
-share/icons/HighContrastLargePrint/48x48/apps/accessibility-keyboard-capplet.png
share/icons/HighContrastLargePrint/48x48/apps/advanced-directory.png
-share/icons/HighContrastLargePrint/48x48/apps/background-capplet.png
-share/icons/HighContrastLargePrint/48x48/apps/behavior-capplet.png
+share/icons/HighContrastLargePrint/48x48/apps/ax-applet.png
share/icons/HighContrastLargePrint/48x48/apps/charpick.png
-share/icons/HighContrastLargePrint/48x48/apps/default-applications-capplet.png
-share/icons/HighContrastLargePrint/48x48/apps/font-capplet.png
+share/icons/HighContrastLargePrint/48x48/apps/display-capplet.png
+share/icons/HighContrastLargePrint/48x48/apps/file-manager.png
+share/icons/HighContrastLargePrint/48x48/apps/file-roller.png
+share/icons/HighContrastLargePrint/48x48/apps/gcalctool.png
+share/icons/HighContrastLargePrint/48x48/apps/gdict.png
share/icons/HighContrastLargePrint/48x48/apps/gedit-icon.png
share/icons/HighContrastLargePrint/48x48/apps/gkb.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-applications.png
@@ -255,7 +256,6 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-audio2.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-calc3.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-ccmime.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-ccscreensaver.png
-share/icons/HighContrastLargePrint/48x48/apps/gnome-ccthemes.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-cd.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-character-map.png
@@ -273,29 +273,44 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-joystick.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-log.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-logo-icon-transparent.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-mailcheck.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-main-menu.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-mini-commander.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer-applet.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-multimedia.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-panel.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-session.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-accessibility-technologies.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-background.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-default-applications.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-font.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-keybindings.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-sound.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-theme.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-ui-behavior.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-settings.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-starthere.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-system.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-terminal.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-util.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-window-manager.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-windows.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-workspace.png
-share/icons/HighContrastLargePrint/48x48/apps/keyboard-capplet.png
-share/icons/HighContrastLargePrint/48x48/apps/keyboard-shortcut.png
+share/icons/HighContrastLargePrint/48x48/apps/gucharmap.png
share/icons/HighContrastLargePrint/48x48/apps/launcher-program.png
-share/icons/HighContrastLargePrint/48x48/apps/metacity-properties.png
-share/icons/HighContrastLargePrint/48x48/apps/mouse-capplet.png
-share/icons/HighContrastLargePrint/48x48/apps/sound-capplet.png
+share/icons/HighContrastLargePrint/48x48/apps/perfmeter.png
share/icons/HighContrastLargePrint/48x48/apps/window-capplet.png
share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-cdrom-audio.png
share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-cdrom.png
share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-floppy.png
+share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-keyboard.png
+share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-mouse-optical.png
+share/icons/HighContrastLargePrint/48x48/emblems/emblem-important.png
share/icons/HighContrastLargePrint/48x48/emblems/emblem-noread.png
+share/icons/HighContrastLargePrint/48x48/emblems/emblem-personal.png
+share/icons/HighContrastLargePrint/48x48/emblems/emblem-special.png
+share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-client.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.icon
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory.icon
@@ -303,6 +318,7 @@ share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-executable.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-ftp.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-home.png
+share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-network.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-nfs.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-regular.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-share.png
@@ -449,13 +465,13 @@ share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-x-font-afm.png
share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-package.png
share/icons/HighContrastLargePrint/index.theme
share/icons/HighContrastLargePrintInverse/48x48/apps/accessibility-directory.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/accessibility-keyboard-capplet.png
share/icons/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/background-capplet.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/behavior-capplet.png
share/icons/HighContrastLargePrintInverse/48x48/apps/charpick.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/default-applications-capplet.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/font-capplet.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/display-capplet.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/file-manager.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/file-roller.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gcalctool.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gdict.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gedit-icon.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gkb.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-applications.png
@@ -463,7 +479,6 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-audio2.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-calc3.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccmime.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccscreensaver.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccthemes.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cd.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cdplayer-icon.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-character-map.png
@@ -481,29 +496,44 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-joystick.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-log.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-logo-icon-transparent.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mailcheck.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-main-menu.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mini-commander.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer-applet.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-multimedia.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-panel.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-session.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-keyboard.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-technologies.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-background.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-default-applications.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-font.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-keybindings.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-sound.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-theme.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-ui-behavior.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-starthere.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-system.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-terminal.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-util.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-window-manager.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-windows.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-workspace.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/keyboard-capplet.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/keyboard-shortcut.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gucharmap.png
share/icons/HighContrastLargePrintInverse/48x48/apps/launcher-program.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/metacity-properties.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/mouse-capplet.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/sound-capplet.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/perfmeter.png
share/icons/HighContrastLargePrintInverse/48x48/apps/window-capplet.png
share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-cdrom-audio.png
share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-cdrom.png
share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-floppy.png
+share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-keyboard.png
+share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-mouse-optical.png
+share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-important.png
share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-noread.png
+share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-personal.png
+share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-special.png
+share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-client.png
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory-accept.icon
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory-accept.png
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory.icon
@@ -511,6 +541,7 @@ share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory.p
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-executable.png
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-ftp.png
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-home.png
+share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-network.png
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-nfs.png
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-regular.png
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-share.png
@@ -659,13 +690,14 @@ share/icons/HighContrastLargePrintInverse/index.theme
share/icons/LargePrint/index.theme
share/icons/LowContrast/index.theme
share/icons/LowContrastLargePrint/48x48/apps/accessibility-directory.png
-share/icons/LowContrastLargePrint/48x48/apps/accessibility-keyboard-capplet.png
share/icons/LowContrastLargePrint/48x48/apps/advanced-directory.png
-share/icons/LowContrastLargePrint/48x48/apps/background-capplet.png
-share/icons/LowContrastLargePrint/48x48/apps/behavior-capplet.png
+share/icons/LowContrastLargePrint/48x48/apps/ax-applet.png
share/icons/LowContrastLargePrint/48x48/apps/charpick.png
-share/icons/LowContrastLargePrint/48x48/apps/default-applications-capplet.png
-share/icons/LowContrastLargePrint/48x48/apps/font-capplet.png
+share/icons/LowContrastLargePrint/48x48/apps/display-capplet.png
+share/icons/LowContrastLargePrint/48x48/apps/file-manager.png
+share/icons/LowContrastLargePrint/48x48/apps/file-roller.png
+share/icons/LowContrastLargePrint/48x48/apps/gcalctool.png
+share/icons/LowContrastLargePrint/48x48/apps/gdict.png
share/icons/LowContrastLargePrint/48x48/apps/gedit-icon.png
share/icons/LowContrastLargePrint/48x48/apps/gkb.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-applications.png
@@ -673,7 +705,6 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-audio2.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-calc3.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-ccmime.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-ccscreensaver.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-ccthemes.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-cd.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-character-map.png
@@ -691,24 +722,33 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-joystick.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-log.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-logo-icon-transparent.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-mailcheck.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-main-menu.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-mini-commander.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer-applet.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-multimedia.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-panel.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-session.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-technologies.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-background.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-default-applications.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-font.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-keybindings.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-sound.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-theme.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-ui-behavior.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-settings.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-starthere.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-system.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-terminal.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-util.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-window-manager.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-windows.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-workspace.png
-share/icons/LowContrastLargePrint/48x48/apps/keyboard-capplet.png
-share/icons/LowContrastLargePrint/48x48/apps/keyboard-shortcut.png
+share/icons/LowContrastLargePrint/48x48/apps/gucharmap.png
share/icons/LowContrastLargePrint/48x48/apps/launcher-program.png
-share/icons/LowContrastLargePrint/48x48/apps/metacity-properties.png
-share/icons/LowContrastLargePrint/48x48/apps/mouse-capplet.png
-share/icons/LowContrastLargePrint/48x48/apps/sound-capplet.png
+share/icons/LowContrastLargePrint/48x48/apps/perfmeter.png
share/icons/LowContrastLargePrint/48x48/apps/window-capplet.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-cdrom-audio.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-cdrom.png
@@ -716,7 +756,9 @@ share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-dvd.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-floppy.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-harddisk.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-jazdisk.png
+share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-keyboard.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-memory.png
+share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-mouse-optical.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-zipdisk.png
share/icons/LowContrastLargePrint/48x48/emblems/emblem-art.png
share/icons/LowContrastLargePrint/48x48/emblems/emblem-camera.png
@@ -734,6 +776,7 @@ share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-blockdev.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-bookmark-missing.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-bookmark.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-chardev.png
+share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-client.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.icon
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory.icon
@@ -743,6 +786,7 @@ share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-fifo.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-ftp.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-home.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-loading-icon.png
+share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-network.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-nfs.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-regular.icon
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-regular.png
@@ -926,6 +970,7 @@ share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full-accept.png
share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full.png
share/icons/Smokey-Red/index.theme
share/locale/am/LC_MESSAGES/gnome-themes.mo
+share/locale/ar/LC_MESSAGES/gnome-themes.mo
share/locale/az/LC_MESSAGES/gnome-themes.mo
share/locale/be/LC_MESSAGES/gnome-themes.mo
share/locale/bg/LC_MESSAGES/gnome-themes.mo
@@ -936,6 +981,8 @@ share/locale/cy/LC_MESSAGES/gnome-themes.mo
share/locale/da/LC_MESSAGES/gnome-themes.mo
share/locale/de/LC_MESSAGES/gnome-themes.mo
share/locale/el/LC_MESSAGES/gnome-themes.mo
+share/locale/en_CA/LC_MESSAGES/gnome-themes.mo
+share/locale/en_GB/LC_MESSAGES/gnome-themes.mo
share/locale/es/LC_MESSAGES/gnome-themes.mo
share/locale/et/LC_MESSAGES/gnome-themes.mo
share/locale/eu/LC_MESSAGES/gnome-themes.mo
@@ -945,6 +992,7 @@ share/locale/fr/LC_MESSAGES/gnome-themes.mo
share/locale/ga/LC_MESSAGES/gnome-themes.mo
share/locale/he/LC_MESSAGES/gnome-themes.mo
share/locale/hi/LC_MESSAGES/gnome-themes.mo
+share/locale/hr/LC_MESSAGES/gnome-themes.mo
share/locale/hu/LC_MESSAGES/gnome-themes.mo
share/locale/id/LC_MESSAGES/gnome-themes.mo
share/locale/is/LC_MESSAGES/gnome-themes.mo
@@ -971,7 +1019,6 @@ share/locale/sq/LC_MESSAGES/gnome-themes.mo
share/locale/sr/LC_MESSAGES/gnome-themes.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-themes.mo
share/locale/sv/LC_MESSAGES/gnome-themes.mo
-share/locale/ta/LC_MESSAGES/gnome-themes.mo
share/locale/th/LC_MESSAGES/gnome-themes.mo
share/locale/tr/LC_MESSAGES/gnome-themes.mo
share/locale/uk/LC_MESSAGES/gnome-themes.mo
@@ -1023,7 +1070,7 @@ share/themes/HighContrast/index.theme
share/themes/HighContrastInverse/gtk-2.0/gtkrc
share/themes/HighContrastInverse/index.theme
share/themes/HighContrastLargePrint/gtk-2.0/gtkrc
-share/themes/HighContrastLargePrint/index.theme~
+share/themes/HighContrastLargePrint/index.theme.disabled
share/themes/HighContrastLargePrint/pixmaps/double-click-maybe.png
share/themes/HighContrastLargePrint/pixmaps/double-click-off.png
share/themes/HighContrastLargePrint/pixmaps/double-click-on.png
@@ -1157,7 +1204,7 @@ share/themes/HighContrastLargePrint/pixmaps/volume-min.png
share/themes/HighContrastLargePrint/pixmaps/volume-mute.png
share/themes/HighContrastLargePrint/pixmaps/volume-zero.png
share/themes/HighContrastLargePrintInverse/gtk-2.0/gtkrc
-share/themes/HighContrastLargePrintInverse/index.theme~
+share/themes/HighContrastLargePrintInverse/index.theme.disabled
share/themes/HighContrastLargePrintInverse/pixmaps/double-click-maybe.png
share/themes/HighContrastLargePrintInverse/pixmaps/double-click-off.png
share/themes/HighContrastLargePrintInverse/pixmaps/double-click-on.png
@@ -1426,9 +1473,9 @@ share/themes/LargePrint/pixmaps/volume-mute.png
share/themes/LargePrint/pixmaps/volume-zero.png
share/themes/LighthouseBlue/gtk-2.0/gtkrc
share/themes/LowContrast/gtk-2.0/gtkrc
-share/themes/LowContrast/index.theme~
+share/themes/LowContrast/index.theme.disabled
share/themes/LowContrastLargePrint/gtk-2.0/gtkrc
-share/themes/LowContrastLargePrint/index.theme~
+share/themes/LowContrastLargePrint/index.theme.disabled
share/themes/LowContrastLargePrint/pixmaps/double-click-maybe.png
share/themes/LowContrastLargePrint/pixmaps/double-click-off.png
share/themes/LowContrastLargePrint/pixmaps/double-click-on.png
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index dbde4b8854eb..3566b9685b3b 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-engines2
PORTVERSION= 2.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_LIBTOOL_VER=13
USE_GNOME= gnomehack gtk20
-PLIST_SUB= VERSION=2.2.0
+PLIST_SUB= GTK_VERSION="2.4.0"
THEMES= metal redmond95
diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist
index 39f05f6c3a84..fb60fd7a4cfe 100644
--- a/x11-themes/gtk-engines2/pkg-plist
+++ b/x11-themes/gtk-engines2/pkg-plist
@@ -1,6 +1,6 @@
-lib/gtk-2.0/%%VERSION%%/engines/libmetal.so
-lib/gtk-2.0/%%VERSION%%/engines/libpixmap.so
-lib/gtk-2.0/%%VERSION%%/engines/libredmond95.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libmetal.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libredmond95.so
libdata/pkgconfig/gtk-engines-2.pc
share/themes/Metal/README.html
share/themes/Metal/gtk-2.0/gtkrc
@@ -8,6 +8,6 @@ share/themes/Redmond95/README.html
share/themes/Redmond95/gtk-2.0/gtkrc
@dirrm share/themes/Redmond95/gtk-2.0
@dirrm share/themes/Metal/gtk-2.0
-@dirrm lib/gtk-2.0/%%VERSION%%/engines
+@dirrm lib/gtk-2.0/%%GTK_VERSION%%/engines
@unexec /bin/rmdir %D/share/themes/Redmond95 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/share/themes/Metal 2>/dev/null || /usr/bin/true