diff options
| author | hasso <hasso@pkgsrc.org> | 2009-07-14 15:53:20 +0000 |
|---|---|---|
| committer | hasso <hasso@pkgsrc.org> | 2009-07-14 15:53:20 +0000 |
| commit | d868feb71b039fe2f85ecc937f5a6211f06ab0aa (patch) | |
| tree | 9858a9e64a4780ffbbba4dbdb65e4cb329862f39 /games/pokerth | |
| parent | 48a29d426342012a85266e293933afeca19fadd0 (diff) | |
| download | pkgsrc-d868feb71b039fe2f85ecc937f5a6211f06ab0aa.tar.gz | |
Update to 0.7.1. Make it build on systems where `uname -s` is not *BSD.
2009-06-25 version 0.7.1:
- internet lobby window size adjusted for netbook resolution 1024x600
- bigger window icon
- pokerth.desktop translation update
- Bugfix: compatibility fix for qt 4.4.3
2009-06-20 version 0.7.1-beta:
- Refactored the network engine using boost::asio to improve scalability
of the server
- Reduced per-game memory usage of the server, which enables playing with
several hundred players on a low-end vserver
- New internet games list filter to just show e.g. open games, password-free
games etc.
- New large chip count delimiter: 1000000 -> 1.000.000
- New "join any game" button behaviour - joins the game with the most
players connected
- Styles handling enhancements (e.g. no activation needed any more)
- Readd the option to hide splashscreen
- IP address bans now automatically expire
- Bugfix: incorrect handling of maximum number of players in network games
2009-05-03 version 0.7:
- enabled sorting of private/public games in the internet game lobby
- size of the lobby dialog was decreased for netbook resolution 1024x600
- default action pictures were adjusted for better readable card index
- portuguese (portuguese) translation was added
- bugfix: bet input lenght was adjusted
2009-04-25 version 0.7-beta2:
- Fixed problems with paths which contain special (non-ascii) characters
- Timeout animation moved so it no longer hides sets
- Improved bet slider handling for higher start cash like $1000000
- Minimum blinds adjusted for higher start cash
- Remember last styles directory
- New stay-on-table animation when a user is inactive but not disconnected
- Avatar uploads are logged (because of possible legal issues)
2009-04-15 version 0.7-beta1:
- Supporting up to 10 players on a table
- Easily choose different table and card styles
- Create your own style in simple steps
- Online style gallery
- Netbook support with minimum 1024x600
- Automatically restore game table geometry (including fullscreen)
- Server IP-address bans and nick bans based on regular expressions
- Server list supports multiple server entries
- bugfix(#0000009): No pause after first hand when starting a fresh local game
- bugfix(#0000010): Strange side pot behaviour after all-in
2009-03-22 version 0.6.4:
- enhanced server performance
- optional external avatar system to improve scalability
- feature-request(#0000008): sorting of columns in the gamelist of the
lobby is saved
- bugfix(#0000007): Improved highlighting of the cards on split pot
- bugfix(#0000003): Correctly pick low straight flush (with A)
- bugfix: doubleclicking "join game" in the lobby no longer causes an error
Diffstat (limited to 'games/pokerth')
| -rw-r--r-- | games/pokerth/Makefile | 6 | ||||
| -rw-r--r-- | games/pokerth/PLIST | 149 | ||||
| -rw-r--r-- | games/pokerth/distinfo | 16 | ||||
| -rw-r--r-- | games/pokerth/patches/patch-aa | 106 | ||||
| -rw-r--r-- | games/pokerth/patches/patch-ab | 13 | ||||
| -rw-r--r-- | games/pokerth/patches/patch-ac | 22 | ||||
| -rw-r--r-- | games/pokerth/patches/patch-ad | 48 | ||||
| -rw-r--r-- | games/pokerth/patches/patch-ae | 19 |
8 files changed, 247 insertions, 132 deletions
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile index 83fc0aac112..d8a02c6ae3a 100644 --- a/games/pokerth/Makefile +++ b/games/pokerth/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/01/31 03:04:37 ahoka Exp $ +# $NetBSD: Makefile,v 1.2 2009/07/14 15:53:20 hasso Exp $ # -DISTNAME= PokerTH-0.6.3-2-src -PKGNAME= pokerth-0.6.3.2 +DISTNAME= PokerTH-0.7.1-src +PKGNAME= pokerth-0.7.1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pokerth/} EXTRACT_SUFX= .tar.bz2 diff --git a/games/pokerth/PLIST b/games/pokerth/PLIST index 4a50e380268..4a03c6972cf 100644 --- a/games/pokerth/PLIST +++ b/games/pokerth/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:53 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2009/07/14 15:53:20 hasso Exp $ bin/pokerth bin/pokerth_server lib/libpokerth_lib.a @@ -149,44 +149,130 @@ share/pokerth/data/gfx/cards/default/6.png share/pokerth/data/gfx/cards/default/7.png share/pokerth/data/gfx/cards/default/8.png share/pokerth/data/gfx/cards/default/9.png +share/pokerth/data/gfx/cards/default/defaultdeckstyle.xml share/pokerth/data/gfx/cards/default/flipside.png share/pokerth/data/gfx/cards/default/flipside_tux.png +share/pokerth/data/gfx/cards/default/preview.png +share/pokerth/data/gfx/cards/default4c/0.png +share/pokerth/data/gfx/cards/default4c/1.png +share/pokerth/data/gfx/cards/default4c/10.png +share/pokerth/data/gfx/cards/default4c/11.png +share/pokerth/data/gfx/cards/default4c/12.png +share/pokerth/data/gfx/cards/default4c/13.png +share/pokerth/data/gfx/cards/default4c/14.png +share/pokerth/data/gfx/cards/default4c/15.png +share/pokerth/data/gfx/cards/default4c/16.png +share/pokerth/data/gfx/cards/default4c/17.png +share/pokerth/data/gfx/cards/default4c/18.png +share/pokerth/data/gfx/cards/default4c/19.png +share/pokerth/data/gfx/cards/default4c/2.png +share/pokerth/data/gfx/cards/default4c/20.png +share/pokerth/data/gfx/cards/default4c/21.png +share/pokerth/data/gfx/cards/default4c/22.png +share/pokerth/data/gfx/cards/default4c/23.png +share/pokerth/data/gfx/cards/default4c/24.png +share/pokerth/data/gfx/cards/default4c/25.png +share/pokerth/data/gfx/cards/default4c/26.png +share/pokerth/data/gfx/cards/default4c/27.png +share/pokerth/data/gfx/cards/default4c/28.png +share/pokerth/data/gfx/cards/default4c/29.png +share/pokerth/data/gfx/cards/default4c/3.png +share/pokerth/data/gfx/cards/default4c/30.png +share/pokerth/data/gfx/cards/default4c/31.png +share/pokerth/data/gfx/cards/default4c/32.png +share/pokerth/data/gfx/cards/default4c/33.png +share/pokerth/data/gfx/cards/default4c/34.png +share/pokerth/data/gfx/cards/default4c/35.png +share/pokerth/data/gfx/cards/default4c/36.png +share/pokerth/data/gfx/cards/default4c/37.png +share/pokerth/data/gfx/cards/default4c/38.png +share/pokerth/data/gfx/cards/default4c/39.png +share/pokerth/data/gfx/cards/default4c/4.png +share/pokerth/data/gfx/cards/default4c/40.png +share/pokerth/data/gfx/cards/default4c/41.png +share/pokerth/data/gfx/cards/default4c/42.png +share/pokerth/data/gfx/cards/default4c/43.png +share/pokerth/data/gfx/cards/default4c/44.png +share/pokerth/data/gfx/cards/default4c/45.png +share/pokerth/data/gfx/cards/default4c/46.png +share/pokerth/data/gfx/cards/default4c/47.png +share/pokerth/data/gfx/cards/default4c/48.png +share/pokerth/data/gfx/cards/default4c/49.png +share/pokerth/data/gfx/cards/default4c/5.png +share/pokerth/data/gfx/cards/default4c/50.png +share/pokerth/data/gfx/cards/default4c/51.png +share/pokerth/data/gfx/cards/default4c/6.png +share/pokerth/data/gfx/cards/default4c/7.png +share/pokerth/data/gfx/cards/default4c/8.png +share/pokerth/data/gfx/cards/default4c/9.png +share/pokerth/data/gfx/cards/default4c/default4cdeckstyle.xml +share/pokerth/data/gfx/cards/default4c/flipside.png +share/pokerth/data/gfx/cards/default4c/preview.png share/pokerth/data/gfx/gui/misc/1px.png +share/pokerth/data/gfx/gui/misc/actionpics/action_allin.png +share/pokerth/data/gfx/gui/misc/actionpics/action_bet.png +share/pokerth/data/gfx/gui/misc/actionpics/action_call.png +share/pokerth/data/gfx/gui/misc/actionpics/action_check.png +share/pokerth/data/gfx/gui/misc/actionpics/action_fold.png +share/pokerth/data/gfx/gui/misc/actionpics/action_raise.png +share/pokerth/data/gfx/gui/misc/actionpics/action_winner.png share/pokerth/data/gfx/gui/misc/background_gamelist.png share/pokerth/data/gfx/gui/misc/fileopen16.png -share/pokerth/data/gfx/gui/misc/handRanking.png share/pokerth/data/gfx/gui/misc/lock.png share/pokerth/data/gfx/gui/misc/logoChip3D.png -share/pokerth/data/gfx/gui/misc/radiobutton_checked.png -share/pokerth/data/gfx/gui/misc/radiobutton_checked_hover.png -share/pokerth/data/gfx/gui/misc/radiobutton_pressed.png -share/pokerth/data/gfx/gui/misc/radiobutton_unchecked.png -share/pokerth/data/gfx/gui/misc/radiobutton_unchecked_hover.png +share/pokerth/data/gfx/gui/misc/rating.png share/pokerth/data/gfx/gui/misc/startwindowbg.png -share/pokerth/data/gfx/gui/misc/toolboxFrameBG.png share/pokerth/data/gfx/gui/misc/welcomepokerth.png share/pokerth/data/gfx/gui/misc/windowicon.png -share/pokerth/data/gfx/gui/table/default/action_allin.png -share/pokerth/data/gfx/gui/table/default/action_bet.png -share/pokerth/data/gfx/gui/table/default/action_call.png -share/pokerth/data/gfx/gui/table/default/action_check.png -share/pokerth/data/gfx/gui/table/default/action_fold.png -share/pokerth/data/gfx/gui/table/default/action_raise.png -share/pokerth/data/gfx/gui/table/default/action_set.png -share/pokerth/data/gfx/gui/table/default/action_template.xcf -share/pokerth/data/gfx/gui/table/default/action_winner.png +share/pokerth/data/gfx/gui/table/danuxi1/bigblindPuck.png +share/pokerth/data/gfx/gui/table/danuxi1/cardholder_flop.png +share/pokerth/data/gfx/gui/table/danuxi1/cardholder_flop.xcf +share/pokerth/data/gfx/gui/table/danuxi1/cardholder_river.png +share/pokerth/data/gfx/gui/table/danuxi1/cardholder_turn.png +share/pokerth/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml +share/pokerth/data/gfx/gui/table/danuxi1/dealerPuck.png +share/pokerth/data/gfx/gui/table/danuxi1/genereticAvatar.png +share/pokerth/data/gfx/gui/table/danuxi1/handranking.png +share/pokerth/data/gfx/gui/table/danuxi1/playerBottomSeatActive.png +share/pokerth/data/gfx/gui/table/danuxi1/playerTopSeatActive.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_blue.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_blue_checked.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_blue_checked_hover.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_blue_hover.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_green.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_green_checked.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_green_checked_hover.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_green_hover.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_orange.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_orange_checked.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_orange_checked_hover.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_orange_hover.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_red.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_red_checked.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_red_checked_hover.png +share/pokerth/data/gfx/gui/table/danuxi1/playeraction_red_hover.png +share/pokerth/data/gfx/gui/table/danuxi1/preview.png +share/pokerth/data/gfx/gui/table/danuxi1/radiobutton_checked.png +share/pokerth/data/gfx/gui/table/danuxi1/radiobutton_checked_hover.png +share/pokerth/data/gfx/gui/table/danuxi1/radiobutton_pressed.png +share/pokerth/data/gfx/gui/table/danuxi1/radiobutton_unchecked.png +share/pokerth/data/gfx/gui/table/danuxi1/radiobutton_unchecked_hover.png +share/pokerth/data/gfx/gui/table/danuxi1/smallblindPuck.png +share/pokerth/data/gfx/gui/table/danuxi1/table.png +share/pokerth/data/gfx/gui/table/danuxi1/toolboxbg.png +share/pokerth/data/gfx/gui/table/danuxi1/table.png +share/pokerth/data/gfx/gui/table/danuxi1/toolboxbg.png share/pokerth/data/gfx/gui/table/default/bigblindPuck.png share/pokerth/data/gfx/gui/table/default/cardholder_flop.png share/pokerth/data/gfx/gui/table/default/cardholder_river.png share/pokerth/data/gfx/gui/table/default/cardholder_turn.png share/pokerth/data/gfx/gui/table/default/dealerPuck.png +share/pokerth/data/gfx/gui/table/default/defaulttablestyle.xml share/pokerth/data/gfx/gui/table/default/genereticAvatar.png -share/pokerth/data/gfx/gui/table/default/opponentBoxActiveGlow.png -share/pokerth/data/gfx/gui/table/default/opponentBoxInactiveGlow.png -share/pokerth/data/gfx/gui/table/default/playerBoxActiveGlow.png -share/pokerth/data/gfx/gui/table/default/playerBoxActiveGlow_0.6.png -share/pokerth/data/gfx/gui/table/default/playerBoxInactiveGlow.png -share/pokerth/data/gfx/gui/table/default/playerBoxInactiveGlow_0.6.png +share/pokerth/data/gfx/gui/table/default/handranking.png +share/pokerth/data/gfx/gui/table/default/handranking_template.xcf +share/pokerth/data/gfx/gui/table/default/playerSeatActive.png +share/pokerth/data/gfx/gui/table/default/playerSeatInactive.png share/pokerth/data/gfx/gui/table/default/playeraction_blue.png share/pokerth/data/gfx/gui/table/default/playeraction_blue_checked.png share/pokerth/data/gfx/gui/table/default/playeraction_blue_checked_hover.png @@ -195,12 +281,23 @@ share/pokerth/data/gfx/gui/table/default/playeraction_green.png share/pokerth/data/gfx/gui/table/default/playeraction_green_checked.png share/pokerth/data/gfx/gui/table/default/playeraction_green_checked_hover.png share/pokerth/data/gfx/gui/table/default/playeraction_green_hover.png +share/pokerth/data/gfx/gui/table/default/playeraction_orange.png +share/pokerth/data/gfx/gui/table/default/playeraction_orange_checked.png +share/pokerth/data/gfx/gui/table/default/playeraction_orange_checked_hover.png +share/pokerth/data/gfx/gui/table/default/playeraction_orange_hover.png share/pokerth/data/gfx/gui/table/default/playeraction_red.png share/pokerth/data/gfx/gui/table/default/playeraction_red_checked.png share/pokerth/data/gfx/gui/table/default/playeraction_red_checked_hover.png share/pokerth/data/gfx/gui/table/default/playeraction_red_hover.png +share/pokerth/data/gfx/gui/table/default/preview.png +share/pokerth/data/gfx/gui/table/default/radiobutton_checked.png +share/pokerth/data/gfx/gui/table/default/radiobutton_checked_hover.png +share/pokerth/data/gfx/gui/table/default/radiobutton_pressed.png +share/pokerth/data/gfx/gui/table/default/radiobutton_unchecked.png +share/pokerth/data/gfx/gui/table/default/radiobutton_unchecked_hover.png share/pokerth/data/gfx/gui/table/default/smallblindPuck.png share/pokerth/data/gfx/gui/table/default/table.png +share/pokerth/data/gfx/gui/table/default/toolboxbg.png share/pokerth/data/misc/gpl2.html share/pokerth/data/sounds/default/allin.wav share/pokerth/data/sounds/default/bet.wav @@ -226,6 +323,7 @@ share/pokerth/data/translations/pokerth_nl.qm share/pokerth/data/translations/pokerth_no.qm share/pokerth/data/translations/pokerth_pl.qm share/pokerth/data/translations/pokerth_ptbr.qm +share/pokerth/data/translations/pokerth_ptpt.qm share/pokerth/data/translations/pokerth_ru.qm share/pokerth/data/translations/pokerth_sk.qm share/pokerth/data/translations/pokerth_sv.qm @@ -235,4 +333,9 @@ share/pokerth/data/translations/qt_de.qm share/pokerth/data/translations/qt_es.qm share/pokerth/data/translations/qt_fr.qm share/pokerth/data/translations/qt_nl.qm +share/pokerth/data/translations/qt_pl.qm +share/pokerth/data/translations/qt_pt.qm share/pokerth/data/translations/qt_ru.qm +share/pokerth/data/translations/qt_sk.qm +share/pokerth/data/translations/qt_sv.qm +share/pokerth/data/translations/qt_zh_CN.qm diff --git a/games/pokerth/distinfo b/games/pokerth/distinfo index 8ccf80e8405..a33d383222f 100644 --- a/games/pokerth/distinfo +++ b/games/pokerth/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/01/31 03:04:37 ahoka Exp $ +$NetBSD: distinfo,v 1.2 2009/07/14 15:53:20 hasso Exp $ -SHA1 (PokerTH-0.6.3-2-src.tar.bz2) = b3bb880f95070add6aae17160ec0ebfc80a95ac0 -RMD160 (PokerTH-0.6.3-2-src.tar.bz2) = bc1d96c934e1aef645568457bd1941b8751cf372 -Size (PokerTH-0.6.3-2-src.tar.bz2) = 4644455 bytes -SHA1 (patch-aa) = 3aeb01a26edaa1b7ac0b19074f403a9c8fcf767f -SHA1 (patch-ab) = 89f2a8f5cbdb2a31da26552bd744b4762cd4275c -SHA1 (patch-ac) = e104ef1c435fa18bf763c9e38aff45b521358ab8 -SHA1 (patch-ad) = 455df4ef10824d41077fd993070fd927c5d461e0 -SHA1 (patch-ae) = 71af45ce4148c26e9182b1254af9826faa02cad6 +SHA1 (PokerTH-0.7.1-src.tar.bz2) = 9c0c546355d7d248aeeee371d0354bfe90150a7b +RMD160 (PokerTH-0.7.1-src.tar.bz2) = 7aca895bb07bc83f977e9147217ad50eb7adfb8a +Size (PokerTH-0.7.1-src.tar.bz2) = 6535050 bytes +SHA1 (patch-aa) = 2bec0baa9390c0e3f88da50e1bb2411b6552f704 +SHA1 (patch-ad) = 76306aaaba9e90f8d1f9fdf7550b388d7321f5d8 +SHA1 (patch-ae) = 4afbde2793d1a8e58ba49a004fac7117ecd7a3c3 diff --git a/games/pokerth/patches/patch-aa b/games/pokerth/patches/patch-aa index 8c15832d947..c1515035928 100644 --- a/games/pokerth/patches/patch-aa +++ b/games/pokerth/patches/patch-aa @@ -1,44 +1,64 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/01/31 03:04:37 ahoka Exp $ +$NetBSD: patch-aa,v 1.2 2009/07/14 15:53:20 hasso Exp $ ---- pokerth_game.pro.orig 2009-01-04 00:18:19.000000000 +0100 -+++ pokerth_game.pro -@@ -319,38 +319,7 @@ unix : !mac {
-
- LIBPATH += lib
-
-- LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64
-- BOOST_FS = boost_filesystem boost_filesystem-mt
-- BOOST_THREAD = boost_thread boost_thread-mt
-- BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt
--
--
-- for(dir, LIB_DIRS){
-- exists($$dir){
-- for(lib, BOOST_THREAD){
-- exists($${dir}/lib$${lib}.so*){
-- message("Found $$lib")
-- BOOST_THREAD = -l$$lib
-- }
-- }
-- for(lib, BOOST_FS){
-- exists($${dir}/lib$${lib}.so*){
-- message("Found $$lib")
-- BOOST_FS = -l$$lib
-- }
-- }
-- for(lib, BOOST_IOSTREAMS){
-- exists($${dir}/lib$${lib}.so*){
-- message("Found $$lib")
-- BOOST_IOSTREAMS = -l$$lib
-- }
-- }
-- }
-- }
-- BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_IOSTREAMS
-- !count(BOOST_LIBS, 3){
-- error("libboost (version >= 1.34.1) --> http://www.boost.org/")
-- }
-+ LIBS += -lboost_filesystem-mt -lboost_thread-mt -lboost_iostreams-mt
-
- if($$system(sdl-config --version)){
- error("libSDL_mixer, libSDL --> http://www.libsdl.org/")
+--- pokerth_game.pro.orig 2009-07-12 23:07:17 +0300 ++++ pokerth_game.pro 2009-07-12 23:09:15 +0300 +@@ -358,54 +358,16 @@ unix:!mac { + # QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections + # QMAKE_LFLAGS += -Wl,--gc-sections + LIBPATH += lib +- LIB_DIRS = $${PREFIX}/lib \ +- $${PREFIX}/lib64 +- BOOST_FS = boost_filesystem \ +- boost_filesystem-mt +- BOOST_THREAD = boost_thread \ +- boost_thread-mt +- BOOST_IOSTREAMS = boost_iostreams \ +- boost_iostreams-mt +- BOOST_REGEX = boost_regex \ +- boost_regex-mt +- +- # searching in $PREFIX/lib and $PREFIX/lib64 +- # to override the default '/usr' pass PREFIX +- # variable to qmake. +- for(dir, LIB_DIRS):exists($$dir) { +- for(lib, BOOST_THREAD):exists($${dir}/lib$${lib}.so*) { +- message("Found $$lib") +- BOOST_THREAD = -l$$lib +- } +- for(lib, BOOST_FS):exists($${dir}/lib$${lib}.so*) { +- message("Found $$lib") +- BOOST_FS = -l$$lib +- } +- for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.so*) { +- message("Found $$lib") +- BOOST_IOSTREAMS = -l$$lib +- } +- for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.so*) { +- message("Found $$lib") +- BOOST_REGEX = -l$$lib +- } +- } +- BOOST_LIBS = $$BOOST_THREAD \ +- $$BOOST_FS \ +- $$BOOST_IOSTREAMS \ +- $$BOOST_REGEX +- !count(BOOST_LIBS, 4):error("Unable to find boost libraries in PREFIX=$${PREFIX}") ++ ++ LIBS += -lboost_filesystem-mt -lboost_thread-mt -lboost_iostreams-mt -lboost_regex-mt ++ + if($$system(sdl-config --version)):error("sdl-config not found in PATH - libSDL_mixer, libSDL are required!") +- UNAME = $$system(uname -s) +- BSD = $$find(UNAME, "BSD") +- kFreeBSD = $$find(UNAME, "kFreeBSD") + LIBS += -lpokerth_lib + LIBS += $$BOOST_LIBS + LIBS += -lSDL_mixer \ + -lcurl +- !isEmpty( BSD ) && isEmpty( kFreeBSD ):LIBS += -lcrypto +- else:LIBS += -lgnutls-openssl \ +- -lgcrypt ++ LIBS += -lcrypto ++ + TARGETDEPS += ./lib/libpokerth_lib.a + + # #### My release static libs diff --git a/games/pokerth/patches/patch-ab b/games/pokerth/patches/patch-ab deleted file mode 100644 index a9fed120d5c..00000000000 --- a/games/pokerth/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2009/01/31 03:04:37 ahoka Exp $ - ---- src/third_party/libircclient/include/config.h.orig 2009-01-04 00:17:02.000000000 +0100 -+++ src/third_party/libircclient/include/config.h -@@ -2,7 +2,7 @@ - /* include/config.h.in. Generated from configure.in by autoheader. */ - - /* Define to 1 if you have the `gethostbyname_r' function. */ --#if !defined(__APPLE__) && !defined(__OpenBSD__) -+#if !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__NetBSD__) - #define HAVE_GETHOSTBYNAME_R 1 - #endif - diff --git a/games/pokerth/patches/patch-ac b/games/pokerth/patches/patch-ac deleted file mode 100644 index 33a06640951..00000000000 --- a/games/pokerth/patches/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2009/01/31 03:04:37 ahoka Exp $ - ---- src/core/linux/convhelper.cpp.orig 2009-01-04 00:17:01.000000000 +0100 -+++ src/core/linux/convhelper.cpp -@@ -37,7 +37,7 @@ ConvHelper::NativeToUtf8(const std::stri - { - string retStr(inStr); - size_t insize = inStr.length(); --#if defined(__APPLE__) || defined(__FreeBSD__) -+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) - const char *inbuf = inStr.data(); - #else - char *inbuf = const_cast<char *>(inStr.data()); -@@ -72,7 +72,7 @@ ConvHelper::Utf8ToNative(const std::stri - { - string retStr(inStr); - size_t insize = inStr.length(); --#if defined(__APPLE__) || defined(__FreeBSD__) -+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) - const char *inbuf = inStr.data(); - #else - char *inbuf = const_cast<char *>(inStr.data()); diff --git a/games/pokerth/patches/patch-ad b/games/pokerth/patches/patch-ad index 351f7aa6709..0863add9a15 100644 --- a/games/pokerth/patches/patch-ad +++ b/games/pokerth/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2009/01/31 03:04:37 ahoka Exp $ +$NetBSD: patch-ad,v 1.2 2009/07/14 15:53:20 hasso Exp $ ---- pokerth_server.pro.orig 2009-01-31 00:19:52.000000000 +0100 -+++ pokerth_server.pro -@@ -163,44 +163,8 @@ unix : !mac { +--- pokerth_server.pro.orig 2009-06-26 02:29:46 +0300 ++++ pokerth_server.pro 2009-07-12 23:13:58 +0300 +@@ -185,69 +185,13 @@ unix : !mac { LIBPATH += lib @@ -11,7 +11,13 @@ $NetBSD: patch-ad,v 1.1.1.1 2009/01/31 03:04:37 ahoka Exp $ - BOOST_THREAD = boost_thread boost_thread-mt - BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt - BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt +- BOOST_REGEX = boost_regex boost_regex-mt - +- # +- # searching in $PREFIX/lib and $PREFIX/lib64 +- # to override the default '/usr' pass PREFIX +- # variable to qmake. +- # - for(dir, LIB_DIRS){ - exists($$dir){ - for(lib, BOOST_THREAD){ @@ -38,14 +44,34 @@ $NetBSD: patch-ad,v 1.1.1.1 2009/01/31 03:04:37 ahoka Exp $ - BOOST_IOSTREAMS = -l$$lib - } - } +- for(lib, BOOST_REGEX){ +- exists($${dir}/lib$${lib}.so*){ +- message("Found $$lib") +- BOOST_REGEX = -l$$lib +- } +- } - } - } -- BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS -- !count(BOOST_LIBS, 4){ -- error( libboost (version >= 1.34.1) --> http://www.boost.org/") +- BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX +- !count(BOOST_LIBS, 5){ +- error("Unable to find boost libraries in PREFIX=$${PREFIX}") - } -+ LIBS += -lboost_filesystem-mt -lboost_thread-mt -+ LIBS += -lboost_program_options-mt -lboost_iostreams-mt +- +- UNAME = $$system(uname -s) +- BSD = $$find(UNAME, "BSD") +- kFreeBSD = $$find(UNAME, "kFreeBSD") ++ LIBS += -lboost_filesystem-mt -lboost_thread-mt ++ LIBS += -lboost_program_options-mt -lboost_iostreams-mt -lboost_regex-mt + + LIBS += -lpokerth_lib + LIBS += $$BOOST_LIBS + LIBS += -lcurl +- !isEmpty( BSD ) && isEmpty( kFreeBSD ){ +- LIBS += -lcrypto -liconv +- } else { +- LIBS += -lgnutls-openssl -lgcrypt +- } ++ LIBS += -lcrypto -liconv + + TARGETDEPS += ./lib/libpokerth_lib.a - UNAME = $$system(uname -s) - BSD = $$find(UNAME, "BSD") diff --git a/games/pokerth/patches/patch-ae b/games/pokerth/patches/patch-ae index 70402aa0355..6e5113499d9 100644 --- a/games/pokerth/patches/patch-ae +++ b/games/pokerth/patches/patch-ae @@ -1,13 +1,16 @@ -$NetBSD: patch-ae,v 1.1.1.1 2009/01/31 03:04:37 ahoka Exp $ +$NetBSD: patch-ae,v 1.2 2009/07/14 15:53:20 hasso Exp $ ---- src/core/openssl_wrapper.h.orig 2009-01-04 00:17:01.000000000 +0100 -+++ src/core/openssl_wrapper.h -@@ -40,15 +40,8 @@ - #undef X509_NAME // Again for Windows - conflict with WinCrypt.h. - #endif +--- src/core/openssl_wrapper.h.orig 2009-06-26 00:37:43 +0300 ++++ src/core/openssl_wrapper.h 2009-07-12 23:16:31 +0300 +@@ -46,18 +46,9 @@ + // "2. Can I use OpenSSL with GPL software?" + // http://www.openssl.org/support/faq.html#LEGAL2 + // +-#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) +- #define HAVE_OPENSSL +-#endif --#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) -- // For BSD-Systems, we assume that OpenSSL is part of the operating system. +-#ifdef HAVE_OPENSSL - #include <openssl/ssl.h> - #include <openssl/md5.h> - #include <openssl/rand.h> |