4 files changed, 25 insertions, 23 deletions

diff --git a/x11-themes/gtk-smooth-engine/Makefile b/x11-themes/gtk-smooth-engine/Makefile
index db99979dea76..bd22467a250f 100644
--- a/x11-themes/gtk-smooth-engine/Makefile
+++ b/x11-themes/gtk-smooth-engine/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtk-smooth-engine
-PORTVERSION=	0.5.6
-PORTREVISION=	1
+PORTVERSION=	0.5.8
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	smooth-engine
@@ -16,12 +15,12 @@ MAINTAINER=	amistry@am-productions.biz
 COMMENT=	Flexible GTK Theme Engine
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GNOME=	gnometarget
 WANT_GNOME=	yes
 CONFIGURE_ENV=	X11BASE="${X11BASE}"
 
-CONFLICTS=	gnome-themes-extras-*
+CONFLICTS=	gnome-themes-extras-[0-9]*
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-themes/gtk-smooth-engine/distinfo b/x11-themes/gtk-smooth-engine/distinfo
index b51f57e85cdb..a83e940fbbfb 100644
--- a/x11-themes/gtk-smooth-engine/distinfo
+++ b/x11-themes/gtk-smooth-engine/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk-smooth-engine-0.5.6.tar.gz) = f2d3e1f85652db8e77c725e7b73cff4f
-SIZE (gtk-smooth-engine-0.5.6.tar.gz) = 266925
+MD5 (gtk-smooth-engine-0.5.8.tar.gz) = 7b4aebf85040b357124de926807dc22a
+SIZE (gtk-smooth-engine-0.5.8.tar.gz) = 365680
diff --git a/x11-themes/gtk-smooth-engine/files/patch-configure b/x11-themes/gtk-smooth-engine/files/patch-configure
index a2843d3b1525..2d5297e692b2 100644
--- a/x11-themes/gtk-smooth-engine/files/patch-configure
+++ b/x11-themes/gtk-smooth-engine/files/patch-configure
@@ -1,14 +1,6 @@
---- configure.orig	Tue Dec 16 17:35:58 2003
-+++ configure	Sat Jan  3 18:50:45 2004
-@@ -7997,6 +7997,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'
-@@ -8050,7 +8051,7 @@
+--- configure.orig	Sun Oct 17 02:11:36 2004
++++ configure	Sun Oct 17 02:15:38 2004
+@@ -19381,7 +19382,7 @@
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -17,7 +9,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-@@ -8101,7 +8102,7 @@
+@@ -19432,7 +19433,7 @@
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
diff --git a/x11-themes/gtk-smooth-engine/files/patch-gtk1_gtk1_patches.c b/x11-themes/gtk-smooth-engine/files/patch-gtk1_gtk1_patches.c
index 2358ab57a5a2..1ff67a034aef 100644
--- a/x11-themes/gtk-smooth-engine/files/patch-gtk1_gtk1_patches.c
+++ b/x11-themes/gtk-smooth-engine/files/patch-gtk1_gtk1_patches.c
@@ -1,14 +1,25 @@
---- gtk1/gtk1_patches.c.orig	Sat Jan  3 18:40:36 2004
-+++ gtk1/gtk1_patches.c	Sat Jan  3 18:41:07 2004
-@@ -1197,6 +1197,7 @@
+--- gtk1/gtk1_patches.c.orig	Sun Oct 17 02:18:35 2004
++++ gtk1/gtk1_patches.c	Sun Oct 17 02:21:21 2004
+@@ -934,6 +934,8 @@
+     slider_length = SCALE_SLIDER_LENGTH(widget->style);    
+   }
+ 
++  
++
+   _scale_calc_request (widget, slider_width, slider_length, stepper_size, trough_border, stepper_spacing, &range_rect);
+ 
+   requisition->width = MAX(requisition->width, range_rect.width);
+@@ -1214,7 +1216,8 @@
    GtkRange *range;
    gint slider_width, slider_length, stepper_size, trough_border, stepper_spacing;
    GdkRectangle range_rect;
+-    
 +  int size1, size2;
-     
++  
    g_return_if_fail (widget != NULL);
    g_return_if_fail (GTK_IS_SCROLLBAR (widget));
-@@ -1212,8 +1213,8 @@
+   g_return_if_fail (requisition != NULL);
+@@ -1229,8 +1232,8 @@
      slider_length = SCROLLBAR_MIN_SLIDER_LENGTH(widget->style);    
    }