Index: science/ALPSCore/Makefile =================================================================== --- science/ALPSCore/Makefile +++ science/ALPSCore/Makefile @@ -2,8 +2,7 @@ PORTNAME= ALPSCore DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0 -PORTREVISION= 1 +DISTVERSION= 2.1.1 CATEGORIES= science MAINTAINER= mike.d.ft402@gmail.com @@ -16,26 +15,34 @@ libhdf5.so:science/hdf5 \ libsz.so:science/szip -USES= cmake:outsource +USES= cmake:outsource eigen:3 USE_GITHUB= yes USE_LDCONFIG= yes TEST_TARGET= test # 2 to 3 tests fail: https://github.com/ALPSCore/ALPSCore/issues/388 -CMAKE_ARGS+= -DDocumentation:BOOL=OFF # broken: https://github.com/ALPSCore/ALPSCore/issues/387 CMAKE_ARGS+= -DTesting:BOOL=OFF # enable only for the 'test' target CMAKE_ARGS_TEST= -DTesting:BOOL=ON -DExtensiveTesting:BOOL=ON CXXFLAGS+= -DNDEBUG # see https://github.com/ALPSCore/ALPSCore/issues/389 LDFLAGS+= -lexecinfo # https://github.com/ALPSCore/ALPSCore/issues/390 -OPTIONS_DEFINE= OPENMPI2 +OPTIONS_DEFINE= DOXYGEN DOCS OPENMPI2 OPTIONS_DEFAULT= OPENMPI2 OPENMPI2_DESC= Parallel processing support via Open MPI 2.x +DOXYGEN_IMPLIES= DOCS +DOXYGEN_CMAKE_BOOL= Documentation +DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen + OPENMPI2_CMAKE_BOOL= ENABLE_MPI OPENMPI2_LIB_DEPENDS= libmpi.so:net/openmpi2 OPENMPI2_VARS= cc=${LOCALBASE}/mpi/openmpi2/bin/mpicc \ cxx=${LOCALBASE}/mpi/openmpi2/bin/mpicxx +PORTDOCS= * + +post-install-DOXYGEN-on: + @${RM} ${STAGEDIR}${DOCSDIR}/.tag + pre-test: @cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_ARGS_TEST} ${CMAKE_SOURCE_PATH} && \ Index: science/ALPSCore/distinfo =================================================================== --- science/ALPSCore/distinfo +++ science/ALPSCore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511560982 -SHA256 (ALPSCore-ALPSCore-v1.0.0_GH0.tar.gz) = 2054f47929f3bdb6a0c07fb70e53194f884cdf6c830b737ed5d24312d060b12a -SIZE (ALPSCore-ALPSCore-v1.0.0_GH0.tar.gz) = 1277746 +TIMESTAMP = 1516902350 +SHA256 (ALPSCore-ALPSCore-v2.1.1_GH0.tar.gz) = 324dda8e55926fafe9db334621c16cf0fc39edbbc84a857545d5762ff0b61fad +SIZE (ALPSCore-ALPSCore-v2.1.1_GH0.tar.gz) = 1344236 Index: science/ALPSCore/files/patch-common_cmake_UseDoxygen.cmake =================================================================== --- /dev/null +++ science/ALPSCore/files/patch-common_cmake_UseDoxygen.cmake @@ -0,0 +1,11 @@ +--- common/cmake/UseDoxygen.cmake.orig 2018-01-30 05:54:55 UTC ++++ common/cmake/UseDoxygen.cmake +@@ -134,7 +134,7 @@ if(DOXYGEN_FOUND AND DOXYFILE_IN_FOUND) + + + configure_file("${DOXYFILE_IN}" "${DOXYFILE}" @ONLY) +- install(DIRECTORY ${DOXYFILE_OUTPUT_DIR}/ DESTINATION share/ALPSCore_doc MESSAGE_NEVER) ++ install(DIRECTORY ${DOXYFILE_OUTPUT_DIR}/ DESTINATION share/doc/ALPSCore MESSAGE_NEVER) + + if(NOT TARGET doc) + add_custom_target(doc ALL) Index: science/ALPSCore/pkg-plist =================================================================== --- science/ALPSCore/pkg-plist +++ science/ALPSCore/pkg-plist @@ -17,12 +17,14 @@ include/alps/accumulators/wrappers.hpp include/alps/accumulators_.hpp include/alps/config.hpp +include/alps/dictionary.hpp include/alps/gf/flagcheck.hpp include/alps/gf/fourier.hpp include/alps/gf/gf.hpp include/alps/gf/grid.hpp include/alps/gf/mesh.hpp include/alps/gf/mpi_bcast.hpp +include/alps/gf/piecewise_polynomial.hpp include/alps/gf/tail.hpp include/alps/hdf5.hpp include/alps/hdf5/archive.hpp @@ -61,15 +63,17 @@ include/alps/numeric/vector_functions.hpp include/alps/params.hpp include/alps/params/convenience_params.hpp -include/alps/params/option_description_type.hpp -include/alps/params/option_type.hpp -include/alps/params/param_iterators.hpp -include/alps/params/param_types.hpp -include/alps/params/param_types_mpl.hpp -include/alps/params/param_types_ranking.hpp -include/alps/params/params_detail.hpp +include/alps/params/dict_exceptions.hpp +include/alps/params/dict_types.hpp +include/alps/params/dict_value.hpp +include/alps/params/dict_value_impl.hpp +include/alps/params/hdf5_variant.hpp +include/alps/params/iniparser_interface.hpp +include/alps/params/mpi_variant.hpp include/alps/params/params_impl.hpp -include/alps/params/typeindex.hpp +include/alps/params/serialize_variant.hpp +include/alps/testing/fp_compare.hpp +include/alps/testing/unique_file.hpp include/alps/type_traits/average_type.hpp include/alps/type_traits/change_value_type.hpp include/alps/type_traits/covariance_type.hpp @@ -81,16 +85,19 @@ include/alps/type_traits/slice.hpp include/alps/utilities/boost_mpi.hpp include/alps/utilities/cast.hpp -include/alps/utilities/get_basename.hpp -include/alps/utilities/get_dirname.hpp +include/alps/utilities/deprecated.hpp +include/alps/utilities/fs/get_basename.hpp +include/alps/utilities/fs/get_dirname.hpp +include/alps/utilities/fs/get_extension.hpp +include/alps/utilities/fs/remove_extensions.hpp include/alps/utilities/gtest_par_xml_output.hpp include/alps/utilities/make_copy.hpp include/alps/utilities/mpi.hpp include/alps/utilities/mpi_map.hpp include/alps/utilities/mpi_optional.hpp +include/alps/utilities/mpi_pair.hpp include/alps/utilities/mpi_vector.hpp include/alps/utilities/remove_cvr.hpp -include/alps/utilities/remove_extensions.hpp include/alps/utilities/short_print.hpp include/alps/utilities/signal.hpp include/alps/utilities/size.hpp @@ -110,7 +117,8 @@ libdata/pkgconfig/alps-mc.pc libdata/pkgconfig/alps-params.pc libdata/pkgconfig/alps-utilities.pc -share/ALPSCore/ALPSCoreConfig.cmake +%%DATADIR%%/ALPSCoreConfig.cmake +%%DATADIR%%/ALPSCoreConfigVersion.cmake share/alps-accumulators/alps-accumulators-%%CMAKE_BUILD_TYPE%%.cmake share/alps-accumulators/alps-accumulators.cmake share/alps-accumulators/alps-accumulatorsConfig.cmake