Attachment #157994 for bug #201057

View | Details | Raw Unified | Return to bug 201057
Collapse All | Expand All





PORTNAME=	jsoncpp
DISTVERSION=	0.6.0-rc2
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	SF/${PORTNAME}/jsoncpp/${DISTVERSION}
DISTNAME=	jsoncpp-src-${DISTVERSION}

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.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
	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libjsoncpp.so.0 libjsoncpp.so )

.include <bsd.port.mk>




--- SConstruct
+++ SConstruct
@@ -26,7 +26,7 @@
     if platform == 'linux-gcc':
         CXX = 'g++' # not quite right, but env is not yet available.

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

Line 0 Link Here

(-)files/patch-src_lib__json_sconscript (+8 lines)
	1	--- src/lib_json/sconscript.orig 2015-06-22 20:34:03 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' )

Lines 1-3 Link Here

(-)pkg-plist (+1 lines)
		1	lib/libjsoncpp.so.0.6.0
1	lib/libjsoncpp.so.0	2	lib/libjsoncpp.so.0
2	lib/libjsoncpp.so	3	lib/libjsoncpp.so
3	lib/libjsoncpp.a	4	lib/libjsoncpp.a

Return to bug 201057

Lines 3-9 Link Here

(-)Makefile (-8 / +7 lines)
3		3
4	PORTNAME= jsoncpp	4	PORTNAME= jsoncpp
5	DISTVERSION= 0.6.0-rc2	5	DISTVERSION= 0.6.0-rc2
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= SF/${PORTNAME}/jsoncpp/${DISTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/jsoncpp/${DISTVERSION}
9	DISTNAME= jsoncpp-src-${DISTVERSION}	9	DISTNAME= jsoncpp-src-${DISTVERSION}
Lines 21-32 Link Here
21	do-install:	21	do-install:
22	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp	22	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
23	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)	23	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)
24	(cd ${WRKSRC}/libs/linux-gcc-FreeBSD/ && \	24	${INSTALL_DATA} ${WRKSRC}/libs/linux-gcc-FreeBSD/libjsoncpp.a \
25	${INSTALL_DATA} libjson_linux-gcc-FreeBSD_libmt.a \	25	${STAGEDIR}${PREFIX}/lib
26	${STAGEDIR}${PREFIX}/lib/libjsoncpp.a)	26	${INSTALL_LIB} ${WRKSRC}/libs/linux-gcc-FreeBSD/libjsoncpp.so.0.6.0 \
27	(cd ${WRKSRC}/libs/linux-gcc-FreeBSD/ && \	27	${STAGEDIR}${PREFIX}/lib
28	${INSTALL_LIB} libjson_linux-gcc-FreeBSD_libmt.so \	28	${LN} -s libjsoncpp.so.0.6.0 ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.0
29	${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.0)	29	${LN} -s libjsoncpp.so.0.6.0 ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so
30	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libjsoncpp.so.0 libjsoncpp.so )
31		30
32	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)files/patch-SConstruct (-2 / +41 lines)
1	--- SConstruct.orig 2014-12-02 06:28:17.000000000 +0300	1	--- SConstruct
2	+++ SConstruct 2014-12-02 06:28:31.000000000 +0300	2	+++ SConstruct
3	@@ -26,7 +26,7 @@	3	@@ -26,7 +26,7 @@
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.
Lines 26-28 Link Here
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 @@
		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 @@
		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 @@
		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' )