- Update to 1.1

6 files changed, 46 insertions, 15 deletions

diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index f2acdab5ddcb..507903ac1dcf 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	pokerth
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.0
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 DISTNAME=	PokerTH-${PORTVERSION}-src
 
 MAINTAINER=	madpilot@FreeBSD.org
diff --git a/games/pokerth/distinfo b/games/pokerth/distinfo
index 321c8847dd4f..2ac8eb2f887a 100644
--- a/games/pokerth/distinfo
+++ b/games/pokerth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PokerTH-1.0.1-src.tar.bz2) = 29c359028a27fad0d30e11a9295e610593d23e34bffdb71de488f63f459e3d5d
-SIZE (PokerTH-1.0.1-src.tar.bz2) = 19201790
+SHA256 (PokerTH-1.1-src.tar.bz2) = 4a8c806c91b68bfaf7e705ca5964848b5f4b8a8da0abd7ce5f2d832068da41ea
+SIZE (PokerTH-1.1-src.tar.bz2) = 19325357
diff --git a/games/pokerth/files/patch-pokerth_game.pro b/games/pokerth/files/patch-pokerth_game.pro
index 49538dd24219..63effb3d2fb0 100644
--- a/games/pokerth/files/patch-pokerth_game.pro
+++ b/games/pokerth/files/patch-pokerth_game.pro
@@ -1,25 +1,26 @@
---- pokerth_game.pro.orig	2013-04-07 14:04:26.923209000 +0200
-+++ pokerth_game.pro	2013-09-05 12:07:44.416793690 +0200
-@@ -407,8 +407,7 @@
- 	LIBPATH += lib
+--- pokerth_game.pro.orig	2013-12-22 17:58:01.933816000 +0100
++++ pokerth_game.pro	2013-12-23 12:19:53.142695431 +0100
+@@ -406,9 +406,7 @@
+ 	QMAKE_LIBDIR += lib
  	!android{
  		LIBPATH += $${PREFIX}/lib /opt/gsasl/lib
 -		LIB_DIRS = $${PREFIX}/lib \
--			$${PREFIX}/lib64
+-			$${PREFIX}/lib64 \
+-			$$system(qmake -query QT_INSTALL_LIBS)
 +		LIB_DIRS = $${PREFIX}/lib
  	}
  	android{
- 		LIBPATH += $${PREFIX}/lib/armv5
-@@ -427,7 +426,7 @@
+ 		LIBPATH += $${PREFIX}/lib/armv7
+@@ -427,7 +425,7 @@
  	BOOST_RANDOM = boost_random \
  		boost_random-mt
  
--	# searching in $PREFIX/lib and $PREFIX/lib64
+-	# searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS)
 +	# searching in $PREFIX/lib
  	# to override the default '/usr' pass PREFIX
  	# variable to qmake.
  	for(dir, LIB_DIRS):exists($$dir) {
-@@ -501,7 +500,7 @@
+@@ -501,7 +499,7 @@
  		LIBS += -lSDL \
  				-lSDL_mixer \
  			-lgsasl
diff --git a/games/pokerth/files/patch-src-gui-qt-chattools-chattools.h b/games/pokerth/files/patch-src-gui-qt-chattools-chattools.h
new file mode 100644
index 000000000000..3817a5903f46
--- /dev/null
+++ b/games/pokerth/files/patch-src-gui-qt-chattools-chattools.h
@@ -0,0 +1,14 @@
+--- src/gui/qt/chattools/chattools.h.orig	2013-12-22 17:58:01.952816000 +0100
++++ src/gui/qt/chattools/chattools.h	2013-12-23 12:50:56.420547009 +0100
+@@ -33,8 +33,10 @@
+ 
+ #include <string>
+ #include <QtCore>
+-#include <QtWidgets>
+ #include <QtGui>
++#if QT_VERSION >= 0x050000
++#include <QtWidgets>
++#endif
+ #include <boost/shared_ptr.hpp>
+ 
+ enum ChatType { INET_LOBBY_CHAT, LAN_LOBBY_CHAT, INGAME_CHAT };
diff --git a/games/pokerth/files/patch-src-pokerth.cpp b/games/pokerth/files/patch-src-pokerth.cpp
new file mode 100644
index 000000000000..1ea601ceeabe
--- /dev/null
+++ b/games/pokerth/files/patch-src-pokerth.cpp
@@ -0,0 +1,14 @@
+--- src/pokerth.cpp.orig	2013-12-22 17:58:02.001816000 +0100
++++ src/pokerth.cpp	2013-12-23 12:36:37.581605099 +0100
+@@ -34,8 +34,10 @@
+ #include <ctime>
+ #include <qapplication.h>
+ 
+-#include <QtWidgets>
+ #include <QtGui>
++#if QT_VERSION >= 0x050000
++#include <QtWidgets>
++#endif
+ #include <QtCore>
+ 
+ #ifdef __APPLE__
diff --git a/games/pokerth/pkg-plist b/games/pokerth/pkg-plist
index 2e4b0d095a0a..741d585010ec 100644
--- a/games/pokerth/pkg-plist
+++ b/games/pokerth/pkg-plist
@@ -5,7 +5,6 @@ share/applications/pokerth.desktop
 share/pixmaps/pokerth.png
 %%DATADIR%%/data/data-copyright.txt
 %%DATADIR%%/data/fonts/DejaVuSans-Bold.ttf
-%%DATADIR%%/data/fonts/n019003l.pfb
 %%DATADIR%%/data/gfx/avatars/default/misc/00a0b3d26a67841239b8883183b7a8f0.png
 %%DATADIR%%/data/gfx/avatars/default/misc/030a14c105d3fd164cb4bae54bad6191.png
 %%DATADIR%%/data/gfx/avatars/default/misc/08ced517579b3d258c947aec6c0a0dd4.png
@@ -400,6 +399,7 @@ share/pixmaps/pokerth.png
 %%DATADIR%%/data/gfx/gui/table/default_800x480/table_dark.png
 %%DATADIR%%/data/gfx/gui/table/default_800x480/toolboxbg.png
 %%DATADIR%%/data/misc/agpl.html
+%%DATADIR%%/data/misc/third_party_libs.txt
 %%DATADIR%%/data/sounds/default/allin.wav
 %%DATADIR%%/data/sounds/default/bet.wav
 %%DATADIR%%/data/sounds/default/call.wav
@@ -423,6 +423,8 @@ share/pixmaps/pokerth.png
 %%DATADIR%%/data/translations/pokerth_es.qm
 %%DATADIR%%/data/translations/pokerth_fi.qm
 %%DATADIR%%/data/translations/pokerth_fr.qm
+%%DATADIR%%/data/translations/pokerth_gd.qm
+%%DATADIR%%/data/translations/pokerth_gl.qm
 %%DATADIR%%/data/translations/pokerth_gr.qm
 %%DATADIR%%/data/translations/pokerth_hu.qm
 %%DATADIR%%/data/translations/pokerth_it.qm
@@ -437,6 +439,7 @@ share/pixmaps/pokerth.png
 %%DATADIR%%/data/translations/pokerth_sv.qm
 %%DATADIR%%/data/translations/pokerth_ta.qm
 %%DATADIR%%/data/translations/pokerth_tr.qm
+%%DATADIR%%/data/translations/pokerth_vi.qm
 %%DATADIR%%/data/translations/pokerth_jp.qm
 %%DATADIR%%/data/translations/pokerth_zhcn.qm
 %%DATADIR%%/data/translations/qt_ar.qm