From 87e0339edac99ab1b545be353e224e6e92f705d4 Mon Sep 17 00:00:00 2001 From: ahoka Date: Mon, 19 Oct 2009 01:53:20 +0000 Subject: Pass PREFIX correctly instead of hacking the qmake files. --- games/pokerth/Makefile | 4 +-- games/pokerth/distinfo | 6 ++-- games/pokerth/patches/patch-aa | 54 ++++------------------------------ games/pokerth/patches/patch-ad | 67 +++++------------------------------------- 4 files changed, 18 insertions(+), 113 deletions(-) (limited to 'games') diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile index 1449d5d9a34..330f98103df 100644 --- a/games/pokerth/Makefile +++ b/games/pokerth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2009/08/26 19:57:33 sno Exp $ +# $NetBSD: Makefile,v 1.5 2009/10/19 01:53:20 ahoka Exp $ # DISTNAME= PokerTH-0.7.1-src @@ -21,7 +21,7 @@ INSTALLATION_DIRS= bin lib ${PKGMANDIR}/man1 share/pokerth \ share/pixmaps share/applications do-configure: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QTDIR}/bin/qmake pokerth.pro + cd ${WRKSRC} && ${QTDIR}/bin/qmake pokerth.pro ${MAKE_ENV} do-install: ${INSTALL_LIB} ${WRKSRC}/lib/* ${DESTDIR}${PREFIX}/lib diff --git a/games/pokerth/distinfo b/games/pokerth/distinfo index a33d383222f..ccb16918ba6 100644 --- a/games/pokerth/distinfo +++ b/games/pokerth/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2009/07/14 15:53:20 hasso Exp $ +$NetBSD: distinfo,v 1.3 2009/10/19 01:53:20 ahoka Exp $ 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-aa) = 04340266a1c038092794a3b4a54aadf1ae057015 +SHA1 (patch-ad) = 83689c8271e3899632d552f73044b51aa3060706 SHA1 (patch-ae) = 4afbde2793d1a8e58ba49a004fac7117ecd7a3c3 diff --git a/games/pokerth/patches/patch-aa b/games/pokerth/patches/patch-aa index c1515035928..ae8a1c21f86 100644 --- a/games/pokerth/patches/patch-aa +++ b/games/pokerth/patches/patch-aa @@ -1,51 +1,10 @@ -$NetBSD: patch-aa,v 1.2 2009/07/14 15:53:20 hasso Exp $ +$NetBSD: patch-aa,v 1.3 2009/10/19 01:53:21 ahoka Exp $ ---- 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 -+ +--- pokerth_game.pro.orig 2009-06-26 01:29:19.000000000 +0200 ++++ pokerth_game.pro +@@ -396,16 +396,11 @@ unix:!mac { + $$BOOST_REGEX + !count(BOOST_LIBS, 4):error("Unable to find boost libraries in PREFIX=$${PREFIX}") 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") @@ -58,7 +17,6 @@ $NetBSD: patch-aa,v 1.2 2009/07/14 15:53:20 hasso Exp $ - else:LIBS += -lgnutls-openssl \ - -lgcrypt + LIBS += -lcrypto -+ TARGETDEPS += ./lib/libpokerth_lib.a # #### My release static libs diff --git a/games/pokerth/patches/patch-ad b/games/pokerth/patches/patch-ad index 0863add9a15..e10090c6e5f 100644 --- a/games/pokerth/patches/patch-ad +++ b/games/pokerth/patches/patch-ad @@ -1,68 +1,15 @@ -$NetBSD: patch-ad,v 1.2 2009/07/14 15:53:20 hasso Exp $ +$NetBSD: patch-ad,v 1.3 2009/10/19 01:53:21 ahoka Exp $ ---- 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 { +--- pokerth_server.pro.orig 2009-06-26 01:29:46.000000000 +0200 ++++ pokerth_server.pro +@@ -236,18 +236,10 @@ unix : !mac { + error("Unable to find boost libraries in PREFIX=$${PREFIX}") + } - LIBPATH += lib - -- LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 -- BOOST_FS = boost_filesystem boost_filesystem-mt -- 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){ -- 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_PROGRAM_OPTIONS){ -- exists($${dir}/lib$${lib}.so*){ -- message("Found $$lib") -- BOOST_PROGRAM_OPTIONS = -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_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX -- !count(BOOST_LIBS, 5){ -- error("Unable to find boost libraries in PREFIX=$${PREFIX}") -- } -- - 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 -- cgit v1.2.3