Index: head/finance/alkimia/Makefile =================================================================== --- head/finance/alkimia/Makefile (revision 467663) +++ head/finance/alkimia/Makefile (revision 467664) @@ -1,62 +1,62 @@ # $FreeBSD$ PORTNAME= alkimia -PORTVERSION= 7.0.1 +PORTVERSION= 7.0.2 CATEGORIES= finance kde -MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} PKGNAMESUFFIX= -${SLAVE} MAINTAINER= jhale@FreeBSD.org COMMENT= KDE financial data handling library LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB # Depending on ecm via USE_KDE causes unwanted CMAKE_ARGS to be set BUILD_DEPENDS= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/kf5-extra-cmake-modules USES= cmake:outsource pathfix tar:xz USE_LDCONFIG= yes SLAVE?= qt5 .if ${SLAVE} == qt4 USE_QT4= corelib dbus \ moc_build qmake_build rcc_build # BUILD_QT4 must be set to "1" due to comparison used in src/LibAlkimiaConfig.cmake.in CMAKE_ARGS+= -DBUILD_QT4=1 CMAKE_OFF+= KDE_INSTALL_USE_QT_SYS_PATHS INCLUDE_SUBDIR= Qt4 .else USE_QT5= core dbus \ buildtools_build qmake_build CMAKE_ON+= KDE_INSTALL_USE_QT_SYS_PATHS INCLUDE_SUBDIR= Qt5 QTVER_SUFFIX= 5 .endif PLIST_SUB= INCLUDE_SUBDIR=${INCLUDE_SUBDIR} \ QTVER_SUFFIX=${QTVER_SUFFIX} \ VER=${PORTVERSION:R} OPTIONS_SINGLE= MPLIB OPTIONS_SINGLE_MPLIB= GMP MPIR OPTIONS_DEFINE= TEST OPTIONS_DEFAULT= MPIR OPTIONS_SUB= yes MPLIB_DESC= Multi-precision library (MPIR preferred) GMP_LIB_DEPENDS= libgmp.so:math/gmp GMP_CMAKE_BOOL= CMAKE_DISABLE_FIND_PACKAGE_MPIR MPIR_DESC= MPIR (multiple precision arithmetic) support MPIR_LIB_DEPENDS= libmpir.so:math/mpir .if ${SLAVE} == qt4 TEST_USE= QT4=qtestlib .else TEST_USE= QT5=testlib .endif TEST_CMAKE_BOOL= BUILD_TESTING TEST_TEST_TARGET= test .include Index: head/finance/alkimia/distinfo =================================================================== --- head/finance/alkimia/distinfo (revision 467663) +++ head/finance/alkimia/distinfo (revision 467664) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523611128 -SHA256 (alkimia-7.0.1.tar.xz) = 42c49025b3f8489dcbc5df55101ef95bc920e160b9d5ecf573a88062883931bb -SIZE (alkimia-7.0.1.tar.xz) = 38400 +TIMESTAMP = 1524008329 +SHA256 (alkimia-7.0.2.tar.xz) = 59e6b10d819479bc8dde53a8b10e6ec05e9d465c5e035528a5c0b036456a2454 +SIZE (alkimia-7.0.2.tar.xz) = 38420 Index: head/finance/alkimia/files/patch-src_LibAlkimiaConfig.cmake.in =================================================================== --- head/finance/alkimia/files/patch-src_LibAlkimiaConfig.cmake.in (revision 467663) +++ head/finance/alkimia/files/patch-src_LibAlkimiaConfig.cmake.in (nonexistent) @@ -1,20 +0,0 @@ -Upstream fixes for KMM 4.8 (fixed in 7.0.2) - ---- src/LibAlkimiaConfig.cmake.in.orig 2018-03-15 19:28:26 UTC -+++ src/LibAlkimiaConfig.cmake.in -@@ -2,6 +2,8 @@ - - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") - -+include(CMakeFindDependencyMacro) -+ - if("@BUILD_QT4@" STREQUAL "1") - find_package(Qt4 COMPONENTS QtCore QtDBus) - else() -@@ -12,5 +14,6 @@ find_dependency(@MP_CMAKE_MODULE@) - - include("${CMAKE_CURRENT_LIST_DIR}/LibAlkimia@ALKIMIA_PATH_SUFFIX@Targets.cmake") - -+set_and_check(LIBALKIMIA_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") - set_property(TARGET Alkimia::alkimia PROPERTY INTERFACE_INCLUDE_DIRECTORIES "@PACKAGE_INCLUDE_INSTALL_DIR@" ${@MP_CMAKE_MODULE@_INCLUDE_DIR}) - message(STATUS "Found LibAlkimia: ${CMAKE_CURRENT_LIST_DIR}/LibAlkimia@ALKIMIA_PATH_SUFFIX@Config.cmake (found version \"@ALKIMIA_LIB_VERSION@\")") Property changes on: head/finance/alkimia/files/patch-src_LibAlkimiaConfig.cmake.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/finance/alkimia/files/patch-CMakeLists.txt =================================================================== --- head/finance/alkimia/files/patch-CMakeLists.txt (revision 467663) +++ head/finance/alkimia/files/patch-CMakeLists.txt (revision 467664) @@ -1,34 +1,31 @@ Make tests conditional ---- CMakeLists.txt.orig 2018-03-15 19:28:26 UTC +--- CMakeLists.txt.orig 2018-04-11 16:05:28 UTC +++ CMakeLists.txt @@ -15,7 +15,7 @@ include(FeatureSummary) # check for PkgConfig, Qt and MPIR/GMP find_package(PkgConfig) if(BUILD_QT4) - find_package(Qt4 REQUIRED COMPONENTS QtCore QtDBus QtTest) + find_package(Qt4 REQUIRED COMPONENTS QtCore QtDBus) set(QT_USE_LIBSPREFIX Qt4::Qt) set(ALKIMIA_LIB_SUFFIX "") set(ALKIMIA_INCLUDE_SUFFIX "Qt4") @@ -23,7 +23,7 @@ if(BUILD_QT4) set(PC_TARGET_QTPREFIX Qt) set(PC_TARGET_SUFFIX) else() - find_package(Qt5 REQUIRED COMPONENTS Core DBus Test) + find_package(Qt5 REQUIRED COMPONENTS Core DBus) set(QT_USE_LIBSPREFIX Qt5::) set(ALKIMIA_LIB_SUFFIX "5") set(ALKIMIA_INCLUDE_SUFFIX "Qt5") -@@ -56,6 +56,10 @@ find_package(Doxygen) - feature_summary(WHAT ALL) - - add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) -+include_directories(${MP_INCLUDE_DIR}) +@@ -59,4 +59,7 @@ add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_F + include_directories(${MP_INCLUDE_DIR}) add_subdirectory(src) -add_subdirectory(autotests) + +if(BUILD_TESTING) + add_subdirectory(autotests) +endif() Index: head/finance/alkimia/pkg-plist =================================================================== --- head/finance/alkimia/pkg-plist (revision 467663) +++ head/finance/alkimia/pkg-plist (revision 467664) @@ -1,14 +1,14 @@ include/alkimia/%%INCLUDE_SUBDIR%%/alkimia/alk_export.h include/alkimia/%%INCLUDE_SUBDIR%%/alkimia/alkcompany.h include/alkimia/%%INCLUDE_SUBDIR%%/alkimia/alkquoteitem.h include/alkimia/%%INCLUDE_SUBDIR%%/alkimia/alkvalue.h %%GMP%%lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/FindGMP.cmake %%MPIR%%lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/FindMPIR.cmake lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/LibAlkimia%%QTVER_SUFFIX%%Config.cmake lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/LibAlkimia%%QTVER_SUFFIX%%ConfigVersion.cmake lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/LibAlkimia%%QTVER_SUFFIX%%Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/LibAlkimia%%QTVER_SUFFIX%%Targets.cmake lib/libalkimia%%QTVER_SUFFIX%%.so lib/libalkimia%%QTVER_SUFFIX%%.so.7 -lib/libalkimia%%QTVER_SUFFIX%%.so.7.0.1 +lib/libalkimia%%QTVER_SUFFIX%%.so.7.0.2 libdata/pkgconfig/libalkimia%%QTVER_SUFFIX%%.pc