Index: head/devel/jsoncpp/Makefile
===================================================================
--- head/devel/jsoncpp/Makefile	(revision 444637)
+++ head/devel/jsoncpp/Makefile	(revision 444638)
@@ -1,55 +1,59 @@
 # Created by: Johan Str??m <johan@stromnet.se>
 # $FreeBSD$
 
 PORTNAME=	jsoncpp
-PORTVERSION=	1.8.0
-PORTREVISION=	2
+PORTVERSION=	1.8.1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@rawbw.com
 COMMENT=	JSON reader and writer library for C++
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	open-source-parsers
 
 USES=		compiler:features dos2unix scons
 USE_LDCONFIG=	yes
 
-MAKE_ARGS=	platform=linux-gcc
+PLATFORM=	linux-gcc-FreeBSD
+MAKE_ARGS=	platform=${PLATFORM}
 
 .include <bsd.port.pre.mk>
 
 .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
 	${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|@CMAKE_INSTALL_LIBDIR@|lib|g' \
 		-e 's|@CMAKE_INSTALL_INCLUDEDIR@|include/jsoncpp|g' \
 		-e 's|@JSONCPP_VERSION@|${DISTVERSION}|g' \
 		${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>
Index: head/devel/jsoncpp/distinfo
===================================================================
--- head/devel/jsoncpp/distinfo	(revision 444637)
+++ head/devel/jsoncpp/distinfo	(revision 444638)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482089950
-SHA256 (open-source-parsers-jsoncpp-1.8.0_GH0.tar.gz) = 5deb2462cbf0c0121c9d6c9823ec72fe71417e34242e3509bc7c003d526465bc
-SIZE (open-source-parsers-jsoncpp-1.8.0_GH0.tar.gz) = 206659
+TIMESTAMP = 1498626054
+SHA256 (open-source-parsers-jsoncpp-1.8.1_GH0.tar.gz) = 858db2faf348f89fdf1062bd3e79256772e897e7f17df73e0624edf004f2f9ac
+SIZE (open-source-parsers-jsoncpp-1.8.1_GH0.tar.gz) = 210629
Index: head/devel/jsoncpp/pkg-plist
===================================================================
--- head/devel/jsoncpp/pkg-plist	(revision 444637)
+++ head/devel/jsoncpp/pkg-plist	(revision 444638)
@@ -1,16 +1,16 @@
 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/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.8.0
+lib/libjsoncpp.so.1.8.1
 libdata/pkgconfig/jsoncpp.pc