--- devel/jsoncpp/Makefile (revision 465076) +++ devel/jsoncpp/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= jsoncpp -PORTVERSION= 1.8.1 -PORTREVISION= 3 +DISTVERSION= 1.8.4 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -15,12 +14,9 @@ USE_GITHUB= yes GH_ACCOUNT= open-source-parsers -USES= compiler:c++11-lang dos2unix scons +USES= compiler:c++11-lang meson USE_LDCONFIG= yes -PLATFORM= linux-gcc-FreeBSD -MAKE_ARGS= platform=${PLATFORM} - .include .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 33 || \ @@ -36,24 +32,7 @@ .endif .endif -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp - (cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/) - ${INSTALL_DATA} ${WRKSRC}/libs/${PLATFORM}/libjsoncpp.a \ - ${STAGEDIR}${PREFIX}/lib - ${INSTALL_LIB} ${WRKSRC}/libs/${PLATFORM}/libjsoncpp.so.${DISTVERSION} \ - ${STAGEDIR}${PREFIX}/lib - ${LN} -s libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.1 - ${LN} -s libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so - ${CP} ${WRKSRC}/pkg-config/jsoncpp.pc.in ${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc - @${REINPLACE_CMD} -i '' \ - -e 's|@CMAKE_INSTALL_FULL_LIBDIR@|${PREFIX}/lib|g' \ - -e 's|@CMAKE_INSTALL_FULL_INCLUDEDIR@|${PREFIX}/include/jsoncpp|g' \ - -e 's|@JSONCPP_VERSION@|${DISTVERSION}|g' \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc - do-test: - @${ECHO} "Please note that 3 testcases are known to fail: https://github.com/open-source-parsers/jsoncpp/issues/628" - @cd ${WRKSRC} && CXX=${CXX} ${SCONS} platform=${PLATFORM} check + @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include --- devel/jsoncpp/distinfo (revision 465076) +++ devel/jsoncpp/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498626054 -SHA256 (open-source-parsers-jsoncpp-1.8.1_GH0.tar.gz) = 858db2faf348f89fdf1062bd3e79256772e897e7f17df73e0624edf004f2f9ac -SIZE (open-source-parsers-jsoncpp-1.8.1_GH0.tar.gz) = 210629 +TIMESTAMP = 1521652051 +SHA256 (open-source-parsers-jsoncpp-1.8.4_GH0.tar.gz) = c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6 +SIZE (open-source-parsers-jsoncpp-1.8.4_GH0.tar.gz) = 200226 --- devel/jsoncpp/files/patch-SConstruct (revision 465076) +++ devel/jsoncpp/files/patch-SConstruct (nonexistent) @@ -1,67 +0,0 @@ ---- SConstruct.orig 2016-05-09 23:15:49 UTC -+++ SConstruct -@@ -26,7 +26,7 @@ try: - 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 @@ def make_environ_vars(): - return vars - - --env = Environment( ENV = make_environ_vars(), -+env = Environment( ENV = os.environ, - toolpath = ['scons-tools'], - tools=[] ) #, tools=['default'] ) - -@@ -121,6 +121,7 @@ elif platform.startswith('linux-gcc'): - env.Tool( 'default' ) - 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: - print "UNSUPPORTED PLATFORM." - env.Exit(1) -@@ -147,6 +148,11 @@ env['JSONCPP_VERSION'] = JSONCPP_VERSION - env['BUILD_DIR'] = env.Dir(build_dir) - env['ROOTBUILD_DIR'] = env.Dir(rootbuild_dir) - env['DIST_DIR'] = DIST_DIR -+ -+# Set SHLIBVERSION for env.InstallVersionedLib(). We use the version number -+# without the "-rcXX" part. -+env['SHLIBVERSION'] = JSONCPP_VERSION.partition('-')[0] -+ - if 'TarGz' in env['BUILDERS']: - class SrcDistAdder: - def __init__( self, env ): -@@ -164,7 +170,7 @@ env['SRCDIST_ADD'] = SrcDistAdder( env ) - env['SRCDIST_TARGET'] = os.path.join( DIST_DIR, 'jsoncpp-src-%s.tar.gz' % env['JSONCPP_VERSION'] ) - - env_testing = env.Clone( ) --env_testing.Append( LIBS = ['json_${LIB_NAME_SUFFIX}'] ) -+env_testing.Append( LIBS = ['jsoncpp'] ) - - def buildJSONExample( env, target_sources, target_name ): - env = env.Clone() -@@ -187,14 +193,14 @@ def buildUnitTests( env, target_sources, - env.AlwaysBuild( check_alias_target ) - - def buildLibrary( env, target_sources, target_name ): -- static_lib = env.StaticLibrary( target=target_name + '_${LIB_NAME_SUFFIX}', -+ static_lib = env.StaticLibrary( target=target_name, - source=target_sources ) - global lib_dir - env.Install( lib_dir, static_lib ) - if env['SHARED_LIB_ENABLED']: -- shared_lib = env.SharedLibrary( target=target_name + '_${LIB_NAME_SUFFIX}', -+ shared_lib = env.SharedLibrary( target=target_name, - source=target_sources ) -- env.Install( lib_dir, shared_lib ) -+ env.InstallVersionedLib( lib_dir, shared_lib ) - env['SRCDIST_ADD']( source=[target_sources] ) - - Export( 'env env_testing buildJSONExample buildLibrary buildJSONTests buildUnitTests' ) --- devel/jsoncpp/files/patch-src_lib__json_sconscript (revision 465076) +++ devel/jsoncpp/files/patch-src_lib__json_sconscript (nonexistent) @@ -1,8 +0,0 @@ ---- src/lib_json/sconscript.orig 2016-05-09 23:15:49 UTC -+++ src/lib_json/sconscript -@@ -5,4 +5,4 @@ buildLibrary( env, Split( """ - json_value.cpp - json_writer.cpp - """ ), -- 'json' ) -+ 'jsoncpp' ) --- devel/jsoncpp/pkg-plist (revision 465076) +++ devel/jsoncpp/pkg-plist (working copy) @@ -1,16 +1,14 @@ -include/jsoncpp/json/allocator.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/reader.h -include/jsoncpp/json/value.h -include/jsoncpp/json/version.h -include/jsoncpp/json/writer.h -lib/libjsoncpp.a +include/json/allocator.h +include/json/assertions.h +include/json/autolink.h +include/json/config.h +include/json/features.h +include/json/forwards.h +include/json/json.h +include/json/reader.h +include/json/value.h +include/json/version.h +include/json/writer.h lib/libjsoncpp.so -lib/libjsoncpp.so.1 -lib/libjsoncpp.so.1.8.1 +lib/libjsoncpp.so.20 libdata/pkgconfig/jsoncpp.pc