[Midnightbsd-cvs] mports [24207] trunk/devel/jsoncpp: update

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Sep 4 22:09:36 EDT 2018 

Revision: 24207
          http://svnweb.midnightbsd.org/mports/?rev=24207
Author:   laffer1
Date:     2018-09-04 22:09:36 -0400 (Tue, 04 Sep 2018)
Log Message:
-----------
update

Modified Paths:
--------------
    trunk/devel/jsoncpp/Makefile
    trunk/devel/jsoncpp/distinfo
    trunk/devel/jsoncpp/pkg-plist

Added Paths:
-----------
    trunk/devel/jsoncpp/files/patch-src_lib__json_json__reader.cpp
    trunk/devel/jsoncpp/files/patch-src_lib__json_json__writer.cpp

Modified: trunk/devel/jsoncpp/Makefile
===================================================================
--- trunk/devel/jsoncpp/Makefile	2018-09-05 01:18:16 UTC (rev 24206)
+++ trunk/devel/jsoncpp/Makefile	2018-09-05 02:09:36 UTC (rev 24207)
@@ -2,7 +2,8 @@
 # $FreeBSD: head/devel/jsoncpp/Makefile 424299 2016-10-20 01:25:03Z cpm $
 
 PORTNAME=	jsoncpp
-DISTVERSION=	1.7.7
+PORTVERSION=	1.8.1
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	yuri at rawbw.com
@@ -14,30 +15,45 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	open-source-parsers
 
-USES=		dos2unix scons
+USES=		compiler:c++11-lang dos2unix scons
 USE_LDCONFIG=	yes
 
-MAKE_ARGS=	platform=linux-gcc
+PLATFORM=	linux-gcc-FreeBSD
+MAKE_ARGS=	platform=${PLATFORM}
 
 .include <bsd.port.pre.mk>
 
-pre-patch: dos2unix
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 33 || \
+    ${COMPILER_TYPE} == gcc   && ${COMPILER_VERSION} >= 48
+# Certain new compiler features unlock parts of jsoncpp API (ex. see JSON_HAS_RVALUE_REFERENCES).
+# Use c++11 above to be the most inclusive.
+USES+=		compiler:c++11-lang
+# lang/gcc5 fix
+.if ${COMPILER_TYPE} == clang
+CXXFLAGS+=	--std=c++11
+.else
+CXXFLAGS+=	--std=gnu++11 -D_GLIBCXX_USE_C99=1
+.endif
+.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 \
+	${INSTALL_DATA} ${WRKSRC}/libs/${PLATFORM}/libjsoncpp.a \
 		${STAGEDIR}${PREFIX}/lib
-	${INSTALL_LIB} ${WRKSRC}/libs/linux-gcc-FreeBSD/libjsoncpp.so.${DISTVERSION} \
+	${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
+	${LN} -sf libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.1
+	${LN} -sf 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@|${TRUE_PREFIX}|g' \
-		-e 's|@LIBRARY_INSTALL_DIR@|lib|g' \
-		-e 's|@INCLUDE_INSTALL_DIR@|include/jsoncpp|g' \
+		-e 's|@CMAKE_INSTALL_FULL_LIBDIR@|${TRUE_PREFIX}/lib|g' \
+		-e 's|@CMAKE_INSTALL_FULL_INCLUDEDIR@|${TRUE_PREFIX}/include/jsoncpp|g' \
 		-e 's|@JSONCPP_VERSION@|${DISTVERSION}|g' \
-		${PREFIX}/libdata/pkgconfig/jsoncpp.pc
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc
 
+do-test:
+	@${ECHO} "Please note that 3 testcases are known to fail: https://github.com/open-source-parsers/jsoncpp/issues/628"
+	@cd ${WRKSRC} && CXX=${CXX} ${SCONS} platform=${PLATFORM} check
+
 .include <bsd.port.post.mk>

Modified: trunk/devel/jsoncpp/distinfo
===================================================================
--- trunk/devel/jsoncpp/distinfo	2018-09-05 01:18:16 UTC (rev 24206)
+++ trunk/devel/jsoncpp/distinfo	2018-09-05 02:09:36 UTC (rev 24207)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525217168
-SHA256 (jsoncpp-1.7.7_GH0.tar.gz) = 087640ebcf7fbcfe8e2717a0b9528fff89c52fcf69fa2a18cc2b538008098f97
-SIZE (jsoncpp-1.7.7_GH0.tar.gz) = 206072
+TIMESTAMP = 1536113219
+SHA256 (jsoncpp-1.8.1_GH0.tar.gz) = 858db2faf348f89fdf1062bd3e79256772e897e7f17df73e0624edf004f2f9ac
+SIZE (jsoncpp-1.8.1_GH0.tar.gz) = 210629

Added: trunk/devel/jsoncpp/files/patch-src_lib__json_json__reader.cpp
===================================================================
--- trunk/devel/jsoncpp/files/patch-src_lib__json_json__reader.cpp	                        (rev 0)
+++ trunk/devel/jsoncpp/files/patch-src_lib__json_json__reader.cpp	2018-09-05 02:09:36 UTC (rev 24207)
@@ -0,0 +1,14 @@
+--- src/lib_json/json_reader.cpp.orig	2016-10-30 21:28:16 UTC
++++ src/lib_json/json_reader.cpp
+@@ -3,6 +3,11 @@
+ // recognized in your jurisdiction.
+ // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
+ 
++// fix for lang/gcc5+
++#if __GNUC__ == 5
++#include <cstdio>
++#endif
++
+ #if !defined(JSON_IS_AMALGAMATION)
+ #include <json/assertions.h>
+ #include <json/reader.h>


Property changes on: trunk/devel/jsoncpp/files/patch-src_lib__json_json__reader.cpp
___________________________________________________________________
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
Added: trunk/devel/jsoncpp/files/patch-src_lib__json_json__writer.cpp
===================================================================
--- trunk/devel/jsoncpp/files/patch-src_lib__json_json__writer.cpp	                        (rev 0)
+++ trunk/devel/jsoncpp/files/patch-src_lib__json_json__writer.cpp	2018-09-05 02:09:36 UTC (rev 24207)
@@ -0,0 +1,14 @@
+--- src/lib_json/json_writer.cpp.orig	2016-10-30 21:27:18 UTC
++++ src/lib_json/json_writer.cpp
+@@ -3,6 +3,11 @@
+ // recognized in your jurisdiction.
+ // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
+ 
++// fix for lang/gcc5+
++#if __GNUC__ == 5
++#include <cstdio>
++#endif
++
+ #if !defined(JSON_IS_AMALGAMATION)
+ #include <json/writer.h>
+ #include "json_tool.h"


Property changes on: trunk/devel/jsoncpp/files/patch-src_lib__json_json__writer.cpp
___________________________________________________________________
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
Modified: trunk/devel/jsoncpp/pkg-plist
===================================================================
--- trunk/devel/jsoncpp/pkg-plist	2018-09-05 01:18:16 UTC (rev 24206)
+++ trunk/devel/jsoncpp/pkg-plist	2018-09-05 02:09:36 UTC (rev 24207)
@@ -12,5 +12,5 @@
 lib/libjsoncpp.a
 lib/libjsoncpp.so
 lib/libjsoncpp.so.1
-lib/libjsoncpp.so.1.7.7
+lib/libjsoncpp.so.1.8.1
 libdata/pkgconfig/jsoncpp.pc

More information about the Midnightbsd-cvs mailing list