diff options
Diffstat (limited to 'games/galaxyhack')
| -rw-r--r-- | games/galaxyhack/Makefile | 12 | ||||
| -rw-r--r-- | games/galaxyhack/files/patch-SetupBattle.cpp | 2 | ||||
| -rw-r--r-- | games/galaxyhack/files/patch-boost-1.52 | 77 |
3 files changed, 81 insertions, 10 deletions
diff --git a/games/galaxyhack/Makefile b/games/galaxyhack/Makefile index 694aa69a3352..51c3beec3fa1 100644 --- a/games/galaxyhack/Makefile +++ b/games/galaxyhack/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: galaxyhack -# Date created: 10 Aug 2005 -# Whom: Alejandro Pulver <alejandro@varnet.biz> -# +# Created by: Alejandro Pulver <alejandro@varnet.biz> # $FreeBSD$ -# PORTNAME= galaxyhack PORTVERSION= 1.74 -PORTREVISION= 11 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= SF DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -16,7 +12,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= AI script based strategy game -LIB_DEPENDS= boost_filesystem.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= boost_filesystem:${PORTSDIR}/devel/boost-libs \ freetype.9:${PORTSDIR}/print/freetype2 USE_BZIP2= yes @@ -25,8 +21,6 @@ USE_GMAKE= yes USE_SDL= gfx image mixer sdl WRKSRC= ${WRKDIR}/${PORTNAME}/src -CXXFLAGS+= -DBOOST_FILESYSTEM_VERSION=2 - OPTIONS_DEFINE= FLEETS OPTIMIZED_CFLAGS OPTIONS_DEFAULT= OPTIMIZED_CFLAGS FLEETS_DESC= Install additional fleets diff --git a/games/galaxyhack/files/patch-SetupBattle.cpp b/games/galaxyhack/files/patch-SetupBattle.cpp index 77702eaa72c3..355a2c7bc048 100644 --- a/games/galaxyhack/files/patch-SetupBattle.cpp +++ b/games/galaxyhack/files/patch-SetupBattle.cpp @@ -5,7 +5,7 @@ #include <sstream> -#include <boost/filesystem/exception.hpp> -+#include <boost/filesystem/path.hpp> ++#include <boost/filesystem.hpp> using std::stringstream; using std::getline; diff --git a/games/galaxyhack/files/patch-boost-1.52 b/games/galaxyhack/files/patch-boost-1.52 new file mode 100644 index 000000000000..ac824e4efbcf --- /dev/null +++ b/games/galaxyhack/files/patch-boost-1.52 @@ -0,0 +1,77 @@ +--- ForceSelectWin.cpp.orig 2012-08-20 17:35:01.000000000 +0200 ++++ ForceSelectWin.cpp 2012-08-20 17:47:19.000000000 +0200 +@@ -1596,15 +1596,15 @@ + fs::directory_iterator directoryEnd; // default construction yields past-the-end + for (fs::directory_iterator iter(sourcePath); iter != directoryEnd; ++iter) { + if (is_directory(*iter)) { +- fs::create_directory(destPath.string() + "/" + iter->leaf()); +- DoCopy(sourcePath.string() + "/" + iter->leaf(), destPath.string() + "/" + iter->leaf()); ++ fs::create_directory(destPath.string() + "/" + iter->path().filename().string()); ++ DoCopy(sourcePath.string() + "/" + iter->path().filename().string(), destPath.string() + "/" + iter->path().filename().string()); + continue; + } + string destFile; +- if (iter->leaf() == sideName + ".dat") ++ if (iter->path().filename() == sideName + ".dat") + destFile = theInput + ".dat"; + else +- destFile = iter->leaf(); ++ destFile = iter->path().filename().string(); + + fs::copy_file(*iter, destPath.string() + "/" + destFile); + } +--- Main.cpp.orig 2012-08-20 17:48:13.000000000 +0200 ++++ Main.cpp 2012-08-20 17:50:51.000000000 +0200 +@@ -339,12 +339,6 @@ + + void GameInit(char* argv[]) { + namespace fs = boost::filesystem; +- //boost is really quite stupid +- #ifndef WIN32 +- fs::path::default_name_check(fs::windows_name); +- #else +- fs::path::default_name_check(fs::native); +- #endif + + FindHomePath(); + LoadSettings(argv); +--- Menu_Base.cpp.orig 2012-08-20 17:51:05.000000000 +0200 ++++ Menu_Base.cpp 2012-08-20 17:52:15.000000000 +0200 +@@ -206,7 +206,7 @@ + + fs::directory_iterator directoryEnd; // default construction yields past-the-end + for (fs::directory_iterator iter(directory); iter != directoryEnd; ++iter) { +- string filename = iter->leaf(); ++ string filename = iter->path().filename().string(); + + if (filename.find('.') == filename.npos) + continue; +@@ -237,7 +237,7 @@ + fs::directory_iterator directoryEnd; // default construction yields past-the-end + for (fs::directory_iterator iter(globalSettings.bdp + "fleets/"); iter != directoryEnd; ++iter) { + if (fs::is_directory(*iter)) { +- string fleetName = iter->leaf(); ++ string fleetName = iter->path().filename().string(); + + if (CheckFleetExists(fleetName)) { + tempItem.desc = fleetName; +@@ -261,7 +261,7 @@ + fs::path iterPath(GetFleetDir(whichSide)); + fs::directory_iterator directoryEnd; // default construction yields past-the-end + for (fs::directory_iterator iter(iterPath); iter != directoryEnd; ++iter) { +- string filename = iter->leaf(); ++ string filename = iter->path().filename().string(); + + if (filename.find('.') == filename.npos) + continue; +--- Stuff.cpp.orig 2012-08-20 17:52:36.000000000 +0200 ++++ Stuff.cpp 2012-08-20 17:53:11.000000000 +0200 +@@ -657,7 +657,7 @@ + fs::directory_iterator directoryEnd; // default construction yields past-the-end + for (fs::directory_iterator iter(tempPath); iter != directoryEnd; ++iter) { + if (fs::is_directory(*iter) && !fs::is_empty(*iter)) +- RemoveDirectory(iter->string()); ++ RemoveDirectory(iter->path().string()); + else + fs::remove(*iter); + } |