Simple switch from qt4 to qt5. I played a local game without issues but more tests are welcome! Port changes:
- Replace qmake with qmake-qt5 - Remove protobuf from BUILD_DEPENDS, it's already in LIB_DEPENDS. - Remove COMPILER line, it comes from qt5 now Feedback, OK? Index: Makefile =================================================================== RCS file: /cvs/ports/games/pokerth/Makefile,v retrieving revision 1.45 diff -u -p -u -p -r1.45 Makefile --- Makefile 12 Jul 2019 20:46:22 -0000 1.45 +++ Makefile 11 Feb 2020 06:56:40 -0000 @@ -5,7 +5,7 @@ COMMENT= texas hold'em poker game with o BROKEN-hppa = needs atomic ops DISTNAME = pokerth-1.1.2 -REVISION = 4 +REVISION = 5 CATEGORIES= games x11 @@ -14,21 +14,19 @@ HOMEPAGE= https://www.pokerth.net/ # AGPL3+ PERMIT_PACKAGE= Yes -WANTLIB += ${COMPILER_LIBCXX} ICE QtGui QtNetwork QtSql SDL SDL_mixer -WANTLIB += SM X11 Xext Xi Xinerama Xrender boost_chrono-mt boost_filesystem-mt +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Sql +WANTLIB += Qt5Widgets SDL SDL_mixer boost_chrono-mt boost_filesystem-mt WANTLIB += boost_iostreams-mt boost_program_options-mt boost_random-mt WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c crypto -WANTLIB += curl fontconfig freetype gsasl iconv ircclient m protobuf -WANTLIB += sqlite3 ssl tinyxml +WANTLIB += curl gsasl iconv ircclient m protobuf sqlite3 ssl tinyxml MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pokerth/} # C++11 -COMPILER = base-clang ports-gcc base-gcc CXXFLAGS += -std=gnu++11 MODULES= devel/qmake \ - x11/qt4 + x11/qt5 MODQMAKE_PROJECTS = pokerth.pro @@ -44,8 +42,6 @@ LIB_DEPENDS= converters/libiconv \ security/libgsasl \ textproc/tinyxml -BUILD_DEPENDS = devel/protobuf - CONFIGURE_ENV= HOME=${WRKDIR} NO_TEST= Yes @@ -58,7 +54,9 @@ MODQMAKE_ARGS += CONFIG+="client" pre-configure: cd ${WRKSRC} && \ protoc --cpp_out=src/third_party/protobuf chatcleaner.proto && \ - protoc --cpp_out=src/third_party/protobuf pokerth.proto + protoc --cpp_out=src/third_party/protobuf pokerth.proto && \ + find . -name "*.pro" -print0 | xargs -0r perl -pi \ + -e 's,qmake,${MODQT5_QMAKE},g;' post-install: ${INSTALL_PROGRAM} ${WRKBUILD}/pokerth ${PREFIX}/bin Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/pokerth/pkg/PLIST,v retrieving revision 1.11 diff -u -p -u -p -r1.11 PLIST --- pkg/PLIST 27 Jun 2018 21:03:49 -0000 1.11 +++ pkg/PLIST 11 Feb 2020 06:56:40 -0000 @@ -423,7 +423,6 @@ share/pokerth/data/misc/agpl.html share/pokerth/data/misc/third_party_libs.txt share/pokerth/data/sounds/ share/pokerth/data/sounds/default/ -share/pokerth/data/sounds/default/.directory share/pokerth/data/sounds/default/allin.wav share/pokerth/data/sounds/default/bet.wav share/pokerth/data/sounds/default/blinds_raises_level1.wav
