View | Details | Raw Unified | Return to bug 226401 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-1 / +5 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	jsoncpp
4
PORTNAME=	jsoncpp
5
PORTVERSION=	1.8.1
5
PORTVERSION=	1.8.1
6
PORTREVISION=	7
6
PORTREVISION=	8
7
CATEGORIES=	devel
7
CATEGORIES=	devel
8
8
9
MAINTAINER=	yuri@FreeBSD.org
9
MAINTAINER=	yuri@FreeBSD.org
Lines 36-41 Link Here
36
.endif
36
.endif
37
.endif
37
.endif
38
38
39
post-patch:
40
	@${REINPLACE_CMD} -E '/print / s/(print )(.*)/\1\(\2\)/' \
41
		${WRKSRC}/SConstruct
42
39
do-install:
43
do-install:
40
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
44
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
41
	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)
45
	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)
(-)files/patch-SConstruct (-3 / +10 lines)
Lines 1-4 Link Here
1
--- SConstruct.orig	2016-05-09 23:15:49 UTC
1
--- SConstruct.orig	2017-06-26 05:01:22 UTC
2
+++ SConstruct
2
+++ SConstruct
3
@@ -26,7 +26,7 @@ try:
3
@@ -26,7 +26,7 @@ try:
4
     if platform == 'linux-gcc':
4
     if platform == 'linux-gcc':
Lines 26-32 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 @@ env['JSONCPP_VERSION'] = JSONCPP_VERSION
29
@@ -147,12 +148,17 @@ 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-43 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
 			self.env = env
42
 		def __call__( self, *args, **kw ):
43
-			apply( self.env.SrcDist, (self.env['SRCDIST_TARGET'],) + args, kw )
44
+			self.env.SrcDist(*(self.env['SRCDIST_TARGET'],) + args, **kw )
45
 	env['SRCDIST_BUILDER'] = env.TarGz
46
 else: # If tarfile module is missing
47
 	class SrcDistAdder:
41
@@ -164,11 +170,11 @@ env['SRCDIST_ADD'] = SrcDistAdder( env )
48
@@ -164,11 +170,11 @@ env['SRCDIST_ADD'] = SrcDistAdder( env )
42
 env['SRCDIST_TARGET'] = os.path.join( DIST_DIR, 'jsoncpp-src-%s.tar.gz' % env['JSONCPP_VERSION'] )
49
 env['SRCDIST_TARGET'] = os.path.join( DIST_DIR, 'jsoncpp-src-%s.tar.gz' % env['JSONCPP_VERSION'] )
43
                       
50
                       
Lines 52-58 Link Here
52
     exe = env.Program( target=target_name,
59
     exe = env.Program( target=target_name,
53
                        source=target_sources )
60
                        source=target_sources )
54
     env['SRCDIST_ADD']( source=[target_sources] )
61
     env['SRCDIST_ADD']( source=[target_sources] )
55
@@ -187,14 +193,14 @@ def buildUnitTests( env, target_sources,
62
@@ -187,14 +193,14 @@ def buildUnitTests( env, target_sources, target_name )
56
     env.AlwaysBuild( check_alias_target )
63
     env.AlwaysBuild( check_alias_target )
57
 
64
 
58
 def buildLibrary( env, target_sources, target_name ):
65
 def buildLibrary( env, target_sources, target_name ):

Return to bug 226401