4 files changed, 25 insertions, 89 deletions

diff --git a/x11-toolkits/gnome-themes/Makefile b/x11-toolkits/gnome-themes/Makefile
index 18d28258364d..0a6fe90fa29e 100644
--- a/x11-toolkits/gnome-themes/Makefile
+++ b/x11-toolkits/gnome-themes/Makefile
@@ -6,27 +6,25 @@
 #
 
 PORTNAME=	gnome-themes
-PORTVERSION=	2.2.2
+PORTVERSION=	2.4.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A collection of themes and icons for GNOME 2 designed for accessibility
 
-BUILD_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine \
-		${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2
-RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine \
-		${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomehack metacity
+USE_GNOME=	gnomehack metacity libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-	       	LIBS="-L${LOCALBASE}/lib"
+	       	LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/x11-toolkits/gnome-themes/distinfo b/x11-toolkits/gnome-themes/distinfo
index 71091d975407..def286a7c89e 100644
--- a/x11-toolkits/gnome-themes/distinfo
+++ b/x11-toolkits/gnome-themes/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-themes-2.2.2.tar.bz2) = 41095ed3c7d8a6f761d92a1bc13bfdb0
+MD5 (gnome2/gnome-themes-2.4.0.tar.bz2) = 57ae1cf8a8bac1a461310f26347605e6
diff --git a/x11-toolkits/gnome-themes/files/patch-configure b/x11-toolkits/gnome-themes/files/patch-configure
index 2a763b11ffe5..3a3c068040c5 100644
--- a/x11-toolkits/gnome-themes/files/patch-configure
+++ b/x11-toolkits/gnome-themes/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed Mar 12 07:49:35 2003
-+++ configure	Thu Mar 13 23:50:27 2003
-@@ -7641,6 +7641,7 @@
+--- 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"
@@ -8,80 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7707,22 +7708,16 @@
-         echo "$as_me:$LINENO: checking for gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0" >&5
-+		  gtk-thinice-engine-2" >&5
- echo $ECHO_N "checking for gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0... $ECHO_C" >&6
-+		  gtk-thinice-engine-2... $ECHO_C" >&6
- 
-         if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0" ; then
-+		  gtk-thinice-engine-2" ; then
-             echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-             succeeded=yes
-@@ -7732,9 +7727,7 @@
-             GTKTHEME_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0"`
-+		  gtk-thinice-engine-2"`
-             echo "$as_me:$LINENO: result: $GTKTHEME_CFLAGS" >&5
- echo "${ECHO_T}$GTKTHEME_CFLAGS" >&6
- 
-@@ -7743,9 +7736,7 @@
-             GTKTHEME_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0"`
-+		  gtk-thinice-engine-2"`
-             echo "$as_me:$LINENO: result: $GTKTHEME_LIBS" >&5
- echo "${ECHO_T}$GTKTHEME_LIBS" >&6
-         else
-@@ -7756,9 +7747,7 @@
-             GTKTHEME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0"`
-+		  gtk-thinice-engine-2"`
-             echo $GTKTHEME_PKG_ERRORS
-         fi
- 
-@@ -7776,15 +7765,11 @@
-      { { echo "$as_me:$LINENO: error: Library requirements (gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-+		  gtk-thinice-engine-2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
- echo "$as_me: error: Library requirements (gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+		  gtk-thinice-engine-2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- 
diff --git a/x11-toolkits/gnome-themes/pkg-plist b/x11-toolkits/gnome-themes/pkg-plist
index e87b8bcc477d..44fb48c7ec8d 100644
--- a/x11-toolkits/gnome-themes/pkg-plist
+++ b/x11-toolkits/gnome-themes/pkg-plist
@@ -2,6 +2,7 @@ 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
 share/eazel-engine/arrow_down-spinner.png
 share/eazel-engine/arrow_down.png
 share/eazel-engine/arrow_left.png
@@ -931,6 +932,7 @@ share/locale/bg/LC_MESSAGES/gnome-themes.mo
 share/locale/bn/LC_MESSAGES/gnome-themes.mo
 share/locale/ca/LC_MESSAGES/gnome-themes.mo
 share/locale/cs/LC_MESSAGES/gnome-themes.mo
+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
@@ -939,15 +941,20 @@ share/locale/et/LC_MESSAGES/gnome-themes.mo
 share/locale/fa/LC_MESSAGES/gnome-themes.mo
 share/locale/fi/LC_MESSAGES/gnome-themes.mo
 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/hu/LC_MESSAGES/gnome-themes.mo
 share/locale/id/LC_MESSAGES/gnome-themes.mo
+share/locale/is/LC_MESSAGES/gnome-themes.mo
 share/locale/it/LC_MESSAGES/gnome-themes.mo
 share/locale/ja/LC_MESSAGES/gnome-themes.mo
 share/locale/ko/LC_MESSAGES/gnome-themes.mo
+share/locale/li/LC_MESSAGES/gnome-themes.mo
+share/locale/lt/LC_MESSAGES/gnome-themes.mo
 share/locale/lv/LC_MESSAGES/gnome-themes.mo
 share/locale/mk/LC_MESSAGES/gnome-themes.mo
+share/locale/ml/LC_MESSAGES/gnome-themes.mo
 share/locale/mn/LC_MESSAGES/gnome-themes.mo
 share/locale/ms/LC_MESSAGES/gnome-themes.mo
 share/locale/nl/LC_MESSAGES/gnome-themes.mo
@@ -967,6 +974,7 @@ share/locale/th/LC_MESSAGES/gnome-themes.mo
 share/locale/tr/LC_MESSAGES/gnome-themes.mo
 share/locale/uk/LC_MESSAGES/gnome-themes.mo
 share/locale/vi/LC_MESSAGES/gnome-themes.mo
+share/locale/wa/LC_MESSAGES/gnome-themes.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-themes.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-themes.mo
 share/themes/Crux/gtk-2.0/gtkrc
@@ -1024,6 +1032,7 @@ share/themes/HighContrastLargePrint/pixmaps/media-next.png
 share/themes/HighContrastLargePrint/pixmaps/media-pause.png
 share/themes/HighContrastLargePrint/pixmaps/media-play.png
 share/themes/HighContrastLargePrint/pixmaps/media-prev.png
+share/themes/HighContrastLargePrint/pixmaps/media-record.png
 share/themes/HighContrastLargePrint/pixmaps/media-stop.png
 share/themes/HighContrastLargePrint/pixmaps/printer-broken.png
 share/themes/HighContrastLargePrint/pixmaps/printer-default.png
@@ -1157,6 +1166,7 @@ share/themes/HighContrastLargePrintInverse/pixmaps/media-next.png
 share/themes/HighContrastLargePrintInverse/pixmaps/media-pause.png
 share/themes/HighContrastLargePrintInverse/pixmaps/media-play.png
 share/themes/HighContrastLargePrintInverse/pixmaps/media-prev.png
+share/themes/HighContrastLargePrintInverse/pixmaps/media-record.png
 share/themes/HighContrastLargePrintInverse/pixmaps/media-stop.png
 share/themes/HighContrastLargePrintInverse/pixmaps/printer-broken.png
 share/themes/HighContrastLargePrintInverse/pixmaps/printer-default.png
@@ -1290,6 +1300,7 @@ share/themes/LargePrint/pixmaps/media-next.png
 share/themes/LargePrint/pixmaps/media-pause.png
 share/themes/LargePrint/pixmaps/media-play.png
 share/themes/LargePrint/pixmaps/media-prev.png
+share/themes/LargePrint/pixmaps/media-record.png
 share/themes/LargePrint/pixmaps/media-stop.png
 share/themes/LargePrint/pixmaps/printer-broken.png
 share/themes/LargePrint/pixmaps/printer-default.png
@@ -1426,6 +1437,7 @@ share/themes/LowContrastLargePrint/pixmaps/media-next.png
 share/themes/LowContrastLargePrint/pixmaps/media-pause.png
 share/themes/LowContrastLargePrint/pixmaps/media-play.png
 share/themes/LowContrastLargePrint/pixmaps/media-prev.png
+share/themes/LowContrastLargePrint/pixmaps/media-record.png
 share/themes/LowContrastLargePrint/pixmaps/media-stop.png
 share/themes/LowContrastLargePrint/pixmaps/printer-broken.png
 share/themes/LowContrastLargePrint/pixmaps/printer-default.png
@@ -1575,8 +1587,11 @@ share/themes/Smokey-Blue/gtk-2.0/lines_background_blue.png
 share/themes/Smokey-Blue/gtk-2.0/option1.png
 share/themes/Smokey-Blue/gtk-2.0/option2.png
 share/themes/Smokey-Blue/index.theme
+share/themes/ThinIce/gtk-2.0/gtkrc
 share/themes/Traditional/index.theme
 @dirrm share/themes/Traditional
+@dirrm share/themes/ThinIce/gtk-2.0
+@dirrm share/themes/ThinIce
 @dirrm share/themes/Smokey-Blue/gtk-2.0
 @dirrm share/themes/Smokey-Blue
 @dirrm share/themes/Simple/gtk-2.0