Attachment #191711 for bug #226401




# $FreeBSD$

PORTNAME=	jsoncpp
DISTVERSION=	1.8.4
PORTREVISION=	3
CATEGORIES=	devel

MAINTAINER=	yuri@FreeBSD.org

USE_GITHUB=	yes
GH_ACCOUNT=	open-source-parsers

USES=		compiler:c++11-lang meson
USE_LDCONFIG=	yes

PLATFORM=	linux-gcc-FreeBSD
MAKE_ARGS=	platform=${PLATFORM}

.include <bsd.port.pre.mk>

.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 33 || \

.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:
	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
	@cd ${WRKSRC} && CXX=${CXX} ${SCONS} platform=${PLATFORM} check

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)devel/jsoncpp/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1498626054	1	TIMESTAMP = 1521652051
2	SHA256 (open-source-parsers-jsoncpp-1.8.1_GH0.tar.gz) = 858db2faf348f89fdf1062bd3e79256772e897e7f17df73e0624edf004f2f9ac	2	SHA256 (open-source-parsers-jsoncpp-1.8.4_GH0.tar.gz) = c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6
3	SIZE (open-source-parsers-jsoncpp-1.8.1_GH0.tar.gz) = 210629	3	SIZE (open-source-parsers-jsoncpp-1.8.4_GH0.tar.gz) = 200226




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

Lines 1-8 Link Here

(-)devel/jsoncpp/files/patch-src_lib__json_sconscript (-8 lines)
1	--- src/lib_json/sconscript.orig 2016-05-09 23:15:49 UTC
2	+++ src/lib_json/sconscript
3	@@ -5,4 +5,4 @@ buildLibrary( env, Split( """
4	json_value.cpp
5	json_writer.cpp
6	""" ),
7	- 'json' )
8	+ 'jsoncpp' )




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.a
lib/libjsoncpp.so
lib/libjsoncpp.so.20
lib/libjsoncpp.so.1.8.1
libdata/pkgconfig/jsoncpp.pc

Return to bug 226401

Lines 2-9 Link Here

