Attachment #170313 for bug #209407




# $FreeBSD$

PORTNAME=	jsoncpp
DISTVERSION=	1.7.2
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
LICENSE_FILE=	${WRKSRC}/LICENSE

USE_GITHUB=	yes
GH_ACCOUNT=	open-source-parsers

USES=		dos2unix scons
USE_LDCONFIG=	yes

MAKE_ARGS=	platform=linux-gcc

.include <bsd.port.pre.mk>

.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
# NOTE Certain newest compiler features unlock some parts of jsoncpp API (ex. see JSON_HAS_RVALUE_REFERENCES).
# Use c++11 above to be most inclusive.
USES+=		compiler:c++11-lang
CXXFLAGS+=	--std=c++11
.endif

do-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)
	${INSTALL_DATA} ${WRKSRC}/libs/linux-gcc-FreeBSD/libjsoncpp.a \
		${STAGEDIR}${PREFIX}/lib
	${INSTALL_LIB} ${WRKSRC}/libs/linux-gcc-FreeBSD/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_PREFIX@|${PREFIX}|g' \
		-e 's|@LIBRARY_INSTALL_DIR@|${PREFIX}/lib|g' \
		-e 's|@INCLUDE_INSTALL_DIR@|${PREFIX}/jsoncpp|g' \
		-e 's|@JSONCPP_VERSION@|${DISTVERSION}|g' \
		${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)devel/jsoncpp/distinfo (-2 / +2 lines)
1	SHA256 (jsoncpp-src-0.6.0-rc2.tar.gz) = d4d193d163f520b08b9155cba978615892ca1359d77e3fb261fce2f86d09b283	1	SHA256 (open-source-parsers-jsoncpp-1.7.2_GH0.tar.gz) = 2179a7df19c1c6dc87e02c65b847efc914625a9b87df3e443d9610fc70c0f557
2	SIZE (jsoncpp-src-0.6.0-rc2.tar.gz) = 117661	2	SIZE (open-source-parsers-jsoncpp-1.7.2_GH0.tar.gz) = 205391




--- 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

         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
 	
 

                    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

 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( )

 
 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 ):

Line 0 Link Here

(-)devel/jsoncpp/files/patch-include_json_config.h (+11 lines)
	1	--- include/json/config.h.orig 2016-05-09 23:16:22 UTC
	2	+++ include/json/config.h
	3	@@ -77,7 +77,7 @@
	4
	5	#endif // defined(_MSC_VER)
	6
	7	-#if defined(_MSC_VER) && _MSC_VER <= 1600 // MSVC <= 2010
	8	+#if defined(__FreeBSD__) \|\| (defined(_MSC_VER) && _MSC_VER <= 1600) // MSVC <= 2010
	9	# define JSONCPP_OVERRIDE
	10	#else
	11	# define JSONCPP_OVERRIDE override

Lines 1-4 Link Here

