diff --git a/misc/vym/Makefile b/misc/vym/Makefile index 27eca8ef38cf..d5fff8ccc6b4 100644 --- a/misc/vym/Makefile +++ b/misc/vym/Makefile @@ -1,51 +1,80 @@ -# $NetBSD: Makefile,v 1.79 2024/05/29 16:33:40 adam Exp $ +# $NetBSD: Makefile,v 1.80 2024/08/18 05:16:08 wiz Exp $ # -DISTNAME= vym-2.7.1 -PKGREVISION= 35 +DISTNAME= vym-2.9.28 CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vym/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_GITHUB:=insilmaril/} +GITHUB_TAG= 8f4e86ca61801ca8a759baa9c6ffb3441b8e8291 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.insilmaril.de/vym/ COMMENT= Generate and manipulate maps which show your thoughts LICENSE= gnu-gpl-v2 -EXTRACT_USING= bsdtar - DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils +DEPENDS+= unzip-[0-9]*:../../archivers/unzip +DEPENDS+= zip-[0-9]*:../../archivers/zip -USE_LANGUAGES= c++ -USE_TOOLS+= perl:run bash:run - -REPLACE_BASH+= scripts/makedist-vym scripts/vivym -REPLACE_BASH+= scripts/getbinaries scripts/screencast +USE_LANGUAGES= c c++ +USE_TOOLS+= bash:run pkg-config gmake gzip +USE_CMAKE= yes -REPLACE_RUBY+= scripts/jigger -REPLACE_RUBY+= scripts/make-qrc.rb +REPLACE_BASH+= scripts/vivym -CHECK_INTERPRETER_SKIP= share/vym/scripts/bugger \ - share/vym/scripts/vym-addmail.rb +CHECK_INTERPRETER_SKIP= share/vym/scripts/vym-addmail.rb INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/vym SUBST_CLASSES+= flags SUBST_STAGE.flags= pre-configure SUBST_MESSAGE.flags= Fix path to flags -SUBST_FILES.flags= main.cpp +SUBST_FILES.flags= src/main.cpp src/mainwindow.cpp SUBST_VARS.flags= PREFIX -post-extract: - ${CHMOD} a-x ${WRKSRC}/icons/vym.ico +SUBST_CLASSES+= man-gz +SUBST_STAGE.man-gz= pre-configure +SUBST_MESSAGE.man-gz= Fix installing gzipped man page +SUBST_FILES.man-gz= CMakeLists.txt +SUBST_SED.man-gz= -e 's;doc/vym.1.gz;doc/vym.1;g' + +# 'CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=man/man1' seems to be ignored +SUBST_CLASSES+= cmake-mandir +SUBST_STAGE.cmake-mandir= pre-configure +SUBST_MESSAGE.cmake-mandir= Fix man page path +SUBST_FILES.cmake-mandir= CMakeLists.txt +SUBST_SED.cmake-mandir= -e 's;\$${CMAKE_INSTALL_MANDIR};$$\{CMAKE_INSTALL_PREFIX\}/man/man1;g' + +SUBST_CLASSES+= man-bin +SUBST_STAGE.man-bin= post-build +SUBST_MESSAGE.man-bin= Fixing bin path in man page +SUBST_FILES.man-bin= doc/vym.1 +SUBST_SED.man-bin= -e 's;/usr/bin/;${PREFIX}/bin/;g' -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QTDIR}/bin/qmake -unix \ - PREFIX=${PREFIX} \ - DATADIR=${PREFIX}/share \ - DOCDIR=${PREFIX}/doc/vym vym.pro +SUBST_CLASSES+= man-doc +SUBST_STAGE.man-doc= post-build +SUBST_MESSAGE.man-doc= Fixing doc path in man page +SUBST_FILES.man-doc= doc/vym.1 +SUBST_SED.man-doc= -e 's;/usr/share/doc/packages/vym;${PREFIX}/share/doc/vym;g' + +SUBST_CLASSES+= pdf-path +SUBST_STAGE.pdf-path= pre-configure +SUBST_MESSAGE.pdf-path= Fix installing pdf files in share/doc/vym/doc +SUBST_FILES.pdf-path= CMakeLists.txt +SUBST_SED.pdf-path= -e 's;doc DESTINATION;doc/ DESTINATION;g' + +CMAKE_ARG_PATH= . +CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release" +CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX} +CMAKE_ARGS+= -DCMAKE_INSTALL_DATADIR=share/vym +CMAKE_ARGS+= -DCMAKE_INSTALL_DATAROOTDIR=share/vym +CMAKE_ARGS+= -DCMAKE_INSTALL_DOCDIR=share/doc/vym +#CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=man/man1 + +post-extract: + ${GZIP_CMD} -d ${WRKSRC}/doc/vym.1.gz +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../lang/ruby/buildlink3.mk" .include "../../lang/ruby/replace.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" diff --git a/misc/vym/PLIST b/misc/vym/PLIST index 240b4a098f3f..cb6c94db76b1 100644 --- a/misc/vym/PLIST +++ b/misc/vym/PLIST @@ -1,13 +1,28 @@ -@comment $NetBSD: PLIST,v 1.7 2019/10/30 13:05:16 kamil Exp $ +@comment $NetBSD: PLIST,v 1.8 2024/08/18 05:16:08 wiz Exp $ bin/vym +man/man1/vym.1 +share/applications/vym.desktop +share/doc/vym/LICENSE.txt +share/doc/vym/README.md +share/doc/vym/vym.pdf +share/doc/vym/vym_es.pdf +share/doc/vym/vym_fr.pdf +share/icons/hicolor/48x48/apps/vym.png +share/icons/hicolor/48x48/mimetypes/application-x-vym.png +share/mime/packages/vym.xml share/vym/demos/ao-report-example.vym +share/vym/demos/default-dark.vym +share/vym/demos/default.vym share/vym/demos/frames.vym share/vym/demos/lifeforms.vym share/vym/demos/math.vym +share/vym/demos/new-flags.vym share/vym/demos/scripts/examplescript.vys share/vym/demos/scripts/export-image.vys share/vym/demos/scripts/iterating-branches.vys +share/vym/demos/scripts/setSelectionBoxDarkTheme.vys share/vym/demos/scripts/strip-url.vys +share/vym/demos/task-management.vym share/vym/demos/time-management.vym share/vym/demos/vym-contribute.vym share/vym/exports/orange-blue.conf @@ -21,51 +36,15 @@ share/vym/exports/template-orange-blue/mimetype share/vym/exports/template-orange-blue/page-template.xml share/vym/exports/template-orange-blue/settings.xml share/vym/exports/template-orange-blue/styles.xml -share/vym/flags/flag-2arrow-down.png -share/vym/flags/flag-2arrow-up.png -share/vym/flags/flag-arrow-down.png -share/vym/flags/flag-arrow-up.png -share/vym/flags/flag-clock.png -share/vym/flags/flag-cross-red.png -share/vym/flags/flag-exclamationmark.png -share/vym/flags/flag-flash.png -share/vym/flags/flag-heart.png share/vym/flags/flag-hideexport.png -share/vym/flags/flag-hook-green.png -share/vym/flags/flag-info.png -share/vym/flags/flag-lamp.png -share/vym/flags/flag-lifebelt.png -share/vym/flags/flag-no-arrow-up.png -share/vym/flags/flag-note.png -share/vym/flags/flag-phone.png share/vym/flags/flag-present.png -share/vym/flags/flag-questionmark.png share/vym/flags/flag-rose.png share/vym/flags/flag-scrolled-right.png -share/vym/flags/flag-smiley-good.png -share/vym/flags/flag-smiley-omb.png -share/vym/flags/flag-smiley-sad.png -share/vym/flags/flag-stopsign.png -share/vym/flags/flag-target.png -share/vym/flags/flag-task-finished.png -share/vym/flags/flag-task-new-morning.png -share/vym/flags/flag-task-new-sleeping.png -share/vym/flags/flag-task-new.png -share/vym/flags/flag-task-wip-morning.png -share/vym/flags/flag-task-wip-sleeping.png -share/vym/flags/flag-task-wip.png -share/vym/flags/flag-task.png share/vym/flags/flag-thumb-down.png share/vym/flags/flag-thumb-up.png share/vym/flags/flag-tmpUnscrolled-right.png -share/vym/flags/flag-url-16x16.png -share/vym/flags/flag-url-bugzilla-novell-closed.png -share/vym/flags/flag-url-bugzilla-novell.png -share/vym/flags/flag-url.png -share/vym/flags/flag-urlnew.png share/vym/flags/flag-vymlink.png share/vym/flags/flag-vymlinknew.png -share/vym/flags/flag-wip.png share/vym/flags/freemind/attach.png share/vym/flags/freemind/back.png share/vym/flags/freemind/bell.png @@ -96,12 +75,47 @@ share/vym/flags/freemind/stop.png share/vym/flags/freemind/warning.png share/vym/flags/freemind/wizard.png share/vym/flags/freemind/xmag.png -share/vym/icons/cursorcolorpicker.png -share/vym/icons/cursorcolorpicker16.png -share/vym/icons/cursorcopy.png -share/vym/icons/cursorhandopen.png -share/vym/icons/cursorhandopen16.png -share/vym/icons/cursorxlink.png +share/vym/flags/standard/Dialog-STOP.svg +share/vym/flags/standard/Dialog-information_on.svg +share/vym/flags/standard/arrow-2down-blue.svg +share/vym/flags/standard/arrow-2up-blue.svg +share/vym/flags/standard/arrow-down-blue.svg +share/vym/flags/standard/arrow-up-blue.svg +share/vym/flags/standard/dialog-ok-apply.svg +share/vym/flags/standard/dialog-warning.svg +share/vym/flags/standard/edit-delete.svg +share/vym/flags/standard/edit-undo.svg +share/vym/flags/standard/emblem-favorite.svg +share/vym/flags/standard/face-plain.svg +share/vym/flags/standard/face-sad.svg +share/vym/flags/standard/face-smile.svg +share/vym/flags/standard/face-surprise.svg +share/vym/flags/standard/flash.svg +share/vym/flags/standard/help-about.svg +share/vym/flags/standard/help-contextual.svg +share/vym/flags/standard/internet-telephony.svg +share/vym/flags/standard/kalarm.svg +share/vym/flags/standard/question-mark.svg +share/vym/flags/system/applications-internet-new.svg +share/vym/flags/system/applications-internet.svg +share/vym/flags/system/klipper.svg +share/vym/flags/system/no-arrow-up.png +share/vym/flags/system/stopsign-arrow-2up.png +share/vym/flags/system/stopsign-arrow-up.png +share/vym/flags/system/target.svg +share/vym/flags/system/task-finished.svg +share/vym/flags/system/task-new-morning.svg +share/vym/flags/system/task-new-sleeping.svg +share/vym/flags/system/task-new.svg +share/vym/flags/system/task-wip-morning.svg +share/vym/flags/system/task-wip-sleeping.svg +share/vym/flags/system/task-wip.svg +share/vym/icons/configure-plus.svg +share/vym/icons/cursors/cursorcolorpicker.png +share/vym/icons/cursors/cursorxlink.png +share/vym/icons/document-save.svg +share/vym/icons/down-diagonal-left.png +share/vym/icons/down-diagonal-right.png share/vym/icons/down.png share/vym/icons/editcopy.png share/vym/icons/editcut.png @@ -121,7 +135,6 @@ share/vym/icons/filesaveas.png share/vym/icons/find.png share/vym/icons/formatcolorbranch.png share/vym/icons/formatcolorpicker.png -share/vym/icons/formatcolorpicker.xpm share/vym/icons/formatcolorsubtree.png share/vym/icons/formatfixedfont.png share/vym/icons/formatrichtext.png @@ -133,14 +146,16 @@ share/vym/icons/linestyle-dashdot.png share/vym/icons/linestyle-dashdotdot.png share/vym/icons/linestyle-dot.png share/vym/icons/linestyle-solid.png -share/vym/icons/modecolor.png -share/vym/icons/modecopy.png -share/vym/icons/modelink.png +share/vym/icons/modifiers/cursorhandopen.png +share/vym/icons/modifiers/mode-color.png +share/vym/icons/modifiers/mode-move-object.svg +share/vym/icons/modifiers/mode-select.svg +share/vym/icons/modifiers/mode-xlink.png share/vym/icons/newbranch.png share/vym/icons/newmapcenter.png share/vym/icons/redo.png -share/vym/icons/rotate-ccw.png -share/vym/icons/rotate-cw.png +share/vym/icons/script-reload.svg +share/vym/icons/script-run.svg share/vym/icons/scripteditor.png share/vym/icons/selectnext.png share/vym/icons/selectprevious.png @@ -149,7 +164,11 @@ share/vym/icons/slideeditor.png share/vym/icons/slidenext.png share/vym/icons/slideprevious.png share/vym/icons/sliderecord.png +share/vym/icons/system-shutdown.svg share/vym/icons/taskeditor.png +share/vym/icons/taskfilter-activetask.png +share/vym/icons/taskfilter-currentmap.png +share/vym/icons/taskfilter-newtask.png share/vym/icons/text_block.png share/vym/icons/text_bold.png share/vym/icons/text_center.png @@ -159,31 +178,45 @@ share/vym/icons/text_right.png share/vym/icons/text_sub.png share/vym/icons/text_super.png share/vym/icons/text_under.png +share/vym/icons/transform-rotate-ccw.svg +share/vym/icons/transform-rotate-cw.svg share/vym/icons/treeeditor.png share/vym/icons/undo.png +share/vym/icons/up-diagonal-left.png +share/vym/icons/up-diagonal-right.png share/vym/icons/up.png +share/vym/icons/video-projector.png share/vym/icons/view-filter.png share/vym/icons/viewmag+.png share/vym/icons/viewmag-.png share/vym/icons/viewmag-reset.png share/vym/icons/viewshowsel.png +share/vym/icons/vym-128x128.ico share/vym/icons/vym-128x128.png share/vym/icons/vym-16x16.png share/vym/icons/vym-editor.png share/vym/icons/vym.icns -share/vym/icons/vym.ico share/vym/icons/vym.png share/vym/icons/vym.xpm share/vym/macros/macros.vys share/vym/macros/slideeditor-snapshot.vys -share/vym/scripts/bugger -share/vym/scripts/getbinaries -share/vym/scripts/jigger -share/vym/scripts/make-qrc.rb -share/vym/scripts/makedist-vym -share/vym/scripts/screencast share/vym/scripts/vivym share/vym/scripts/vym-addmail.rb share/vym/scripts/vym-ruby.rb share/vym/styles/vym.css share/vym/styles/vym2taskjuggler.xsl +share/vym/translations/vym.cs_CZ.qm +share/vym/translations/vym.de.qm +share/vym/translations/vym.el.qm +share/vym/translations/vym.en.qm +share/vym/translations/vym.es.qm +share/vym/translations/vym.fr.qm +share/vym/translations/vym.hr_HR.qm +share/vym/translations/vym.ia.qm +share/vym/translations/vym.it.qm +share/vym/translations/vym.ja.qm +share/vym/translations/vym.pt_BR.qm +share/vym/translations/vym.ru.qm +share/vym/translations/vym.sv.qm +share/vym/translations/vym.zh_CN.qm +share/vym/translations/vym.zh_TW.qm diff --git a/misc/vym/distinfo b/misc/vym/distinfo index 4bfbb2075b28..b30fb51cff3f 100644 --- a/misc/vym/distinfo +++ b/misc/vym/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.11 2021/10/26 10:59:36 nia Exp $ +$NetBSD: distinfo,v 1.12 2024/08/18 05:16:08 wiz Exp $ -BLAKE2s (vym-2.7.1.tar.bz2) = 0b01bc3f4c6830e1f1a525e554808a3a368d5b77c47e33e77d4468e8b9639fac -SHA512 (vym-2.7.1.tar.bz2) = 985dbf18f743c36b484050ae24e4392eeae701c6c72fca6bd3dc5b70b38a283211946e279804c66253b5a394a642683ca4e3a66a7288400a9193fbcbfd8c9582 -Size (vym-2.7.1.tar.bz2) = 6718924 bytes -SHA1 (patch-main.cpp) = 0292150eccc272431ff9dc0858bd3f0ce9532b8d +BLAKE2s (vym-2.9.28-8f4e86ca61801ca8a759baa9c6ffb3441b8e8291.tar.gz) = 46489645211ec1251c88a98110a8a997000ea42737e8ef64bbb1a43297c4a7c7 +SHA512 (vym-2.9.28-8f4e86ca61801ca8a759baa9c6ffb3441b8e8291.tar.gz) = 40ca5d323085dee48f68b913f878516504088896e6f1a40ffc7588a0c7c8bb8c3ce1e0a7058d07276e344e2aa429b6cc0cf32fe6a959a250d8d1118de00624d1 +Size (vym-2.9.28-8f4e86ca61801ca8a759baa9c6ffb3441b8e8291.tar.gz) = 8739943 bytes +SHA1 (patch-src_main.cpp) = dd6fe34545ccec49a10152da98c250ae411f5062 +SHA1 (patch-src_mainwindow.cpp) = d33e76b358591aace24b7c55ff55ce1ab7601658 diff --git a/misc/vym/patches/patch-main.cpp b/misc/vym/patches/patch-main.cpp deleted file mode 100644 index 50f46ee20f57..000000000000 --- a/misc/vym/patches/patch-main.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-main.cpp,v 1.3 2019/10/30 13:09:38 kamil Exp $ - ---- main.cpp.orig 2019-05-14 13:33:32.620701292 +0000 -+++ main.cpp -@@ -319,7 +319,7 @@ int main(int argc, char* argv[]) - vymInstallDir.setPath(basePath); - vymBaseDir.setPath(basePath); - #else -- vymBaseDir.setPath ("/usr/share/vym"); -+ vymBaseDir.setPath ("@PREFIX@/share/vym"); - if (!vymBaseDir.exists()) - { - vymBaseDir.setPath ("/usr/local/share/vym"); diff --git a/misc/vym/patches/patch-src_main.cpp b/misc/vym/patches/patch-src_main.cpp new file mode 100644 index 000000000000..2f5e1f357290 --- /dev/null +++ b/misc/vym/patches/patch-src_main.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-src_main.cpp,v 1.1 2024/08/18 05:16:09 wiz Exp $ + +Fix hardcoded path + +--- src/main.cpp.orig 2024-05-10 15:50:35.000000000 +0000 ++++ src/main.cpp +@@ -301,8 +301,8 @@ + // Only Windows 10 has tar. Older windows versions not supported. + zipToolPath = "tar"; + #else +- zipToolPath = "/usr/bin/zip"; +- unzipToolPath = "/usr/bin/unzip"; ++ zipToolPath = "@PREFIX@/bin/zip"; ++ unzipToolPath = "@PREFIX@/bin/unzip"; + #endif + iconPath = vymBaseDir.path() + "/icons/"; + flagsPath = vymBaseDir.path() + "/flags/"; diff --git a/misc/vym/patches/patch-src_mainwindow.cpp b/misc/vym/patches/patch-src_mainwindow.cpp new file mode 100644 index 000000000000..7a7ce4a5e003 --- /dev/null +++ b/misc/vym/patches/patch-src_mainwindow.cpp @@ -0,0 +1,14 @@ +$NetBSD: patch-src_mainwindow.cpp,v 1.1 2024/08/18 05:16:09 wiz Exp $ + +Fix hardcoded path + +--- src/mainwindow.cpp.orig 2024-05-10 15:50:35.000000000 +0000 ++++ src/mainwindow.cpp +@@ -7031,6 +7031,7 @@ + searchList << "doc"; // relative path for easy testing in tarball + searchList << "/usr/share/doc/vym"; // Debian + searchList << "/usr/share/doc/packages"; // Knoppix ++ searchList << "@PREFIX@/share/doc/vym"; + + bool found = false; + QFile docfile;