(-)devel/jsoncpp/Makefile (-24 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= jsoncpp	4	PORTNAME= jsoncpp
5	PORTVERSION= 1.8.1	5	DISTVERSION= 1.8.4
6	PORTREVISION= 3
7	CATEGORIES= devel	6	CATEGORIES= devel
8		7
9	MAINTAINER= yuri@FreeBSD.org	8	MAINTAINER= yuri@FreeBSD.org
Lines 15-26 Link Here
15	USE_GITHUB= yes	14	USE_GITHUB= yes
16	GH_ACCOUNT= open-source-parsers	15	GH_ACCOUNT= open-source-parsers
17		16
18	USES= compiler:c++11-lang dos2unix scons	17	USES= compiler:c++11-lang meson
19	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
20		19
21	PLATFORM= linux-gcc-FreeBSD
22	MAKE_ARGS= platform=${PLATFORM}
23
24	.include <bsd.port.pre.mk>	20	.include <bsd.port.pre.mk>
25		21
26	.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 33 \|\| \	22	.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 33 \|\| \
Lines 36-59 Link Here
36	.endif	32	.endif
37	.endif	33	.endif
38		34
39	do-install:
40	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
41	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)
42	${INSTALL_DATA} ${WRKSRC}/libs/${PLATFORM}/libjsoncpp.a \
43	${STAGEDIR}${PREFIX}/lib
44	${INSTALL_LIB} ${WRKSRC}/libs/${PLATFORM}/libjsoncpp.so.${DISTVERSION} \
45	${STAGEDIR}${PREFIX}/lib
46	${LN} -s libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.1
47	${LN} -s libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so
48	${CP} ${WRKSRC}/pkg-config/jsoncpp.pc.in ${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc
49	@${REINPLACE_CMD} -i '' \
50	-e 's\|@CMAKE_INSTALL_FULL_LIBDIR@\|${PREFIX}/lib\|g' \
51	-e 's\|@CMAKE_INSTALL_FULL_INCLUDEDIR@\|${PREFIX}/include/jsoncpp\|g' \
52	-e 's\|@JSONCPP_VERSION@\|${DISTVERSION}\|g' \
53	${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc
54
55	do-test:	35	do-test:
56	@${ECHO} "Please note that 3 testcases are known to fail: https://github.com/open-source-parsers/jsoncpp/issues/628"	36	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
57	@cd ${WRKSRC} && CXX=${CXX} ${SCONS} platform=${PLATFORM} check
58		37
59	.include <bsd.port.post.mk>	38	.include <bsd.port.post.mk>

Lines 1-67 Link Here

(-)devel/jsoncpp/files/patch-SConstruct (-67 lines)
1	--- SConstruct.orig 2016-05-09 23:15:49 UTC
2	+++ SConstruct
3	@@ -26,7 +26,7 @@ try:
4	if platform == 'linux-gcc':
5	CXX = 'g++' # not quite right, but env is not yet available.
6	import commands
7	- version = commands.getoutput('%s -dumpversion' %CXX)
8	+ version = 'FreeBSD'
9	platform = 'linux-gcc-%s' %version
10	print "Using platform '%s'" %platform
11	LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '')
12	@@ -65,7 +65,7 @@ def make_environ_vars():
13	return vars
14
15
16	-env = Environment( ENV = make_environ_vars(),
17	+env = Environment( ENV = os.environ,
18	toolpath = ['scons-tools'],
19	tools=[] ) #, tools=['default'] )
20
21	@@ -121,6 +121,7 @@ elif platform.startswith('linux-gcc'):
22	env.Tool( 'default' )
23	env.Append( LIBS = ['pthread'], CCFLAGS = os.environ.get("CXXFLAGS", "-Wall"), LINKFLAGS=os.environ.get("LDFLAGS", "") )
24	env['SHARED_LIB_ENABLED'] = True
25	+ env['CXX'] = os.environ['CXX']
26	else:
27	print "UNSUPPORTED PLATFORM."
28	env.Exit(1)
29	@@ -147,6 +148,11 @@ env['JSONCPP_VERSION'] = JSONCPP_VERSION
30	env['BUILD_DIR'] = env.Dir(build_dir)
31	env['ROOTBUILD_DIR'] = env.Dir(rootbuild_dir)
32	env['DIST_DIR'] = DIST_DIR
33	+
34	+# Set SHLIBVERSION for env.InstallVersionedLib(). We use the version number
35	+# without the "-rcXX" part.
36	+env['SHLIBVERSION'] = JSONCPP_VERSION.partition('-')[0]
37	+
38	if 'TarGz' in env['BUILDERS']:
39	class SrcDistAdder:
40	def __init__( self, env ):
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'] )
43
44	env_testing = env.Clone( )
45	-env_testing.Append( LIBS = ['json_${LIB_NAME_SUFFIX}'] )
46	+env_testing.Append( LIBS = ['jsoncpp'] )
47
48	def buildJSONExample( env, target_sources, target_name ):
49	env = env.Clone()
50	@@ -187,14 +193,14 @@ def buildUnitTests( env, target_sources,
51	env.AlwaysBuild( check_alias_target )
52
53	def buildLibrary( env, target_sources, target_name ):
54	- static_lib = env.StaticLibrary( target=target_name + '_${LIB_NAME_SUFFIX}',
55	+ static_lib = env.StaticLibrary( target=target_name,
56	source=target_sources )
57	global lib_dir
58	env.Install( lib_dir, static_lib )
59	if env['SHARED_LIB_ENABLED']:
60	- shared_lib = env.SharedLibrary( target=target_name + '_${LIB_NAME_SUFFIX}',
61	+ shared_lib = env.SharedLibrary( target=target_name,
62	source=target_sources )
63	- env.Install( lib_dir, shared_lib )
64	+ env.InstallVersionedLib( lib_dir, shared_lib )
65	env['SRCDIST_ADD']( source=[target_sources] )
66
67	Export( 'env env_testing buildJSONExample buildLibrary buildJSONTests buildUnitTests' )

Lines 1-16 Link Here

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