(-)devel/jsoncpp/files/patch-src_lib__json_sconscript (-1 / +1 lines)
1	--- src/lib_json/sconscript.orig 2015-06-22 20:34:03 UTC	1	--- src/lib_json/sconscript.orig 2016-05-09 23:15:49 UTC
2	+++ src/lib_json/sconscript	2	+++ src/lib_json/sconscript
3	@@ -5,4 +5,4 @@ buildLibrary( env, Split( """	3	@@ -5,4 +5,4 @@ buildLibrary( env, Split( """
4	json_value.cpp	4	json_value.cpp




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/config.h
include/jsoncpp/json/value.h
include/jsoncpp/json/version.h
include/jsoncpp/json/writer.h
lib/libjsoncpp.a
lib/libjsoncpp.so
lib/libjsoncpp.so.1
lib/libjsoncpp.so.1.7.2
libdata/pkgconfig/jsoncpp.pc

Return to bug 209407

Lines 2-12 Link Here

(-)devel/jsoncpp/Makefile (-8 / +24 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= jsoncpp	4	PORTNAME= jsoncpp
5	DISTVERSION= 0.6.0-rc2	5	DISTVERSION= 1.7.2
6	PORTREVISION= 2
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= SF/${PORTNAME}/jsoncpp/${DISTVERSION}
9	DISTNAME= jsoncpp-src-${DISTVERSION}
10		7
11	MAINTAINER= johan@stromnet.se	8	MAINTAINER= johan@stromnet.se
12	COMMENT= JSON reader and writer library for C++	9	COMMENT= JSON reader and writer library for C++
Lines 14-32 Link Here
14	LICENSE= MIT	11	LICENSE= MIT
15	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
16		13
		14	USE_GITHUB= yes
		15	GH_ACCOUNT= open-source-parsers
		16
17	USES= dos2unix scons	17	USES= dos2unix scons
18	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
19		19
20	MAKE_ARGS= platform=linux-gcc	20	MAKE_ARGS= platform=linux-gcc
21		21
		22	.include <bsd.port.pre.mk>
		23
		24	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
		25	# NOTE Certain newest compiler features unlock some parts of jsoncpp API (ex. see JSON_HAS_RVALUE_REFERENCES).
		26	# Use c++11 above to be most inclusive.
		27	USES+= compiler:c++11-lang
		28	CXXFLAGS+= --std=c++11
		29	.endif
		30
22	do-install:	31	do-install:
23	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp	32	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
24	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)	33	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)
25	${INSTALL_DATA} ${WRKSRC}/libs/linux-gcc-FreeBSD/libjsoncpp.a \	34	${INSTALL_DATA} ${WRKSRC}/libs/linux-gcc-FreeBSD/libjsoncpp.a \
26	${STAGEDIR}${PREFIX}/lib	35	${STAGEDIR}${PREFIX}/lib
27	${INSTALL_LIB} ${WRKSRC}/libs/linux-gcc-FreeBSD/libjsoncpp.so.0.6.0 \	36	${INSTALL_LIB} ${WRKSRC}/libs/linux-gcc-FreeBSD/libjsoncpp.so.${DISTVERSION} \
28	${STAGEDIR}${PREFIX}/lib	37	${STAGEDIR}${PREFIX}/lib
29	${LN} -s libjsoncpp.so.0.6.0 ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.0	38	${LN} -s libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.1
30	${LN} -s libjsoncpp.so.0.6.0 ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so	39	${LN} -s libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so
		40	${CP} ${WRKSRC}/pkg-config/jsoncpp.pc.in ${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc
		41	@${REINPLACE_CMD} -i '' \
		42	-e 's\|@CMAKE_INSTALL_PREFIX@\|${PREFIX}\|g' \
		43	-e 's\|@LIBRARY_INSTALL_DIR@\|${PREFIX}/lib\|g' \
		44	-e 's\|@INCLUDE_INSTALL_DIR@\|${PREFIX}/jsoncpp\|g' \
		45	-e 's\|@JSONCPP_VERSION@\|${DISTVERSION}\|g' \
		46	${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc
31		47
32	.include <bsd.port.mk>	48	.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)devel/jsoncpp/files/patch-SConstruct (-8 / +8 lines)
1	--- SConstruct	1	--- SConstruct.orig 2016-05-09 23:15:49 UTC
2	+++ SConstruct	2	+++ SConstruct
3	@@ -26,7 +26,7 @@	3	@@ -26,7 +26,7 @@ try:
4	if platform == 'linux-gcc':	4	if platform == 'linux-gcc':
5	CXX = 'g++' # not quite right, but env is not yet available.	5	CXX = 'g++' # not quite right, but env is not yet available.
6	import commands	6	import commands
Lines 9-15 Link Here
9	platform = 'linux-gcc-%s' %version	9	platform = 'linux-gcc-%s' %version
10	print "Using platform '%s'" %platform	10	print "Using platform '%s'" %platform
11	LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '')	11	LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '')
12	@@ -65,7 +65,7 @@	12	@@ -65,7 +65,7 @@ def make_environ_vars():
13	return vars	13	return vars
14		14
15		15
Lines 18-32 Link Here
18	toolpath = ['scons-tools'],	18	toolpath = ['scons-tools'],
19	tools=[] ) #, tools=['default'] )	19	tools=[] ) #, tools=['default'] )
20		20
21	@@ -121,6 +121,7 @@	21	@@ -121,6 +121,7 @@ elif platform.startswith('linux-gcc'):
22	env.Tool( 'default' )	22	env.Tool( 'default' )
23	env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" )	23	env.Append( LIBS = ['pthread'], CCFLAGS = os.environ.get("CXXFLAGS", "-Wall"), LINKFLAGS=os.environ.get("LDFLAGS", "") )
24	env['SHARED_LIB_ENABLED'] = True	24	env['SHARED_LIB_ENABLED'] = True
25	+ env['CXX'] = os.environ['CXX']	25	+ env['CXX'] = os.environ['CXX']
26	else:	26	else:
27	print "UNSUPPORTED PLATFORM."	27	print "UNSUPPORTED PLATFORM."
28	env.Exit(1)	28	env.Exit(1)
29	@@ -147,6 +148,11 @@	29	@@ -147,6 +148,11 @@ env['JSONCPP_VERSION'] = JSONCPP_VERSION
30	env['BUILD_DIR'] = env.Dir(build_dir)	30	env['BUILD_DIR'] = env.Dir(build_dir)
31	env['ROOTBUILD_DIR'] = env.Dir(rootbuild_dir)	31	env['ROOTBUILD_DIR'] = env.Dir(rootbuild_dir)
32	env['DIST_DIR'] = DIST_DIR	32	env['DIST_DIR'] = DIST_DIR
Lines 38-44 Link Here
38	if 'TarGz' in env['BUILDERS']:	38	if 'TarGz' in env['BUILDERS']:
39	class SrcDistAdder:	39	class SrcDistAdder:
40	def __init__( self, env ):	40	def __init__( self, env ):
41	@@ -164,7 +170,7 @@	41	@@ -164,7 +170,7 @@ env['SRCDIST_ADD'] = SrcDistAdder( env )
42	env['SRCDIST_TARGET'] = os.path.join( DIST_DIR, 'jsoncpp-src-%s.tar.gz' % env['JSONCPP_VERSION'] )	42	env['SRCDIST_TARGET'] = os.path.join( DIST_DIR, 'jsoncpp-src-%s.tar.gz' % env['JSONCPP_VERSION'] )
43		43
44	env_testing = env.Clone( )	44	env_testing = env.Clone( )
Lines 47-53 Link Here
47		47
48	def buildJSONExample( env, target_sources, target_name ):	48	def buildJSONExample( env, target_sources, target_name ):
49	env = env.Clone()	49	env = env.Clone()
50	@@ -187,14 +193,14 @@	50	@@ -187,14 +193,14 @@ def buildUnitTests( env, target_sources,
51	env.AlwaysBuild( check_alias_target )	51	env.AlwaysBuild( check_alias_target )
52		52
53	def buildLibrary( env, target_sources, target_name ):	53	def buildLibrary( env, target_sources, target_name ):

Lines 1-12 Link Here

(-)devel/jsoncpp/pkg-plist (-10 / +14 lines)
1	lib/libjsoncpp.so.0.6.0	1	include/jsoncpp/json/allocator.h
2	lib/libjsoncpp.so.0	2	include/jsoncpp/json/assertions.h
3	lib/libjsoncpp.so	3	include/jsoncpp/json/autolink.h
4	lib/libjsoncpp.a	4	include/jsoncpp/json/config.h
5	include/jsoncpp/json/writer.h	5	include/jsoncpp/json/features.h
		6	include/jsoncpp/json/forwards.h
6	include/jsoncpp/json/json.h	7	include/jsoncpp/json/json.h
7	include/jsoncpp/json/forwards.h	8	include/jsoncpp/json/reader.h
8	include/jsoncpp/json/config.h
9	include/jsoncpp/json/value.h	9	include/jsoncpp/json/value.h
10	include/jsoncpp/json/reader.h	10	include/jsoncpp/json/version.h
11	include/jsoncpp/json/features.h	11	include/jsoncpp/json/writer.h
12	include/jsoncpp/json/autolink.h	12	lib/libjsoncpp.a
		13	lib/libjsoncpp.so
		14	lib/libjsoncpp.so.1
		15	lib/libjsoncpp.so.1.7.2
		16	libdata/pkgconfig/jsoncpp.pc