6 files changed, 33 insertions, 25 deletions

diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index 0cebdcf58a4a..70cc4be9f230 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -3,22 +3,28 @@
 
 PORTNAME=	gtk-qt-engine
 PORTVERSION=	1.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	x11-themes
-MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ 2.x theme engine allowing to use Qt/KDE styles
 
-BROKEN=		Unfetchable (google code has gone away)
-DEPRECATED=	Unfetchable for more than six months (google code has gone away)
-EXPIRATION_DATE=	2017-04-30
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_GNOME=	gtk20
-USE_QT4=	corelib gui moc_build rcc_build uic_build qmake_build
-USES=		cmake gettext kde:4 pkgconfig tar:bzip2
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	davidsansome
+GH_TAGNAME=	0dc6c26
+
+USES=		cmake gettext kde:4 pkgconfig
+USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_KDE=	kdelibs automoc4
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_QT4=	dbus corelib gui moc_build rcc_build uic_build qmake_build svg
+USE_XORG=	x11
+WRKSRC_SUBDIR=	${PORTNAME}
 
 OPTIONS_DEFINE=	BONOBO
 BONOBO_DESC=	Better support for Bonobo (GNOME) framework
diff --git a/x11-themes/gtk-qt4-engine/distinfo b/x11-themes/gtk-qt4-engine/distinfo
index 9725c84d36a9..dbf727ed32d6 100644
--- a/x11-themes/gtk-qt4-engine/distinfo
+++ b/x11-themes/gtk-qt4-engine/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gtk-qt-engine-1.1.tar.bz2) = 4310f8f179c5ab70cea614a07b0c3e84234d05388dded85596200fa754c290a6
-SIZE (gtk-qt-engine-1.1.tar.bz2) = 58079
+TIMESTAMP = 1488750054
+SHA256 (davidsansome-gtk-qt-engine-1.1-0dc6c26_GH0.tar.gz) = 4e2e0ea791f78a92117b747450ed26d5426d3b8ed5511e19c5795efbd82b5827
+SIZE (davidsansome-gtk-qt-engine-1.1-0dc6c26_GH0.tar.gz) = 73657
diff --git a/x11-themes/gtk-qt4-engine/files/patch-kcm_gtk__CMakeLists.txt b/x11-themes/gtk-qt4-engine/files/patch-kcm_gtk__CMakeLists.txt
index 622bdc58c715..50681aa9cb12 100644
--- a/x11-themes/gtk-qt4-engine/files/patch-kcm_gtk__CMakeLists.txt
+++ b/x11-themes/gtk-qt4-engine/files/patch-kcm_gtk__CMakeLists.txt
@@ -1,6 +1,6 @@
---- ./kcm_gtk/CMakeLists.txt.orig	2008-03-11 04:30:19.000000000 +0300
-+++ ./kcm_gtk/CMakeLists.txt	2008-08-20 02:18:45.000000000 +0400
-@@ -16,7 +16,7 @@
+--- kcm_gtk/CMakeLists.txt.orig	2009-05-04 20:27:52 UTC
++++ kcm_gtk/CMakeLists.txt
+@@ -16,7 +16,7 @@ KDE4_ADD_UI_FILES(kcm_gtk4_SOURCES ${kcm
  
  KDE4_ADD_PLUGIN(kcm_gtk4 ${kcm_gtk4_SOURCES})
  
diff --git a/x11-themes/gtk-qt4-engine/files/patch-src__qt_theme_draw.c b/x11-themes/gtk-qt4-engine/files/patch-src__qt_theme_draw.c
index c28d93e3522e..f9a46516a29e 100644
--- a/x11-themes/gtk-qt4-engine/files/patch-src__qt_theme_draw.c
+++ b/x11-themes/gtk-qt4-engine/files/patch-src__qt_theme_draw.c
@@ -1,15 +1,9 @@
---- ./src/qt_theme_draw.c.orig	2008-03-11 01:30:19.000000000 +0000
-+++ ./src/qt_theme_draw.c	2013-03-28 12:45:32.271244758 +0000
-@@ -19,11 +19,12 @@
-  ***************************************************************************/
- 
- #include <math.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <gtk/gtkprogressbar.h>
+--- src/qt_theme_draw.c.orig	2009-05-04 20:27:52 UTC
++++ src/qt_theme_draw.c
+@@ -25,6 +25,7 @@
  #include <gdk/gdk.h>
  #include <gtk/gtk.h>
--#include <glib/glist.h>
+ #include <glib/glist.h>
 +#include <glib.h>
  
  #ifdef HAVE_BONOBO
diff --git a/x11-themes/gtk-qt4-engine/pkg-descr b/x11-themes/gtk-qt4-engine/pkg-descr
index fd5803c528fe..83e8f240902c 100644
--- a/x11-themes/gtk-qt4-engine/pkg-descr
+++ b/x11-themes/gtk-qt4-engine/pkg-descr
@@ -2,4 +2,4 @@ GTK-Qt theme engine allows GTK+ 2.x applications to use Qt4 styles
 so that they fit in more nicely with KDE desktop. The port also
 provides KDE 4 system settings module for GTK+ theme selection.
 
-WWW: http://code.google.com/p/gtk-qt-engine/
+WWW: https://github.com/davidsansome/gtk-qt-engine
diff --git a/x11-themes/gtk-qt4-engine/pkg-plist b/x11-themes/gtk-qt4-engine/pkg-plist
index 84137b4df2ac..d9a12b7a2ba9 100644
--- a/x11-themes/gtk-qt4-engine/pkg-plist
+++ b/x11-themes/gtk-qt4-engine/pkg-plist
@@ -7,9 +7,16 @@ 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/ko/LC_MESSAGES/gtkqtengine.mo
+share/locale/lt/LC_MESSAGES/gtkqtengine.mo
+share/locale/nl/LC_MESSAGES/gtkqtengine.mo
 share/locale/nn/LC_MESSAGES/gtkqtengine.mo
+share/locale/pt_BR/LC_MESSAGES/gtkqtengine.mo
+share/locale/ro/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/locale/uk/LC_MESSAGES/gtkqtengine.mo
+share/locale/zh_cn/LC_MESSAGES/gtkqtengine.mo
 %%LOCALBASE%%/lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqt4engine.so
 %%LOCALBASE%%/share/themes/Qt4/gtk-2.0/gtkrc