9 files changed, 71 insertions, 149 deletions

diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index d7a10eebcd36..f331a6bff785 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -6,35 +6,45 @@
 #
 
 PORTNAME=	gtk-qt-engine
-PORTVERSION=	0.3
+PORTVERSION=	0.5
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.freedesktop.org/Software/gtk-qt/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The GTK-QT Theme Engine allows GTK2 to use QT widget styles
+MAINTAINER=	danny@ricin.com
+COMMENT=	GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
-WANT_GNOME=	no
+USE_LIBTOOL_VER=	15
 USE_GNOME=	gnomehack gtk20
+USE_KDELIBS_VER=3
 USE_QT_VER=	3
 USE_REINPLACE=	yes
 
 PLIST_SUB=	GTK_VER=2.4.0
-
-PKGMESSAGE=	${WRKDIR}/pkg-message
+PLIST_SUB+=	X11BASE=${X11BASE} LOCALBASE=${LOCALBASE}
 
 pre-configure:
-	@${RM} -f ${WRKSRC}/config.cache
-	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s|/share/themes/|/X11R6/share/themes/|" \
+		${WRKSRC}/kcm_gtk/kcmgtk.cpp
+
+post-configure:
+	@${REINPLACE_CMD} -e "s|/usr/lib/menu|/tmp/menu|" \
+		${WRKSRC}/kcm_gtk/Makefile
+	@${REINPLACE_CMD} -e \
+		"s|/usr/share/applications|${LOCALBASE}/share/applications/kde|" \
+		${WRKSRC}/kcm_gtk/Makefile
 
 post-install:
