Date: Thu, 22 Dec 2016 00:59:21 +0000 (UTC) From: Alberto Villa <avilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429134 - in head/devel: . qjson qjson-qt5 Message-ID: <201612220059.uBM0xLeT049500@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avilla Date: Thu Dec 22 00:59:21 2016 New Revision: 429134 URL: https://svnweb.freebsd.org/changeset/ports/429134 Log: devel/qjson: update to 0.9.0 - Qt 5 support (via devel/qjson-qt5) - Added indent to arrays - Replaced the scanner with a new Flex-based one - Bison 2.7 compatibility Added: head/devel/qjson-qt5/ head/devel/qjson-qt5/Makefile (contents, props changed) Modified: head/devel/Makefile head/devel/qjson/Makefile head/devel/qjson/distinfo head/devel/qjson/pkg-plist Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Thu Dec 22 00:53:23 2016 (r429133) +++ head/devel/Makefile Thu Dec 22 00:59:21 2016 (r429134) @@ -4873,6 +4873,7 @@ SUBDIR += qdevelop SUBDIR += qgit SUBDIR += qjson + SUBDIR += qjson-qt5 SUBDIR += qmake SUBDIR += qmake4 SUBDIR += qmake5 Added: head/devel/qjson-qt5/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qjson-qt5/Makefile Thu Dec 22 00:59:21 2016 (r429134) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +PORTREVISION= 0 +PKGNAMESUFFIX= -qt5 + +MASTERDIR= ${.CURDIR:H}/qjson + +.include "${MASTERDIR}/Makefile" Modified: head/devel/qjson/Makefile ============================================================================== --- head/devel/qjson/Makefile Thu Dec 22 00:53:23 2016 (r429133) +++ head/devel/qjson/Makefile Thu Dec 22 00:59:21 2016 (r429134) @@ -1,29 +1,43 @@ # $FreeBSD$ PORTNAME= qjson -PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTVERSION= 0.9.0 +PORTREVISION?= 0 CATEGORIES= devel -MASTER_SITES= SF MAINTAINER= avilla@FreeBSD.org COMMENT= Library to manage JSON objects with Qt LICENSE= LGPL21 -USE_QT4= corelib moc_build qmake_build rcc_build uic_build +USE_GITHUB= yes +GH_ACCOUNT= flavio +GH_TAGNAME= ${PORTVERSION} USES= cmake pathfix tar:bzip2 USE_LDCONFIG= yes -PORTDOCS= * +.if empty(PKGNAMESUFFIX) +USE_QT4= corelib moc_build qmake_build rcc_build uic_build +CMAKE_ARGS+= -DQT4_BUILD:BOOL=TRUE +PLIST_SUB= QT5="@comment " NO_QT5="" +.else +USE_QT5= core buildtools_build qmake_build +CMAKE_ARGS+= -DQT4_BUILD:BOOL=FALSE +PLIST_SUB= QT5="" NO_QT5="@comment " +QT_SUFFIX= -qt5 +.endif + +_DOCSDIR= ${DOCSDIR}${QT_SUFFIX} +DOCSDIR_REL= ${_DOCSDIR:S,^${PREFIX}/,,} +PLIST_SUB+= QT_SUFFIX="${QT_SUFFIX}" \ + PORTVERSION="${PORTVERSION}" OPTIONS_DEFINE= DOXYGEN +OPTIONS_SUB= yes -.include <bsd.port.options.mk> +DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen -.if ${PORT_OPTIONS:MDOXYGEN} -BUILD_DEPENDS+= doxygen:devel/doxygen -.endif +.include <bsd.port.options.mk> post-build: .if ${PORT_OPTIONS:MDOXYGEN} @@ -32,8 +46,8 @@ post-build: post-install: .if ${PORT_OPTIONS:MDOXYGEN} - ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${_DOCSDIR} + cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} \* ${STAGEDIR}${_DOCSDIR} .endif .include <bsd.port.mk> Modified: head/devel/qjson/distinfo ============================================================================== --- head/devel/qjson/distinfo Thu Dec 22 00:53:23 2016 (r429133) +++ head/devel/qjson/distinfo Thu Dec 22 00:59:21 2016 (r429134) @@ -1,2 +1,3 @@ -SHA256 (qjson-0.8.1.tar.bz2) = cd4db5b956247c4991a9c3e95512da257cd2a6bd011357e363d02300afc814d9 -SIZE (qjson-0.8.1.tar.bz2) = 64398 +TIMESTAMP = 1482323833 +SHA256 (flavio-qjson-0.9.0_GH0.tar.gz) = e812617477f3c2bb990561767a4cd8b1d3803a52018d4878da302529552610d4 +SIZE (flavio-qjson-0.9.0_GH0.tar.gz) = 98300 Modified: head/devel/qjson/pkg-plist ============================================================================== --- head/devel/qjson/pkg-plist Thu Dec 22 00:53:23 2016 (r429133) +++ head/devel/qjson/pkg-plist Thu Dec 22 00:59:21 2016 (r429134) @@ -1,14 +1,106 @@ -include/qjson/parser.h -include/qjson/parserrunnable.h -include/qjson/qjson_export.h -include/qjson/qobjecthelper.h -include/qjson/serializer.h -include/qjson/serializerrunnable.h -lib/cmake/qjson/QJSONConfig.cmake -lib/cmake/qjson/QJSONConfigVersion.cmake -lib/cmake/qjson/QJSONTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/qjson/QJSONTargets.cmake -lib/libqjson.so -lib/libqjson.so.0 -lib/libqjson.so.0.8.1 -libdata/pkgconfig/QJson.pc +include/qjson%%QT_SUFFIX%%/parser.h +include/qjson%%QT_SUFFIX%%/parserrunnable.h +include/qjson%%QT_SUFFIX%%/qjson_export.h +include/qjson%%QT_SUFFIX%%/qobjecthelper.h +include/qjson%%QT_SUFFIX%%/serializer.h +include/qjson%%QT_SUFFIX%%/serializerrunnable.h +lib/cmake/qjson%%QT_SUFFIX%%/QJSON%%QT_SUFFIX%%Config.cmake +lib/cmake/qjson%%QT_SUFFIX%%/QJSON%%QT_SUFFIX%%ConfigVersion.cmake +lib/cmake/qjson%%QT_SUFFIX%%/QJSON%%QT_SUFFIX%%Targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/qjson%%QT_SUFFIX%%/QJSON%%QT_SUFFIX%%Targets.cmake +lib/libqjson%%QT_SUFFIX%%.so +lib/libqjson%%QT_SUFFIX%%.so.0 +lib/libqjson%%QT_SUFFIX%%.so.%%PORTVERSION%% +libdata/pkgconfig/QJson%%QT_SUFFIX%%.pc +%%DOXYGEN%%%%DOCSDIR%%/FlexLexer_8h_source.html +%%DOXYGEN%%%%DOCSDIR%%/annotated.html +%%DOXYGEN%%%%DOCSDIR%%/bc_s.png +%%DOXYGEN%%%%DOCSDIR%%/bdwn.png +%%DOXYGEN%%%%DOCSDIR%%/classQJson_1_1Parser-members.html +%%DOXYGEN%%%%DOCSDIR%%/classQJson_1_1Parser.html +%%DOXYGEN%%%%DOCSDIR%%/classQJson_1_1ParserRunnable-members.html +%%DOXYGEN%%%%DOCSDIR%%/classQJson_1_1ParserRunnable.html +%%DOXYGEN%%%%DOCSDIR%%/classQJson_1_1QObjectHelper-members.html +%%DOXYGEN%%%%DOCSDIR%%/classQJson_1_1QObjectHelper.html +%%DOXYGEN%%%%DOCSDIR%%/classQJson_1_1Serializer-members.html +%%DOXYGEN%%%%DOCSDIR%%/classQJson_1_1Serializer.html +%%DOXYGEN%%%%DOCSDIR%%/classQJson_1_1SerializerRunnable-members.html +%%DOXYGEN%%%%DOCSDIR%%/classQJson_1_1SerializerRunnable.html +%%DOXYGEN%%%%DOCSDIR%%/classes.html +%%DOXYGEN%%%%DOCSDIR%%/classyy_1_1json__parser-members.html +%%DOXYGEN%%%%DOCSDIR%%/classyy_1_1json__parser.html +%%DOXYGEN%%%%DOCSDIR%%/classyy_1_1location-members.html +%%DOXYGEN%%%%DOCSDIR%%/classyy_1_1location.html +%%DOXYGEN%%%%DOCSDIR%%/classyy_1_1position-members.html +%%DOXYGEN%%%%DOCSDIR%%/classyy_1_1position.html +%%DOXYGEN%%%%DOCSDIR%%/classyy_1_1slice-members.html +%%DOXYGEN%%%%DOCSDIR%%/classyy_1_1slice.html +%%DOXYGEN%%%%DOCSDIR%%/closed.png +%%DOXYGEN%%%%DOCSDIR%%/deprecated.html +%%QT5%%%%DOXYGEN%%%%DOCSDIR%%/dir_09be59260ff9d469873c7588f75479aa.html +%%DOXYGEN%%%%DOCSDIR%%/dir_68267d1309a1af8e8297ef4c3efbcdba.html +%%DOXYGEN%%%%DOCSDIR%%/doc.png +%%DOXYGEN%%%%DOCSDIR%%/doxygen.css +%%DOXYGEN%%%%DOCSDIR%%/doxygen.png +%%DOXYGEN%%%%DOCSDIR%%/dynsections.js +%%DOXYGEN%%%%DOCSDIR%%/files.html +%%DOXYGEN%%%%DOCSDIR%%/folderclosed.png +%%DOXYGEN%%%%DOCSDIR%%/folderopen.png +%%DOXYGEN%%%%DOCSDIR%%/functions.html +%%DOXYGEN%%%%DOCSDIR%%/functions_func.html +%%DOXYGEN%%%%DOCSDIR%%/functions_type.html +%%DOXYGEN%%%%DOCSDIR%%/functions_vars.html +%%DOXYGEN%%%%DOCSDIR%%/index.html +%%DOXYGEN%%%%DOCSDIR%%/jquery.js +%%DOXYGEN%%%%DOCSDIR%%/json__parser_8cc_source.html +%%DOXYGEN%%%%DOCSDIR%%/json__parser_8hh.html +%%DOXYGEN%%%%DOCSDIR%%/json__parser_8hh_source.html +%%DOXYGEN%%%%DOCSDIR%%/json__scanner_8cc_source.html +%%DOXYGEN%%%%DOCSDIR%%/json__scanner_8cpp_source.html +%%DOXYGEN%%%%DOCSDIR%%/json__scanner_8h_source.html +%%DOXYGEN%%%%DOCSDIR%%/location_8hh.html +%%DOXYGEN%%%%DOCSDIR%%/location_8hh_source.html +%%DOXYGEN%%%%DOCSDIR%%/menu.js +%%DOXYGEN%%%%DOCSDIR%%/menudata.js +%%NO_QT5%%%%DOXYGEN%%%%DOCSDIR%%/moc__parserrunnable_8cxx_source.html +%%QT5%%%%DOXYGEN%%%%DOCSDIR%%/moc__parserrunnable__NEEXYF3NSOHNH4_8cpp_source.html +%%QT5%%%%DOXYGEN%%%%DOCSDIR%%/moc__qobjecthelper__CX6B26P7LHKEDD_8cpp_source.html +%%QT5%%%%DOXYGEN%%%%DOCSDIR%%/moc__serializerrunn__5YX4PENUFUMAXJ_8cpp_source.html +%%NO_QT5%%%%DOXYGEN%%%%DOCSDIR%%/moc__serializerrunnable_8cxx_source.html +%%DOXYGEN%%%%DOCSDIR%%/namespaceQJson.html +%%DOXYGEN%%%%DOCSDIR%%/namespacemembers.html +%%DOXYGEN%%%%DOCSDIR%%/namespacemembers_enum.html +%%DOXYGEN%%%%DOCSDIR%%/namespaces.html +%%DOXYGEN%%%%DOCSDIR%%/nav_f.png +%%DOXYGEN%%%%DOCSDIR%%/nav_g.png +%%DOXYGEN%%%%DOCSDIR%%/nav_h.png +%%DOXYGEN%%%%DOCSDIR%%/open.png +%%DOXYGEN%%%%DOCSDIR%%/pages.html +%%DOXYGEN%%%%DOCSDIR%%/parser_8cpp_source.html +%%DOXYGEN%%%%DOCSDIR%%/parser_8h_source.html +%%DOXYGEN%%%%DOCSDIR%%/parser__p_8h_source.html +%%DOXYGEN%%%%DOCSDIR%%/parserrunnable_8cpp_source.html +%%DOXYGEN%%%%DOCSDIR%%/parserrunnable_8h_source.html +%%DOXYGEN%%%%DOCSDIR%%/position_8hh.html +%%DOXYGEN%%%%DOCSDIR%%/position_8hh_source.html +%%QT5%%%%DOXYGEN%%%%DOCSDIR%%/qjson%%QT_SUFFIX%%__automoc_8cpp_source.html +%%DOXYGEN%%%%DOCSDIR%%/qjson__debug_8h_source.html +%%DOXYGEN%%%%DOCSDIR%%/qjson__export_8h_source.html +%%DOXYGEN%%%%DOCSDIR%%/qobjecthelper_8cpp_source.html +%%DOXYGEN%%%%DOCSDIR%%/qobjecthelper_8h_source.html +%%DOXYGEN%%%%DOCSDIR%%/serializer_8cpp_source.html +%%DOXYGEN%%%%DOCSDIR%%/serializer_8h_source.html +%%DOXYGEN%%%%DOCSDIR%%/serializerrunnable_8cpp_source.html +%%DOXYGEN%%%%DOCSDIR%%/serializerrunnable_8h_source.html +%%DOXYGEN%%%%DOCSDIR%%/splitbar.png +%%DOXYGEN%%%%DOCSDIR%%/stack_8hh.html +%%DOXYGEN%%%%DOCSDIR%%/stack_8hh_source.html +%%DOXYGEN%%%%DOCSDIR%%/structyy_1_1json__parser_1_1token-members.html +%%DOXYGEN%%%%DOCSDIR%%/structyy_1_1json__parser_1_1token.html +%%DOXYGEN%%%%DOCSDIR%%/sync_off.png +%%DOXYGEN%%%%DOCSDIR%%/sync_on.png +%%DOXYGEN%%%%DOCSDIR%%/tab_a.png +%%DOXYGEN%%%%DOCSDIR%%/tab_b.png +%%DOXYGEN%%%%DOCSDIR%%/tab_h.png +%%DOXYGEN%%%%DOCSDIR%%/tab_s.png +%%DOXYGEN%%%%DOCSDIR%%/tabs.css
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612220059.uBM0xLeT049500>