Index: head/devel/jsoncpp/Makefile
===================================================================
--- head/devel/jsoncpp/Makefile	(revision 391008)
+++ head/devel/jsoncpp/Makefile	(revision 391009)
@@ -1,32 +1,31 @@
 # Created by: Johan Str??m <johna@stromnet.se>
 # $FreeBSD$
 
 PORTNAME=	jsoncpp
 DISTVERSION=	0.6.0-rc2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/jsoncpp/${DISTVERSION}
 DISTNAME=	jsoncpp-src-${DISTVERSION}
 
 MAINTAINER=	johan@stromnet.se
 COMMENT=	JSON reader and writer library for C++
 
 LICENSE=	MIT
 
 USES=		dos2unix scons
 USE_LDCONFIG=	yes
 
 MAKE_ARGS=	platform=linux-gcc
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
 	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)
-	(cd ${WRKSRC}/libs/linux-gcc-FreeBSD/ &&  \
-		${INSTALL_DATA} libjson_linux-gcc-FreeBSD_libmt.a \
-		${STAGEDIR}${PREFIX}/lib/libjsoncpp.a)
-	(cd ${WRKSRC}/libs/linux-gcc-FreeBSD/ && \
-		${INSTALL_LIB} libjson_linux-gcc-FreeBSD_libmt.so \
-		${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.0)
-	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libjsoncpp.so.0 libjsoncpp.so )
+	${INSTALL_DATA} ${WRKSRC}/libs/linux-gcc-FreeBSD/libjsoncpp.a \
+		${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/libs/linux-gcc-FreeBSD/libjsoncpp.so.0.6.0 \
+		${STAGEDIR}${PREFIX}/lib
+	${LN} -s libjsoncpp.so.0.6.0 ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.0
+	${LN} -s libjsoncpp.so.0.6.0 ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so
 
 .include <bsd.port.mk>
Index: head/devel/jsoncpp/files/patch-SConstruct
===================================================================
--- head/devel/jsoncpp/files/patch-SConstruct	(revision 391008)
+++ head/devel/jsoncpp/files/patch-SConstruct	(revision 391009)
@@ -1,28 +1,67 @@
---- SConstruct.orig	2014-12-02 06:28:17.000000000 +0300
-+++ SConstruct	2014-12-02 06:28:31.000000000 +0300
+--- SConstruct
++++ SConstruct
 @@ -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)
+@@ -147,6 +148,11 @@
+ 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_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 @@
+     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' )
Index: head/devel/jsoncpp/files/patch-src_lib__json_sconscript
===================================================================
--- head/devel/jsoncpp/files/patch-src_lib__json_sconscript	(nonexistent)
+++ head/devel/jsoncpp/files/patch-src_lib__json_sconscript	(revision 391009)
@@ -0,0 +1,8 @@
+--- src/lib_json/sconscript.orig	2015-06-22 20:34:03 UTC
++++ src/lib_json/sconscript
+@@ -5,4 +5,4 @@ buildLibrary( env, Split( """
+     json_value.cpp 
+     json_writer.cpp
+      """ ),
+-    'json' )
++    'jsoncpp' )

Property changes on: head/devel/jsoncpp/files/patch-src_lib__json_sconscript
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/jsoncpp/pkg-plist
===================================================================
--- head/devel/jsoncpp/pkg-plist	(revision 391008)
+++ head/devel/jsoncpp/pkg-plist	(revision 391009)
@@ -1,11 +1,12 @@
+lib/libjsoncpp.so.0.6.0
 lib/libjsoncpp.so.0
 lib/libjsoncpp.so
 lib/libjsoncpp.a
 include/jsoncpp/json/writer.h
 include/jsoncpp/json/json.h
 include/jsoncpp/json/forwards.h
 include/jsoncpp/json/config.h
 include/jsoncpp/json/value.h
 include/jsoncpp/json/reader.h
 include/jsoncpp/json/features.h
 include/jsoncpp/json/autolink.h