Index: head/devel/jsoncpp/files/patch-SConstruct =================================================================== --- head/devel/jsoncpp/files/patch-SConstruct (revision 373762) +++ head/devel/jsoncpp/files/patch-SConstruct (revision 373763) @@ -1,19 +1,28 @@ ---- ./SConstruct.orig 2014-08-22 14:25:14.780951671 -0500 -+++ ./SConstruct 2014-08-22 14:25:37.478948513 -0500 +--- SConstruct.orig 2014-12-02 06:28:17.000000000 +0300 ++++ SConstruct 2014-12-02 06:28:31.000000000 +0300 @@ -26,7 +26,7 @@ if platform == 'linux-gcc': CXX = 'g++' # not quite right, but env is not yet available. import commands - version = commands.getoutput('%s -dumpversion' %CXX) + version = 'FreeBSD' platform = 'linux-gcc-%s' %version print "Using platform '%s'" %platform LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '') +@@ -65,7 +65,7 @@ + return vars + + +-env = Environment( ENV = make_environ_vars(), ++env = Environment( ENV = os.environ, + toolpath = ['scons-tools'], + tools=[] ) #, tools=['default'] ) + @@ -121,6 +121,7 @@ env.Tool( 'default' ) env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" ) env['SHARED_LIB_ENABLED'] = True + env['CXX'] = os.environ['CXX'] else: print "UNSUPPORTED PLATFORM." env.Exit(1)