Update to 2.3.2.1. It looks like it's now safe to re-enable libgnomeui

support as none of the Gtk+ themes are linked against it.  However, if
someone sees undefined pthread symbols when running a pure Gtk+ app,
let me know.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@764 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 12 insertions, 83 deletions

diff --git a/x11-toolkits/gnome-themes/Makefile b/x11-toolkits/gnome-themes/Makefile
index d0754bc42..73a5b7a3d 100644
--- a/x11-toolkits/gnome-themes/Makefile
+++ b/x11-toolkits/gnome-themes/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome-themes
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.2.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
@@ -24,7 +24,7 @@ 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"
 
diff --git a/x11-toolkits/gnome-themes/distinfo b/x11-toolkits/gnome-themes/distinfo
index ac52bc03c..07c0c042e 100644
--- a/x11-toolkits/gnome-themes/distinfo
+++ b/x11-toolkits/gnome-themes/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-themes-2.3.2.tar.bz2) = a5c1bfe264a1e5fed39215ef568808bf
+MD5 (gnome2/gnome-themes-2.3.2.1.tar.bz2) = 673d9a8e87108740b9c2f0b8444fedd0
diff --git a/x11-toolkits/gnome-themes/files/patch-configure b/x11-toolkits/gnome-themes/files/patch-configure
index 2a763b11f..3a3c06804 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 2f4a8c41b..06ccccd61 100644
--- a/x11-toolkits/gnome-themes/pkg-plist
+++ b/x11-toolkits/gnome-themes/pkg-plist
@@ -1,4 +1,5 @@
 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
 share/eazel-engine/arrow_down-spinner.png
@@ -930,6 +931,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,8 +941,10 @@ 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/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
@@ -959,6 +963,8 @@ share/locale/ru/LC_MESSAGES/gnome-themes.mo
 share/locale/sk/LC_MESSAGES/gnome-themes.mo
 share/locale/sl/LC_MESSAGES/gnome-themes.mo
 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/th/LC_MESSAGES/gnome-themes.mo
 share/locale/tr/LC_MESSAGES/gnome-themes.mo