Index: head/devel/rapidjson/Makefile =================================================================== --- head/devel/rapidjson/Makefile (revision 423556) +++ head/devel/rapidjson/Makefile (revision 423557) @@ -1,37 +1,52 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= rapidjson -PORTVERSION= 1.0.2 +PORTVERSION= 1.1.0 DISTVERSIONPREFIX= v CATEGORIES= devel textproc MAINTAINER= yuri@rawbw.com COMMENT= Fast JSON parser/generator for C++ with both SAX/DOM style API LICENSE= unknown LICENSE_NAME= RapidJSON LICENSE_FILE= ${WRKSRC}/license.txt LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT} BROKEN_powerpc64= Does not build +DOXYGEN_BUILD_DEPENDS+= doxygen:devel/doxygen + USE_GITHUB= yes GH_ACCOUNT= miloyip -USES= cmake gmake +USES= cmake compiler:c++11-lang gmake -OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFINE= DOXYGEN EXAMPLES OPTIONS_DEFAULT=${OPTIONS_DEFINE} OPTIONS_SUB= yes +DOXYGEN_CMAKE_ON= -DRAPIDJSON_BUILD_DOC:BOOL=ON +DOXYGEN_CMAKE_OFF= -DRAPIDJSON_BUILD_DOC:BOOL=OFF +EXAMPLES_CMAKE_ON= -DRAPIDJSON_BUILD_EXAMPLES:BOOL=ON +EXAMPLES_CMAKE_OFF= -DRAPIDJSON_BUILD_EXAMPLES:BOOL=OFF + +CXXFLAGS+= -Wno-c++98-compat # for EXAMPLES option, due to this bug: https://github.com/miloyip/rapidjson/issues/761 +MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" +CMAKE_ARGS= -DRAPIDJSON_BUILD_TESTS:BOOL=OFF + +DATADIR= ${PREFIX}/share/doc/RapidJSON +PORTDATA= * + post-patch: @${REINPLACE_CMD} -e 's|LIB_INSTALL_DIR}/pkgconfig"|CMAKE_INSTALL_PREFIX}/libdata/pkgconfig"|' ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|DOC_INSTALL_DIR}/examples"|CMAKE_INSTALL_PREFIX}/share/examples/${PORTNAME}"|' ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/example/CMakeLists.txt - @${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/test/unittest/CMakeLists.txt + @${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/example/CMakeLists.txt ${WRKSRC}/test/unittest/CMakeLists.txt + @${REINPLACE_CMD} -e 's|.*travis.*||' ${WRKSRC}/CMakeLists.txt # travis_doc breaks cmake, see https://github.com/miloyip/rapidjson/issues/715 + @${REINPLACE_CMD} -e 's|add_subdirectory.*googletest.*|link_directories(${LOCALBASE}/lib)|' ${WRKSRC}/test/CMakeLists.txt post-stage: - @${RM} -rf ${STAGEDIR}${EXAMPLESDIR}/CMakeFiles + @${RM} -rf ${STAGEDIR}${EXAMPLESDIR}/CMake* .include Index: head/devel/rapidjson/distinfo =================================================================== --- head/devel/rapidjson/distinfo (revision 423556) +++ head/devel/rapidjson/distinfo (revision 423557) @@ -1,2 +1,3 @@ -SHA256 (miloyip-rapidjson-v1.0.2_GH0.tar.gz) = c3711ed2b3c76a5565ee9f0128bb4ec6753dbcc23450b713842df8f236d08666 -SIZE (miloyip-rapidjson-v1.0.2_GH0.tar.gz) = 725981 +TIMESTAMP = 1472138938 +SHA256 (miloyip-rapidjson-v1.1.0_GH0.tar.gz) = bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e +SIZE (miloyip-rapidjson-v1.1.0_GH0.tar.gz) = 1019402 Index: head/devel/rapidjson/pkg-plist =================================================================== --- head/devel/rapidjson/pkg-plist (revision 423556) +++ head/devel/rapidjson/pkg-plist (revision 423557) @@ -1,42 +1,53 @@ include/rapidjson/allocators.h include/rapidjson/document.h include/rapidjson/encodedstream.h include/rapidjson/encodings.h include/rapidjson/error/en.h include/rapidjson/error/error.h include/rapidjson/filereadstream.h include/rapidjson/filewritestream.h +include/rapidjson/fwd.h include/rapidjson/internal/biginteger.h include/rapidjson/internal/diyfp.h include/rapidjson/internal/dtoa.h include/rapidjson/internal/ieee754.h include/rapidjson/internal/itoa.h include/rapidjson/internal/meta.h include/rapidjson/internal/pow10.h +include/rapidjson/internal/regex.h include/rapidjson/internal/stack.h include/rapidjson/internal/strfunc.h include/rapidjson/internal/strtod.h +include/rapidjson/internal/swap.h +include/rapidjson/istreamwrapper.h include/rapidjson/memorybuffer.h include/rapidjson/memorystream.h include/rapidjson/msinttypes/inttypes.h include/rapidjson/msinttypes/stdint.h +include/rapidjson/ostreamwrapper.h +include/rapidjson/pointer.h include/rapidjson/prettywriter.h include/rapidjson/rapidjson.h include/rapidjson/reader.h +include/rapidjson/schema.h +include/rapidjson/stream.h include/rapidjson/stringbuffer.h include/rapidjson/writer.h lib/cmake/RapidJSON/RapidJSONConfig.cmake lib/cmake/RapidJSON/RapidJSONConfigVersion.cmake libdata/pkgconfig/RapidJSON.pc -%%DOCS%%share/doc/RapidJSON/readme.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/CMakeLists.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/capitalize/capitalize.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/condense/condense.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/filterkey/filterkey.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/filterkeydom/filterkeydom.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jsonx/jsonx.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/messagereader/messagereader.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parsebyparts/parsebyparts.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pretty/pretty.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/prettyauto/prettyauto.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/schemavalidator/schemavalidator.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/serialize/serialize.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simpledom/simpledom.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplereader/simplereader.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewriter/simplewriter.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tutorial.cpp