diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-01-31 13:38:42 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-01-31 13:38:42 +0000 |
| commit | f5f6cd6d9b51abcfaf7d5a03d342e91dc742074d (patch) | |
| tree | 384a6fe89b7bf8bffcc478f3462d538eea755790 /games/glob2 | |
| parent | Add a not about boost update (diff) | |
Chase boost update
Notes
Notes:
svn path=/head/; revision=311310
Diffstat (limited to 'games/glob2')
| -rw-r--r-- | games/glob2/Makefile | 10 | ||||
| -rw-r--r-- | games/glob2/files/patch-SConstruct | 29 |
2 files changed, 27 insertions, 12 deletions
diff --git a/games/glob2/Makefile b/games/glob2/Makefile index 69cc1813927c..1f8a3c370150 100644 --- a/games/glob2/Makefile +++ b/games/glob2/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: glob2 -# Date created: Wed 21 apr 2004 -# Whom: thierry@pompo.net -# +# Created by: thierry@pompo.net # $FreeBSD$ -# PORTNAME= glob2 PORTVERSION= 0.9.4.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION:R} @@ -18,7 +14,7 @@ COMMENT= Globulation 2 - a free and innovative strategy game LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ speex.1:${PORTSDIR}/audio/speex \ fribidi.3:${PORTSDIR}/converters/fribidi \ - boost_thread.4:${PORTSDIR}/devel/boost-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ freetype.9:${PORTSDIR}/print/freetype2 # Should work with portaudio v19_20071207 # Can be built with portaudio2 but does not run cleanly diff --git a/games/glob2/files/patch-SConstruct b/games/glob2/files/patch-SConstruct index 876a38fd0cc5..a4c34367362b 100644 --- a/games/glob2/files/patch-SConstruct +++ b/games/glob2/files/patch-SConstruct @@ -1,9 +1,28 @@ ---- SConstruct.orig Sun Sep 2 05:14:53 2007 -+++ SConstruct Tue Sep 4 23:02:18 2007 -@@ -1,5 +1,6 @@ +--- SConstruct.orig 2009-08-30 19:23:30.000000000 +0000 ++++ SConstruct 2013-01-28 16:42:04.024490217 +0000 +@@ -14,6 +14,7 @@ + def establish_options(env): opts = Options('options_cache.py') + opts.Add("CCFLAGS", "Manually add to the CCFLAGS", "") opts.Add("CXXFLAGS", "Manually add to the CXXFLAGS", "-g") - opts.Add("LINKFLAGS", "Manually add to the LINKFLAGS", "") - opts.Add("INSTALLDIR", "Installation Directory", "/usr/local/share") + opts.Add("LINKFLAGS", "Manually add to the LINKFLAGS", "-g") + if isDarwinPlatform: +@@ -111,14 +112,17 @@ + missing.append("zlib") + + boost_thread = '' ++ boost_system = '' + if conf.CheckLib("boost_thread") and conf.CheckCXXHeader("boost/thread/thread.hpp"): + boost_thread="boost_thread" ++ boost_system="boost_system" + elif conf.CheckLib("boost_thread-mt") and conf.CheckCXXHeader("boost/thread/thread.hpp"): + boost_thread="boost_thread-mt" + else: + print "Could not find libboost_thread or libboost_thread-mt or boost/thread/thread.hpp" + missing.append("libboost_thread") + env.Append(LIBS=[boost_thread]) ++ env.Append(LIBS=[boost_system]) + + boost_date_time = '' + if conf.CheckLib("boost_date_time") and conf.CheckCXXHeader("boost/date_time/posix_time/posix_time.hpp"): |