-	@${ECHO_MSG}
-	@${SED} -e "s:/usr/X11R6:${PREFIX}:" ${FILESDIR}/pkg-message.in	\
-		> ${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+	@# Remove Debian stuff we didn't want in the first place
+	@${RM} /tmp/menu/kcmgtk.menu
+	@if [ "`ls /tmp/menu`" = "" ]; then ${RMDIR} /tmp/menu; fi
+	@# We do want this archive!
+	@${INSTALL_DATA} ${WRKSRC}/kcm_gtk/kcm_kcmgtk.la ${LOCALBASE}/lib/kde3/
+	@${ECHO}
+	@${ECHO} "Use \"GTK styles and fonts\" from the KDE control center to set or"
+	@${ECHO} "change the GTK style. NOTE: this will overwrite your ~/.gtkrc-2.0."
+	@${ECHO}
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-qt4-engine/distinfo b/x11-themes/gtk-qt4-engine/distinfo
index 21cd5e7e6047..3c85e7249c85 100644
--- a/x11-themes/gtk-qt4-engine/distinfo
+++ b/x11-themes/gtk-qt4-engine/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk-qt-engine-0.3.tar.bz2) = 0685783bec472b682366f213134a6b3c
-SIZE (gtk-qt-engine-0.3.tar.bz2) = 170845
+MD5 (gtk-qt-engine-0.5.tar.bz2) = c1952ac83bccb6a07fc16afd02718499
+SIZE (gtk-qt-engine-0.5.tar.bz2) = 476677
diff --git a/x11-themes/gtk-qt4-engine/files/patch-configure b/x11-themes/gtk-qt4-engine/files/patch-configure
deleted file mode 100644
index f5fb108707f1..000000000000
--- a/x11-themes/gtk-qt4-engine/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.orig	Sun May 30 23:55:02 2004
-+++ configure	Sun May 30 23:57:33 2004
-@@ -5733,12 +5733,15 @@
- 
- # 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'
- 
--# Prevent multiple expansion
-+# We have pkg-config in /usr/local, while gtk stuff is /usr/X11R6
-+PKG_CONFIG=%%LOCALBASE%%/bin/pkg-config
- 
-+# Prevent multiple expansion
- 
- 
- 
-@@ -5790,7 +5793,11 @@
-      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-   else
-      PKG_CONFIG_MIN_VERSION=0.9.0
--     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+     # This seems to just decide that 0.9.0 > 0.15.0 which is not helpful
-+     #if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+     VER=`$PKG_CONFIG --version | sed s/"\."//g`
-+     MINVER=090
-+     if [ $VER -ge $MINVER ]; then
-         echo $ac_n "checking for gtk+-2.0 >= 2.0.0""... $ac_c" 1>&6
- echo "configure:5796: checking for gtk+-2.0 >= 2.0.0" >&5
- 
diff --git a/x11-themes/gtk-qt4-engine/files/patch-makefile.in b/x11-themes/gtk-qt4-engine/files/patch-makefile.in
deleted file mode 100644
index e46ca6a3751e..000000000000
--- a/x11-themes/gtk-qt4-engine/files/patch-makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Mon Feb 23 16:14:53 2004
-+++ Makefile.in	Mon Feb 23 16:35:40 2004
-@@ -83,7 +83,7 @@
- 
- SUBDIRS = Theme
- 
--QTDIR = /usr/lib/qt3
-+QTDIR = $(PREFIX)
- 
- INCLUDES = $(QTENGINE_CFLAGS) -I$(QTDIR)/include/
- 
diff --git a/x11-themes/gtk-qt4-engine/files/patch-qt_qt_wrapper.cpp b/x11-themes/gtk-qt4-engine/files/patch-qt_qt_wrapper.cpp
new file mode 100644
index 000000000000..ab06799d6a33
--- /dev/null
+++ b/x11-themes/gtk-qt4-engine/files/patch-qt_qt_wrapper.cpp
@@ -0,0 +1,10 @@
+--- src/qt_qt_wrapper.cpp.orig	Sun Nov  7 14:47:15 2004
++++ src/qt_qt_wrapper.cpp	Sun Nov  7 14:47:30 2004
+@@ -5,7 +5,6 @@
+ #include <qimage.h>
+ #include <qstylefactory.h>
+ #include <kapplication.h>
+-#include <kcmdlineargs.h>
+ #include <qtabbar.h>
+ #include <qcheckbox.h>
+ #include <qradiobutton.h>
diff --git a/x11-themes/gtk-qt4-engine/files/patch-qt_theme_draw.c b/x11-themes/gtk-qt4-engine/files/patch-qt_theme_draw.c
index a0d3b600d86b..5ab7e959dc9d 100644
--- a/x11-themes/gtk-qt4-engine/files/patch-qt_theme_draw.c
+++ b/x11-themes/gtk-qt4-engine/files/patch-qt_theme_draw.c
@@ -1,78 +1,24 @@
---- qt_theme_draw.c.orig	Mon May 31 01:16:28 2004
-+++ qt_theme_draw.c	Mon May 31 03:19:50 2004
-@@ -257,6 +256,9 @@
- 	    gint          height)
- {
- 
-+GdkGC *gc1 = NULL;
-+GdkGC *gc2 = NULL;
-+
- if (!widget) return;
- 
-   sanitize_size(window, &width, &height);
-@@ -300,8 +302,6 @@
-   }
- 
-   return;
--  GdkGC *gc1 = NULL;
--  GdkGC *gc2 = NULL;
- 
-   g_return_if_fail(style != NULL);
-   g_return_if_fail(window != NULL);
-@@ -687,9 +687,6 @@
-            GtkArrowType arrow_type,
-            gint fill, gint x, gint y, gint width, gint height)
- {
--  if (DETAIL("hscrollbar") || DETAIL("vscrollbar"))
--    return;
--  /*printf("Arrow (%d,%d,%d,%d) Widget: %s  Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
-   GdkGC              *gc1;
-   GdkGC              *gc2;
-   GdkGC              *gc3;
-@@ -698,6 +695,10 @@
-   gint                half_height;
-   gint                ax, ay, aw, ah;
- 
-+  if (DETAIL("hscrollbar") || DETAIL("vscrollbar"))
-+    return;
-+  /*printf("Arrow (%d,%d,%d,%d) Widget: %s  Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
-+
-   g_return_if_fail(style != NULL);
-   g_return_if_fail(window != NULL);
- 
-@@ -1095,7 +1096,10 @@
- 	gint y,
- 	gint width,
- 	gint height)
--{
-+{	
-+	GdkGC *light_gc, *dark_gc;
-+	GtkOrientation      orientation;
-+
- 	sanitize_size(window, &width, &height);
- 	/*printf("Box (%d,%d,%d,%d) Widget: %s  Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
- 	if (WIDGET("GtkHScrollbar") || WIDGET("GtkVScrollbar"))
-@@ -1136,9 +1140,6 @@
- 	
- 	/*printf("Box (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
- 	
--	GdkGC *light_gc, *dark_gc;
--	GtkOrientation      orientation;
--	
- 	g_return_if_fail(style != NULL);
- 	g_return_if_fail(window != NULL);
- 	
-@@ -1716,12 +1717,12 @@
-             gint height,
-             GtkOrientation orientation)
- {
--  return;
-   GdkPoint pointsh[7];
-   GdkRegion *clipreg;
-   GdkRectangle rec;
-   int i, rect = FALSE, midlines = MARKS_SLASH;
-   int modx, mody;
-+  return;
- 
- 
-   g_return_if_fail(style != NULL);
+--- src/qt_theme_draw.c.orig	Sun Nov  7 13:41:29 2004
++++ src/qt_theme_draw.c	Sun Nov  7 13:55:19 2004
+@@ -625,17 +625,18 @@
+ 	if (DETAIL("tooltip"))
+ 	{
+ 		GdkColor tooltipColor;
++		GdkGC* tooltipGc;
++                GdkGCValues gc_values;
++                GdkGCValuesMask gc_values_mask;
+ 		tooltipColor.red = 255*257;
+ 		tooltipColor.green = 255*257;
+ 		tooltipColor.blue = 220*257;
+ 		gdk_colormap_alloc_color(style->colormap, &tooltipColor, FALSE, TRUE);
+ 		
+-		GdkGCValues gc_values;
+-		GdkGCValuesMask gc_values_mask;
+ 		gc_values_mask = GDK_GC_FOREGROUND;
+ 		gc_values.foreground = tooltipColor;
+ 		
+-		GdkGC* tooltipGc = (GdkGC*) gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
++		tooltipGc = (GdkGC*) gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
+ 		gdk_draw_rectangle(window, tooltipGc, TRUE, x, y, width, height);
+ 		gdk_draw_rectangle(window, style->black_gc, FALSE, x, y, width - 1, height - 1);
+ 		
diff --git a/x11-themes/gtk-qt4-engine/files/pkg-message.in b/x11-themes/gtk-qt4-engine/files/pkg-message.in
deleted file mode 100644
index 8ba3b9ec025d..000000000000
--- a/x11-themes/gtk-qt4-engine/files/pkg-message.in
+++ /dev/null
@@ -1,7 +0,0 @@
-=====================================================
-NOTE: Add the following line to your ~/.gtkrc-2.0 :
-
-include "/usr/X11R6/share/themes/Qt/gtk-2.0/gtkrc"
-
-More info: http://www.freedesktop.org/Software/gtk-qt
-=====================================================
diff --git a/x11-themes/gtk-qt4-engine/pkg-descr b/x11-themes/gtk-qt4-engine/pkg-descr
index f43a68afb960..6a323864567c 100644
--- a/x11-themes/gtk-qt4-engine/pkg-descr
+++ b/x11-themes/gtk-qt4-engine/pkg-descr
@@ -1,5 +1,7 @@
-The GTK-QT Theme Engine allows GTK2 to use QT widget styles.
+GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
+so that they fit in more nicely with KDE. Includes a KDE
+control center module for GTK theme selection.
 
 WWW: http://www.freedesktop.org/Software/gtk-qt
 
-David Sansome <me@davidsansome.com>
+Author: David Sansome <me@davidsansome.com>
diff --git a/x11-themes/gtk-qt4-engine/pkg-plist b/x11-themes/gtk-qt4-engine/pkg-plist
index c02239dd5d11..f2bd307386a6 100644
--- a/x11-themes/gtk-qt4-engine/pkg-plist
+++ b/x11-themes/gtk-qt4-engine/pkg-plist
@@ -1,7 +1,11 @@
+lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.a
 lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.so
-libdata/pkgconfig/gtk-qt-engine-2.pc
-share/themes/Qt/ICON.png
-share/themes/Qt/README.html
 share/themes/Qt/gtk-2.0/gtkrc
+@cwd %%LOCALBASE%%
+lib/kde3/kcm_kcmgtk.la
+lib/kde3/kcm_kcmgtk.so
+share/applnk/Settings/LookNFeel/kcmgtk.desktop
+share/applications/kde/kcmgtk-xdg.desktop
+@cwd %%X11BASE%%
 @dirrm share/themes/Qt/gtk-2.0
 @dirrm share/themes/Qt