Index: Makefile =================================================================== --- Makefile (revision 389941) +++ Makefile (working copy) @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= jsoncpp -DISTVERSION= 0.6.0-rc2 -PORTREVISION= 1 +PORTVERSION= 1.6.2 CATEGORIES= devel -MASTER_SITES= SF/${PORTNAME}/jsoncpp/${DISTVERSION} -DISTNAME= jsoncpp-src-${DISTVERSION} +MASTER_SITES= GH MAINTAINER= johan@stromnet.se COMMENT= JSON reader and writer library for C++ @@ -13,9 +11,12 @@ LICENSE= MIT -USES= dos2unix scons +USES= dos2unix scons compiler:c++11-lib USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= open-source-parsers + MAKE_ARGS= platform=linux-gcc do-install: Index: distinfo =================================================================== --- distinfo (revision 389941) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (jsoncpp-src-0.6.0-rc2.tar.gz) = d4d193d163f520b08b9155cba978615892ca1359d77e3fb261fce2f86d09b283 -SIZE (jsoncpp-src-0.6.0-rc2.tar.gz) = 117661 +SHA256 (open-source-parsers-jsoncpp-1.6.2_GH0.tar.gz) = c40e5a2583df633b904525305bda40b622d9971fee1ece7ce48ca723a4907d36 +SIZE (open-source-parsers-jsoncpp-1.6.2_GH0.tar.gz) = 198824 Index: files/patch-SConstruct =================================================================== --- files/patch-SConstruct (revision 389941) +++ files/patch-SConstruct (working copy) @@ -1,6 +1,6 @@ ---- SConstruct.orig 2014-12-02 06:28:17.000000000 +0300 -+++ SConstruct 2014-12-02 06:28:31.000000000 +0300 -@@ -26,7 +26,7 @@ +--- SConstruct.orig 2015-06-17 17:05:29 UTC ++++ SConstruct +@@ -26,7 +26,7 @@ try: if platform == 'linux-gcc': CXX = 'g++' # not quite right, but env is not yet available. import commands @@ -9,7 +9,7 @@ platform = 'linux-gcc-%s' %version print "Using platform '%s'" %platform LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '') -@@ -65,7 +65,7 @@ +@@ -65,7 +65,7 @@ def make_environ_vars(): return vars @@ -18,9 +18,9 @@ toolpath = ['scons-tools'], tools=[] ) #, tools=['default'] ) -@@ -121,6 +121,7 @@ +@@ -121,6 +121,7 @@ elif platform.startswith('linux-gcc'): env.Tool( 'default' ) - env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" ) + env.Append( LIBS = ['pthread'], CCFLAGS = os.environ.get("CXXFLAGS", "-Wall"), LINKFLAGS=os.environ.get("LDFLAGS", "") ) env['SHARED_LIB_ENABLED'] = True + env['CXX'] = os.environ['CXX'] else: Index: pkg-plist =================================================================== --- pkg-plist (revision 389941) +++ pkg-plist (working copy) @@ -1,11 +1,13 @@ lib/libjsoncpp.so.0 lib/libjsoncpp.so lib/libjsoncpp.a -include/jsoncpp/json/writer.h +include/jsoncpp/json/assertions.h +include/jsoncpp/json/autolink.h +include/jsoncpp/json/config.h +include/jsoncpp/json/features.h +include/jsoncpp/json/forwards.h include/jsoncpp/json/json.h -include/jsoncpp/json/forwards.h -include/jsoncpp/json/config.h +include/jsoncpp/json/reader.h include/jsoncpp/json/value.h -include/jsoncpp/json/reader.h -include/jsoncpp/json/features.h -include/jsoncpp/json/autolink.h +include/jsoncpp/json/version.h +include/jsoncpp/json/writer.h