diff --git a/devel/docopt.cpp/Makefile b/devel/docopt.cpp/Makefile index 55ed325f9144..ef22755a3881 100644 --- a/devel/docopt.cpp/Makefile +++ b/devel/docopt.cpp/Makefile @@ -1,28 +1,27 @@ # $FreeBSD$ PORTNAME= docopt.cpp -DISTVERSION= 0.6.2-6 -PORTREVISION= 2 -DISTVERSIONSUFFIX= -g7476f8e +DISTVERSIONPREFIX= v +DISTVERSION= 0.6.3 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= C++11 options parser based on help messages LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE-MIT TEST_DEPENDS= python${PYTHON_DEFAULT}:lang/python${PYTHON_DEFAULT:S/.//} USES= cmake compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= docopt USE_LDCONFIG= yes do-test: @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DWITH_TESTS=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ python${PYTHON_DEFAULT} run_tests .include diff --git a/devel/docopt.cpp/distinfo b/devel/docopt.cpp/distinfo index 314a26a1a91e..707225565fe5 100644 --- a/devel/docopt.cpp/distinfo +++ b/devel/docopt.cpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542265786 -SHA256 (docopt-docopt.cpp-0.6.2-6-g7476f8e_GH0.tar.gz) = 6bb641a2b4502feba7302e7190f4a60537298134d334df6b1e27c5d85ad819bc -SIZE (docopt-docopt.cpp-0.6.2-6-g7476f8e_GH0.tar.gz) = 27080 +TIMESTAMP = 1592234659 +SHA256 (docopt-docopt.cpp-v0.6.3_GH0.tar.gz) = 28af5a0c482c6d508d22b14d588a3b0bd9ff97135f99c2814a5aa3cbff1d6632 +SIZE (docopt-docopt.cpp-v0.6.3_GH0.tar.gz) = 27598 diff --git a/devel/docopt.cpp/files/patch-CMakeLists.txt b/devel/docopt.cpp/files/patch-CMakeLists.txt index 4f8cfa933ca4..edc9019dcba4 100644 --- a/devel/docopt.cpp/files/patch-CMakeLists.txt +++ b/devel/docopt.cpp/files/patch-CMakeLists.txt @@ -1,52 +1,38 @@ ---- CMakeLists.txt.orig 2018-11-15 07:15:24 UTC +--- CMakeLists.txt.orig 2020-05-11 17:23:10 UTC +++ CMakeLists.txt @@ -42,7 +42,7 @@ if(MSVC OR XCODE) # Xcode does not support libraries with only object files as sources. # See https://cmake.org/cmake/help/v3.0/command/add_library.html?highlight=add_library add_library(docopt SHARED ${docopt_SOURCES} ${docopt_HEADERS}) - add_library(docopt_s STATIC ${docopt_SOURCES} ${docopt_HEADERS}) + #add_library(docopt_s STATIC ${docopt_SOURCES} ${docopt_HEADERS}) else() # If not using MSVC or Xcode, we will create an intermediate object target # to avoid compiling the source code twice. -@@ -50,11 +50,11 @@ else() - set_target_properties(docopt_o PROPERTIES POSITION_INDEPENDENT_CODE TRUE) - - add_library(docopt SHARED $) -- add_library(docopt_s STATIC $) -+ #add_library(docopt_s STATIC $) - endif() - - target_include_directories(docopt PUBLIC $ $) --target_include_directories(docopt_s PUBLIC $ $) -+#target_include_directories(docopt_s PUBLIC $ $) - - if(MSVC) - # DOCOPT_DLL: Must be specified when building *and* when using the DLL. -@@ -67,7 +67,7 @@ endif() +@@ -71,7 +71,7 @@ endif() if(NOT MSVC) set_target_properties(docopt PROPERTIES OUTPUT_NAME docopt) - set_target_properties(docopt_s PROPERTIES OUTPUT_NAME docopt) + #set_target_properties(docopt_s PROPERTIES OUTPUT_NAME docopt) endif() if(USE_BOOST_REGEX) -@@ -79,7 +79,7 @@ if(USE_BOOST_REGEX) +@@ -83,7 +83,7 @@ if(USE_BOOST_REGEX) include_directories(${Boost_INCLUDE_DIRS}) target_link_libraries(docopt ${Boost_LIBRARIES}) if(WITH_STATIC) - target_link_libraries(docopt_s ${Boost_LIBRARIES}) + #target_link_libraries(docopt_s ${Boost_LIBRARIES}) endif() endif() -@@ -116,7 +116,7 @@ set(export_name "docopt-targets") +@@ -120,7 +120,7 @@ set(export_name "docopt-targets") install(TARGETS docopt EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) # Development package -install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) +#install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${docopt_HEADERS} DESTINATION include/docopt) # CMake Package diff --git a/devel/docopt.cpp/pkg-plist b/devel/docopt.cpp/pkg-plist index 690772597096..61c80ee0f64d 100644 --- a/devel/docopt.cpp/pkg-plist +++ b/devel/docopt.cpp/pkg-plist @@ -1,9 +1,12 @@ include/docopt/docopt.h include/docopt/docopt_private.h include/docopt/docopt_util.h include/docopt/docopt_value.h lib/cmake/docopt/docopt-config-version.cmake lib/cmake/docopt/docopt-config.cmake lib/cmake/docopt/docopt-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/docopt/docopt-targets.cmake lib/libdocopt.so +lib/libdocopt.so.0 +lib/libdocopt.so.0.6.2 +libdata/pkgconfig/docopt.pc diff --git a/science/opensim-core/Makefile b/science/opensim-core/Makefile index 08f328a2325a..f4cf31e89665 100644 --- a/science/opensim-core/Makefile +++ b/science/opensim-core/Makefile @@ -1,56 +1,56 @@ # $FreeBSD$ PORTNAME= OpenSim DISTVERSION= 4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science PKGNAMESUFFIX= -core MAINTAINER= yuri@FreeBSD.org COMMENT= Software for modeling of musculoskeletal structures LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libdocopt.so:devel/docopt.cpp \ libSimTKcommon.so:science/simbody USES= blaslapack:openblas cmake compiler:c++11-lib fortran gl shebangfix xorg # fortran only for simbody/openblas SHEBANG_FILES= Applications/opensim-install-command-line.sh USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME:tl}-org GH_PROJECT= ${PORTNAME:tl}-core USE_GL= gl glu glut USE_XORG= xi xmu USE_LDCONFIG= yes CXXFLAGS+= -I${LOCALBASE}/include/docopt CONFIGURE_ENV+= SIMBODY_HOME=${LOCALBASE} CMAKE_OFF= OPENSIM_COPY_DEPENDENCIES DO_TESTING OPTIONS_DEFINE= PYTHON JAVA DOCS OPTIONS_DEFAULT= PYTHON JAVA OPTIONS_SUB= yes PYTHON_CMAKE_BOOL= BUILD_PYTHON_WRAPPING PYTHON_USES= python PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 JAVA_CMAKE_BOOL= BUILD_JAVA_WRAPPING JAVA_CMAKE_ON= -DJAVA_AWT_LIBRARY=${LOCALBASE}/openjdk8/jre/lib/amd64/libawt.so \ -DJAVA_JVM_LIBRARY=${LOCALBASE}/openjdk8/jre/lib/amd64/server/libjvm.so \ -DJAVA_INCLUDE_PATH=${LOCALBASE}/openjdk8/include JAVA_USE= JAVA=yes JAVA_BUILD_DEPENDS= swig3.0:devel/swig30 DOCS_CMAKE_BOOL= INSTALL_DOCS PORTDOCS= * do-test: # 4 testcases are known to fail: https://github.com/opensim-org/opensim-core/issues/2379 @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDO_TESTING=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include