diff --git a/hyper/Makefile b/hyper/Makefile index 5e4a74c25b75801ce98dd437b12c7f7f1db96ef4..b19a4c3a6cd1ece8315bff7d3607904505034956 100644 --- a/hyper/Makefile +++ b/hyper/Makefile @@ -3,8 +3,7 @@ # DISTNAME= hyper-${VERSION} -VERSION= 0.11 -PKGREVISION= 2 +VERSION= 0.12 CATEGORIES= supervision MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=hyper/} MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}hyper @@ -19,6 +18,7 @@ MAKE_JOBS_SAFE= no # because gcc eats up to 1GB for some files... CMAKE_ARGS+= -DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include CMAKE_ARGS+= -DBOOST_LIBDIR=${PREFIX.boost-libs}/include + # doc option PKG_SUPPORTED_OPTIONS+= doc PKG_OPTION_DESCR.doc?= Install ${PKGBASE} documentation @@ -26,6 +26,7 @@ PKG_OPTION_DESCR.doc?= Install ${PKGBASE} documentation define PKG_OPTION_SET.doc CMAKE_ARGS+= -DBUILD_DOC=ON CMAKE_ARGS+= -DSPHINX_BUILD=${PREFIX.py-sphinx}/bin/sphinx-build + DYNAMIC_PLIST_DIRS+= share/doc/hyper include ../../mk/sysdep/py-sphinx.mk endef define PKG_OPTION_UNSET.doc diff --git a/hyper/PLIST b/hyper/PLIST index 39dcbc1c8801fe3568c5c61fd46340b0adcac1f4..ba9a2bae63ac1c89108e66d7fed6073436102b8b 100644 --- a/hyper/PLIST +++ b/hyper/PLIST @@ -108,34 +108,6 @@ lib/libhyper_compiler.so lib/libhyper_logic.so lib/libhyper_model.so lib/libhyper_network.so -${PLIST.doc}share/doc/morse/html/_static/ajax-loader.gif -${PLIST.doc}share/doc/morse/html/_static/basic.css -${PLIST.doc}share/doc/morse/html/_static/comment-bright.png -${PLIST.doc}share/doc/morse/html/_static/comment-close.png -${PLIST.doc}share/doc/morse/html/_static/comment.png -${PLIST.doc}share/doc/morse/html/_static/default.css -${PLIST.doc}share/doc/morse/html/_static/doctools.js -${PLIST.doc}share/doc/morse/html/_static/down-pressed.png -${PLIST.doc}share/doc/morse/html/_static/down.png -${PLIST.doc}share/doc/morse/html/_static/file.png -${PLIST.doc}share/doc/morse/html/_static/jquery.js -${PLIST.doc}share/doc/morse/html/_static/minus.png -${PLIST.doc}share/doc/morse/html/_static/plus.png -${PLIST.doc}share/doc/morse/html/_static/pygments.css -${PLIST.doc}share/doc/morse/html/_static/searchtools.js -${PLIST.doc}share/doc/morse/html/_static/sidebar.js -${PLIST.doc}share/doc/morse/html/_static/underscore.js -${PLIST.doc}share/doc/morse/html/_static/up-pressed.png -${PLIST.doc}share/doc/morse/html/_static/up.png -${PLIST.doc}share/doc/morse/html/_static/websupport.js -${PLIST.doc}share/doc/morse/html/first_agent.html -${PLIST.doc}share/doc/morse/html/genindex.html -${PLIST.doc}share/doc/morse/html/hyper.html -${PLIST.doc}share/doc/morse/html/installation.html -${PLIST.doc}share/doc/morse/html/more_realist_first_agent.html -${PLIST.doc}share/doc/morse/html/search.html -${PLIST.doc}share/doc/morse/html/searchindex.js -${PLIST.doc}share/doc/morse/html/what_is_hyper.html share/hyper/FindBoost.cmake share/hyper/HyperConfig.cmake share/hyper/HyperNode.cmake diff --git a/hyper/depend.mk b/hyper/depend.mk index 7d72173463dfddb9e934e233f7e6a99f7cc52192..fc5ef8b80631115ebc4e0a8432fb0011c0fd7f35 100644 --- a/hyper/depend.mk +++ b/hyper/depend.mk @@ -14,7 +14,7 @@ PREFER.hyper?= robotpkg DEPEND_USE+= hyper -DEPEND_ABI.hyper?= hyper>=0.9 +DEPEND_ABI.hyper?= hyper>=0.12 DEPEND_DIR.hyper?= ../../wip/hyper SYSTEM_SEARCH.hyper=\ diff --git a/hyper/distinfo b/hyper/distinfo index 54ed18b603887b356d9c2c12cbe200697c2116f5..9a7fd7d5f3829e277e860cf99c2ed462286d7188 100644 --- a/hyper/distinfo +++ b/hyper/distinfo @@ -1,4 +1,3 @@ -SHA1 (hyper-0.11.tar.gz) = 0de38d9d5849ffa0ad997f98d8c6fd290be7b679 -RMD160 (hyper-0.11.tar.gz) = 5db0ade5387e34307eb36956fdd6f6683ae1814f -Size (hyper-0.11.tar.gz) = 192438 bytes -SHA1 (patch-aa) = 316d11c666d9d3f8ed288a52b99c0299382014df +SHA1 (hyper-0.12.tar.gz) = 4b6e7009e6c40957e119ee067046eb4aa162525f +RMD160 (hyper-0.12.tar.gz) = fe01256fa881adc7d31683063cf110d60fa3aac1 +Size (hyper-0.12.tar.gz) = 204234 bytes diff --git a/hyper/patches/patch-aa b/hyper/patches/patch-aa deleted file mode 100644 index 33aa6d8e94360d5bfc362378124f49c9af959fd4..0000000000000000000000000000000000000000 --- a/hyper/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -[compiler] Accept negative int in atom grammar - -diff --git a/include/compiler/base_parser.hh b/include/compiler/base_parser.hh -index 23a45c6..8d9af79 100644 ---- include/compiler/base_parser.hh -+++ include/compiler/base_parser.hh -@@ -163,7 +163,7 @@ namespace hyper { - | cst_bool - ); - -- cst_int = qi::uint_; -+ cst_int = qi::int_; - cst_double = strict_double; - cst_string = constant_string; - cst_bool = qi::bool_;