diff --git a/deskutils/vym/Makefile b/deskutils/vym/Makefile index 67436c568694..712d6ca8a51f 100644 --- a/deskutils/vym/Makefile +++ b/deskutils/vym/Makefile @@ -1,41 +1,41 @@ PORTNAME= vym DISTVERSIONPREFIX= v DISTVERSION= 3.0.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= deskutils MAINTAINER= nivit@FreeBSD.org COMMENT= VYM is a tool to generate and manipulate mind maps WWW= https://sourceforge.net/projects/vym/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libcups.so:print/cups RUN_DEPENDS= bash:shells/bash \ zip:archivers/zip USES= cmake desktop-file-utils gl qt:6 shared-mime-info shebangfix USE_GITHUB= yes GH_ACCOUNT= insilmaril USE_GL= opengl USE_QT= base declarative svg translations SHEBANG_FILES= scripts/vivym scripts/vym-addmail.rb CMAKE_ARGS= -DCMAKE_INSTALL_DATAROOTDIR:PATH="${PREFIX}/share" \ -DCMAKE_INSTALL_MANDIR:PATH="share/man/man1" OPTIONS_DEFINE= DOCS DOCS_CMAKE_BOOL= VYM_DOCS DOCS_CMAKE_ON= -DCMAKE_INSTALL_DOCDIR:PATH="${DOCSDIR}" \ -DDOCSDIR:PATH="${DOCSDIR}" post-patch: ${REINPLACE_CMD} -e 's:/usr/\(bin/zip\):${PREFIX}/\1:1' \ ${WRKSRC}/src/main.cpp .include diff --git a/deskutils/vym/files/patch-CMakeLists.txt b/deskutils/vym/files/patch-CMakeLists.txt index 56005289e90e..b87fc035b9b8 100644 --- a/deskutils/vym/files/patch-CMakeLists.txt +++ b/deskutils/vym/files/patch-CMakeLists.txt @@ -1,62 +1,62 @@ --- CMakeLists.txt.orig 2026-07-04 22:56:25 UTC +++ CMakeLists.txt @@ -62,32 +62,6 @@ find_package(Qt6 COMPONENTS ${QtComponents} REQUIRED) find_package(Qt6 REQUIRED COMPONENTS Core) find_package(Qt6 COMPONENTS ${QtComponents} REQUIRED) -find_package (Git) -if (GIT_FOUND) - message("git found: ${GIT_EXECUTABLE} in version ${GIT_VERSION_STRING}") - - execute_process( - COMMAND ${GIT_EXECUTABLE} -C ${CMAKE_SOURCE_DIR} branch --show-current - RESULT_VARIABLE RESULT - OUTPUT_VARIABLE GIT_BRANCH) - - execute_process( - COMMAND ${GIT_EXECUTABLE} -C ${CMAKE_SOURCE_DIR} rev-parse --short HEAD - RESULT_VARIABLE RESULT - OUTPUT_VARIABLE GIT_COMMIT_HASH) - - string (STRIP ${GIT_BRANCH} GIT_BRANCH) - string (STRIP ${GIT_COMMIT_HASH} GIT_COMMIT_HASH) - - message(STATUS "vym: git branch: ${OUTPUT} - commit: ${GIT_COMMIT_HASH}") - - add_compile_definitions( - GIT_BRANCH="${GIT_BRANCH}" - GIT_COMMIT_HASH="${GIT_COMMIT_HASH}") - - configure_file(${CMAKE_SOURCE_DIR}/src/git.h.in ${CMAKE_SOURCE_DIR}/src/git.h) -endif (GIT_FOUND) - # Translations # # To update the translation files based on source code changes @@ -169,9 +143,11 @@ set(VYM_SHARE_SUBDIR "vym") # On Unix-like systems, place app data under a dedicated subdir # so runtime looks in .../share/vym for resources. set(VYM_SHARE_SUBDIR "vym") -ADD_COMPILE_DEFINITIONS(VYMBASEDIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/${VYM_SHARE_SUBDIR}") -+ADD_COMPILE_DEFINITIONS(VYMBASEDIR="${DATADIR}") ++ADD_COMPILE_DEFINITIONS(VYMBASEDIR="${CMAKE_INSTALL_DATAROOTDIR}/${VYM_SHARE_SUBDIR}") +if (VYM_DOCS) +ADD_COMPILE_DEFINITIONS(VYM_DOCDIR="${DOCSDIR}") +endif() - # FIXME qm_files needed? #add_executable(vym ${VymSources} vym.qrc ${qm_files}) qt_add_executable(vym MACOSX_BUNDLE ${VymSources} vym.qrc ${qm_files} ) # FIXME Icon missing? @@ -263,9 +239,11 @@ install(DIRECTORY demos DESTINATION ${CMAKE_INSTALL_DA install(DIRECTORY demos DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${VYM_SHARE_SUBDIR}) +if(VYM_DOCS) install(DIRECTORY doc DESTINATION ${CMAKE_INSTALL_DOCDIR} FILES_MATCHING PATTERN "*.pdf") -install(FILES doc/vym.1.gz DESTINATION ${CMAKE_INSTALL_MANDIR}) install(FILES README.md LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR}) +endif() +install(FILES doc/vym.1.gz DESTINATION ${CMAKE_INSTALL_MANDIR}) install(DIRECTORY exports flags icons macros ${CMAKE_BINARY_DIR}/translations scripts styles DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${VYM_SHARE_SUBDIR}) if(UNIX)