4 files changed, 32 insertions, 35 deletions

diff --git a/x11-themes/gtk-qt-engine/Makefile b/x11-themes/gtk-qt-engine/Makefile
index 691f71d53829..87ab9c21a049 100644
--- a/x11-themes/gtk-qt-engine/Makefile
+++ b/x11-themes/gtk-qt-engine/Makefile
@@ -6,50 +6,41 @@
 #
 
 PORTNAME=	gtk-qt-engine
-PORTVERSION=	0.7
-PORTREVISION=	6
+PORTVERSION=	0.8
+PORTREVISION=	# zero
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://gtk-qt.ecs.soton.ac.uk/files/${PORTVERSION}/ \
 		http://freebsd.ricin.com/ports/distfiles/
 
 MAINTAINER=	danny@ricin.com
-COMMENT=	GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
+COMMENT=	GTK-QT Theme Engine allows GTK2 apps to use QT/KDE themes
 
-LIB_DEPENDS=	kdecore:${PORTSDIR}/x11/kdelibs3
+BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gtk20
 USE_QT_VER=	3
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+USE_KDEBASE_VER=3
+HAS_CONFIGURE=	yes
 
 OPTIONS=	LIBBONOBOUI "Install libbonoboui if missing" off
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+CMAKE?=		${LOCALBASE}/bin/cmake
+CMAKE_ARGS=	-DCMAKE_C_COMPILER:STRING="${CC}"\
+		-DCMAKE_CXX_COMPILER:STRING="${CXX}"\
+		-DCMAKE_C_FLAGS:STRING="${CFLAGS}"\
+		-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}"
+
 .include <bsd.port.pre.mk>
 
-# Note: had to turn off libbonoboui (dependency) OPTION for technical reasons
-# So a "vanilla" package will have no libbonoboui support
 .if defined(WITH_LIBBONOBOUI)
 USE_GNOME+=	libbonoboui
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|GTK_LIBPREFIX)/gtk|PREFIX)/lib/gtk|" \
-		${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e "s|GTK_PREFIX)/share|PREFIX)/share|g" \
-		${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e "s|/usr/lib/menu|${WRKDIR}/menu|g" \
-		${WRKSRC}/kcm_gtk/Makefile.in
-	@${REINPLACE_CMD} -e \
-		"s|/usr/share/applications|${PREFIX}/share/applications/kde|g" \
-		${WRKSRC}/kcm_gtk/Makefile.in
-
-post-install:
-	@${RM} -r ${WRKDIR}/menu
-	@${RM} ${PREFIX}/share/applnk/Settings/LookNFeel/kcmgtk.desktop
+do-configure:
+	cd ${WRKSRC} && ${CMAKE} ${CMAKE_ARGS} .
 
 .include <bsd.port.post.mk>
diff --git a/x11-themes/gtk-qt-engine/distinfo b/x11-themes/gtk-qt-engine/distinfo
index 8adb35a86787..8b2df70652b0 100644
--- a/x11-themes/gtk-qt-engine/distinfo
+++ b/x11-themes/gtk-qt-engine/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtk-qt-engine-0.7.tar.bz2) = 27ca211621f38c45b1c4c9e9ef1f84b0
-SHA256 (gtk-qt-engine-0.7.tar.bz2) = cfaac46c409984afbcf46979f728515535725e8c83bdf70277f23dde068daaee
-SIZE (gtk-qt-engine-0.7.tar.bz2) = 439794
+MD5 (gtk-qt-engine-0.8.tar.bz2) = 9fe75b7765b6a5b49901fcd6f4f4aa4b
+SHA256 (gtk-qt-engine-0.8.tar.bz2) = 6658bdbd3f2120d34f5c59b5bc3cfed5ef83a2aa8572d775483aa304396b0d45
+SIZE (gtk-qt-engine-0.8.tar.bz2) = 59472
diff --git a/x11-themes/gtk-qt-engine/pkg-descr b/x11-themes/gtk-qt-engine/pkg-descr
index 622ce904b686..57c143032b06 100644
--- a/x11-themes/gtk-qt-engine/pkg-descr
+++ b/x11-themes/gtk-qt-engine/pkg-descr
@@ -1,4 +1,4 @@
-GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
+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.
 
diff --git a/x11-themes/gtk-qt-engine/pkg-plist b/x11-themes/gtk-qt-engine/pkg-plist
index 88d96799c82a..2839c55702ac 100644
--- a/x11-themes/gtk-qt-engine/pkg-plist
+++ b/x11-themes/gtk-qt-engine/pkg-plist
@@ -1,16 +1,22 @@
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtengine.a
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtengine.la
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtengine.so
-lib/kde3/kcm_kcmgtk.a
 lib/kde3/kcm_kcmgtk.la
 lib/kde3/kcm_kcmgtk.so
-share/gtk-qt-engine/kde-index.theme
-share/applications/kde/kcmgtk-xdg.desktop
+share/applications/kcmgtk.desktop
+share/locale/bg/LC_MESSAGES/gtkqtengine.mo
 share/locale/de/LC_MESSAGES/gtkqtengine.mo
 share/locale/es/LC_MESSAGES/gtkqtengine.mo
 share/locale/fr/LC_MESSAGES/gtkqtengine.mo
+share/locale/it/LC_MESSAGES/gtkqtengine.mo
 share/locale/nn/LC_MESSAGES/gtkqtengine.mo
+share/locale/ru/LC_MESSAGES/gtkqtengine.mo
+share/locale/sv/LC_MESSAGES/gtkqtengine.mo
+share/locale/tr/LC_MESSAGES/gtkqtengine.mo
 share/themes/Qt/gtk-2.0/gtkrc
 @dirrm share/themes/Qt/gtk-2.0
 @dirrm share/themes/Qt
-@dirrm share/gtk-qt-engine
+@dirrmtry share/themes
+@dirrmtry share/applications
+@dirrmtry lib/kde3
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
+@dirrmtry lib/gtk-2.0