Le Sun, 7 May 2023 17:07:06 +0200,
Solène Rapenne <sol...@perso.pw> a écrit :
> I updated vym to latest version, a lot of changes, it moved to GitHub
> and from gmake to cmake, which simplify the port
>
> it works fine for me, I needed to add a patch to fix unzip/zip binaries
> path because it's hardcoded.
>
> However, all the icons are installed in /usr/local/share/icons/ which
> seems wrong (and portcheck reports it), but I don't know how to change
> the path here, a little help would be appreciated :)
>
patch was missing
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/productivity/vym/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 3 Oct 2022 21:18:19 -0000 1.33
+++ Makefile 7 May 2023 15:00:48 -0000
@@ -1,55 +1,35 @@
COMMENT= generate and manipulate maps of your thoughts
-DISTNAME= vym-2.6.0
+VERSION = 2.9.0
+GH_ACCOUNT = insilmaril
+GH_PROJECT = vym
+GH_TAGNAME = v${VERSION}
+DISTNAME= vym-${VERSION}
CATEGORIES= productivity x11
-REVISION= 3
HOMEPAGE= https://www.insilmaril.de/vym/
# modified GPLv2
PERMIT_PACKAGE= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vym/}
-EXTRACT_SUFX= .tar.bz2
-
-WANTLIB += GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Svg Qt5Widgets Qt5Xml c m pthread
+WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport
+WANTLIB += Qt5Script Qt5Svg Qt5Widgets Qt5Xml c m pthread
WANTLIB += ${COMPILER_LIBCXX}
-MODULES= devel/qmake \
+MODULES= devel/cmake \
x11/qt5
-MODQMAKE_ARGS= DEFINES+=VYM_DOCDIR=\\\\\\\"${PREFIX}/share/doc/vym\\\\\\\"
RUN_DEPENDS= archivers/zip \
archivers/unzip \
- textproc/libxslt
+ devel/desktop-file-utils \
+ misc/shared-mime-info \
+ textproc/libxslt \
+ x11/gtk+4,-guic
-LIB_DEPENDS= x11/qt5/qtsvg
+LIB_DEPENDS= x11/qt5/qtscript \
+ x11/qt5/qtsvg
-PORTHOME= ${WRKDIR}
+#PORTHOME= ${WRKDIR}
NO_TEST= Yes
-
-SHARE_DIRS= flags flags/freemind icons scripts styles
-
-pre-configure:
- @echo "QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}" \
- >> ${WRKSRC}/vym.pro
- ${SUBST_CMD} ${WRKSRC}/mainwindow.cpp ${WRKSRC}/main.cpp
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/vym ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vym/
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vym/
- ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${PREFIX}/share/doc/vym/
- ${INSTALL_DATA} ${WRKSRC}/demos/* ${PREFIX}/share/examples/vym/
-.for i in ${SHARE_DIRS}
- ${INSTALL_DATA_DIR} ${PREFIX}/share/vym/${i}
- find ${WRKSRC}/${i}/ -type f -exec \
- ${INSTALL_DATA} {} ${PREFIX}/share/vym/${i} \;
-.endfor
- ${INSTALL_DATA} ${WRKSRC}/doc/vym.1.gz ${PREFIX}/man/man1
- gunzip -f ${PREFIX}/man/man1/vym.1.gz
- sed -i 's,/usr/share/doc/packages,${TRUEPREFIX}/share/doc,' \
- ${PREFIX}/man/man1/vym.1
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/productivity/vym/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 29 Apr 2018 08:13:07 -0000 1.9
+++ distinfo 7 May 2023 13:17:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (vym-2.6.0.tar.bz2) = fcFyGvsnEJrcS0rqrGIX/dEpSzjoGzOgikdlYvvfoUE=
-SIZE (vym-2.6.0.tar.bz2) = 6766806
+SHA256 (vym-2.9.0.tar.gz) = ckUWgaOk4UlPJcH/nUEQwTgJXWPtTRRxx27ZB2BqfNs=
+SIZE (vym-2.9.0.tar.gz) = 8594682
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/productivity/vym/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 11 Mar 2022 19:51:48 -0000 1.8
+++ pkg/PLIST 7 May 2023 14:02:43 -0000
@@ -1,211 +1,243 @@
@bin bin/vym
-@man man/man1/vym.1
-share/doc/vym/
-share/doc/vym/vym.pdf
-share/doc/vym/vym_es.pdf
-share/doc/vym/vym_fr.pdf
-share/examples/vym/
-share/examples/vym/ao-report-example.vym
-share/examples/vym/frames.vym
-share/examples/vym/lifeforms.vym
-share/examples/vym/math.vym
-share/examples/vym/time-management.vym
-share/examples/vym/vym-contribute.vym
-share/vym/
-share/vym/flags/
-share/vym/flags/attach.png
-share/vym/flags/back.png
-share/vym/flags/bell.png
-share/vym/flags/bookmark.png
-share/vym/flags/clanbomber.png
-share/vym/flags/desktopnew.png
-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-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/flag.png
-share/vym/flags/forward.png
-share/vym/flags/freemind/
-share/vym/flags/freemind/attach.png
-share/vym/flags/freemind/back.png
-share/vym/flags/freemind/bell.png
-share/vym/flags/freemind/bookmark.png
-share/vym/flags/freemind/clanbomber.png
-share/vym/flags/freemind/desktopnew.png
-share/vym/flags/freemind/flag.png
-share/vym/flags/freemind/forward.png
-share/vym/flags/freemind/gohome.png
-share/vym/flags/freemind/help.png
-share/vym/flags/freemind/idea.png
-share/vym/flags/freemind/kaddressbook.png
-share/vym/flags/freemind/knotify.png
-share/vym/flags/freemind/korn.png
-share/vym/flags/freemind/licq.png
-share/vym/flags/freemind/mail.png
-share/vym/flags/freemind/password.png
-share/vym/flags/freemind/pencil.png
-share/vym/flags/freemind/penguin.png
-share/vym/flags/freemind/priority-1.png
-share/vym/flags/freemind/priority-2.png
-share/vym/flags/freemind/priority-3.png
-share/vym/flags/freemind/priority-4.png
-share/vym/flags/freemind/priority-5.png
-share/vym/flags/freemind/priority-6.png
-share/vym/flags/freemind/priority-7.png
-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/flags/gohome.png
-share/vym/flags/help.png
-share/vym/flags/idea.png
-share/vym/flags/kaddressbook.png
-share/vym/flags/knotify.png
-share/vym/flags/korn.png
-share/vym/flags/licq.png
-share/vym/flags/mail.png
-share/vym/flags/password.png
-share/vym/flags/pencil.png
-share/vym/flags/penguin.png
-share/vym/flags/priority-1.png
-share/vym/flags/priority-2.png
-share/vym/flags/priority-3.png
-share/vym/flags/priority-4.png
-share/vym/flags/priority-5.png
-share/vym/flags/priority-6.png
-share/vym/flags/priority-7.png
-share/vym/flags/stop.png
-share/vym/flags/warning.png
-share/vym/flags/wizard.png
-share/vym/flags/xmag.png
-share/vym/icons/
-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/icons/down.png
-share/vym/icons/editcopy.png
-share/vym/icons/editcut.png
-share/vym/icons/editpaste.png
-share/vym/icons/editsort.png
-share/vym/icons/editsortback.png
-share/vym/icons/edittrash.png
-share/vym/icons/exit.png
-share/vym/icons/file-document-export.png
-share/vym/icons/fileclose.png
-share/vym/icons/filenew.png
-share/vym/icons/filenewcopy.png
-share/vym/icons/fileopen.png
-share/vym/icons/fileprint.png
-share/vym/icons/filesave.png
-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
-share/vym/icons/formatvarfont.png
-share/vym/icons/headingeditor.png
-share/vym/icons/history.png
-share/vym/icons/linestyle-dash.png
-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/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/scripteditor.png
-share/vym/icons/selectnext.png
-share/vym/icons/selectprevious.png
-share/vym/icons/slide-camera.png
-share/vym/icons/slideeditor.png
-share/vym/icons/slidenext.png
-share/vym/icons/slideprevious.png
-share/vym/icons/sliderecord.png
-share/vym/icons/taskeditor.png
-share/vym/icons/text_block.png
-share/vym/icons/text_bold.png
-share/vym/icons/text_center.png
-share/vym/icons/text_italic.png
-share/vym/icons/text_left.png
-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/treeeditor.png
-share/vym/icons/undo.png
-share/vym/icons/up.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.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/scripts/
-share/vym/scripts/bugger
-share/vym/scripts/getbinaries
-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/
-share/vym/styles/vym.css
-share/vym/styles/vym2taskjuggler.xsl
+man/vym.1.gz
+share/applications/vym.desktop
+share/demos/
+share/demos/ao-report-example.vym
+share/demos/default-dark.vym
+share/demos/default.vym
+share/demos/frames.vym
+share/demos/lifeforms.vym
+share/demos/math.vym
+share/demos/new-flags.vym
+share/demos/scripts/
+share/demos/scripts/examplescript.vys
+share/demos/scripts/export-image.vys
+share/demos/scripts/iterating-branches.vys
+share/demos/scripts/strip-url.vys
+share/demos/task-management.vym
+share/demos/time-management.vym
+share/demos/vym-contribute.vym
+share/doc/ViewYourMind/
+share/doc/ViewYourMind/LICENSE.txt
+share/doc/ViewYourMind/README.md
+share/doc/ViewYourMind/doc/
+share/doc/ViewYourMind/doc/vym.1.gz
+share/doc/ViewYourMind/doc/vym.pdf
+share/doc/ViewYourMind/doc/vym_es.pdf
+share/doc/ViewYourMind/doc/vym_fr.pdf
+share/exports/
+share/exports/orange-blue.conf
+share/exports/template-orange-blue/
+share/exports/template-orange-blue/META-INF/
+share/exports/template-orange-blue/META-INF/manifest.xml
+share/exports/template-orange-blue/Pictures/
+share/exports/template-orange-blue/Pictures/1000000000000040000000400142E835.png
+share/exports/template-orange-blue/Thumbnails/
+share/exports/template-orange-blue/Thumbnails/thumbnail.png
+share/exports/template-orange-blue/content-template.xml
+share/exports/template-orange-blue/content.xml
+share/exports/template-orange-blue/meta.xml
+share/exports/template-orange-blue/mimetype
+share/exports/template-orange-blue/page-template.xml
+share/exports/template-orange-blue/settings.xml
+share/exports/template-orange-blue/styles.xml
+share/flags/
+share/flags/flag-hideexport.png
+share/flags/flag-present.png
+share/flags/flag-rose.png
+share/flags/flag-scrolled-right.png
+share/flags/flag-thumb-down.png
+share/flags/flag-thumb-up.png
+share/flags/flag-tmpUnscrolled-right.png
+share/flags/flag-vymlink.png
+share/flags/flag-vymlinknew.png
+share/flags/freemind/
+share/flags/freemind/attach.png
+share/flags/freemind/back.png
+share/flags/freemind/bell.png
+share/flags/freemind/bookmark.png
+share/flags/freemind/clanbomber.png
+share/flags/freemind/desktopnew.png
+share/flags/freemind/flag.png
+share/flags/freemind/forward.png
+share/flags/freemind/gohome.png
+share/flags/freemind/help.png
+share/flags/freemind/idea.png
+share/flags/freemind/kaddressbook.png
+share/flags/freemind/knotify.png
+share/flags/freemind/korn.png
+share/flags/freemind/licq.png
+share/flags/freemind/mail.png
+share/flags/freemind/password.png
+share/flags/freemind/pencil.png
+share/flags/freemind/penguin.png
+share/flags/freemind/priority-1.png
+share/flags/freemind/priority-2.png
+share/flags/freemind/priority-3.png
+share/flags/freemind/priority-4.png
+share/flags/freemind/priority-5.png
+share/flags/freemind/priority-6.png
+share/flags/freemind/priority-7.png
+share/flags/freemind/stop.png
+share/flags/freemind/warning.png
+share/flags/freemind/wizard.png
+share/flags/freemind/xmag.png
+share/flags/standard/
+share/flags/standard/Dialog-STOP.svg
+share/flags/standard/Dialog-information_on.svg
+share/flags/standard/arrow-2down-blue.svg
+share/flags/standard/arrow-2up-blue.svg
+share/flags/standard/arrow-down-blue.svg
+share/flags/standard/arrow-up-blue.svg
+share/flags/standard/dialog-ok-apply.svg
+share/flags/standard/dialog-warning.svg
+share/flags/standard/edit-delete.svg
+share/flags/standard/edit-undo.svg
+share/flags/standard/emblem-favorite.svg
+share/flags/standard/face-plain.svg
+share/flags/standard/face-sad.svg
+share/flags/standard/face-smile.svg
+share/flags/standard/face-surprise.svg
+share/flags/standard/flash.svg
+share/flags/standard/help-about.svg
+share/flags/standard/help-contextual.svg
+share/flags/standard/internet-telephony.svg
+share/flags/standard/kalarm.svg
+share/flags/standard/question-mark.svg
+share/flags/system/
+share/flags/system/applications-internet-new.svg
+share/flags/system/applications-internet.svg
+share/flags/system/klipper.svg
+share/flags/system/no-arrow-up.png
+share/flags/system/stopsign-arrow-2up.png
+share/flags/system/stopsign-arrow-up.png
+share/flags/system/target.svg
+share/flags/system/task-finished.svg
+share/flags/system/task-new-morning.svg
+share/flags/system/task-new-sleeping.svg
+share/flags/system/task-new.svg
+share/flags/system/task-wip-morning.svg
+share/flags/system/task-wip-sleeping.svg
+share/flags/system/task-wip.svg
+share/icons/configure-plus.svg
+share/icons/cursors/
+share/icons/cursors/cursorcolorpicker.png
+share/icons/cursors/cursorxlink.png
+share/icons/down-diagonal-left.png
+share/icons/down-diagonal-right.png
+share/icons/down.png
+share/icons/editcopy.png
+share/icons/editcut.png
+share/icons/editpaste.png
+share/icons/editsort.png
+share/icons/editsortback.png
+share/icons/edittrash.png
+share/icons/exit.png
+share/icons/file-document-export.png
+share/icons/fileclose.png
+share/icons/filenew.png
+share/icons/filenewcopy.png
+share/icons/fileopen.png
+share/icons/fileprint.png
+share/icons/filesave.png
+share/icons/filesaveas.png
+share/icons/find.png
+share/icons/formatcolorbranch.png
+share/icons/formatcolorpicker.png
+share/icons/formatcolorsubtree.png
+share/icons/formatfixedfont.png
+share/icons/formatrichtext.png
+share/icons/formatvarfont.png
+share/icons/headingeditor.png
+share/icons/hicolor/48x48/apps/vym.png
+share/icons/history.png
+share/icons/linestyle-dash.png
+share/icons/linestyle-dashdot.png
+share/icons/linestyle-dashdotdot.png
+share/icons/linestyle-dot.png
+share/icons/linestyle-solid.png
+share/icons/modifiers/
+share/icons/modifiers/cursorhandopen.png
+share/icons/modifiers/mode-color.png
+share/icons/modifiers/mode-move-object.svg
+share/icons/modifiers/mode-select.svg
+share/icons/modifiers/mode-xlink.png
+share/icons/newbranch.png
+share/icons/newmapcenter.png
+share/icons/redo.png
+share/icons/script-reload.svg
+share/icons/script-run.svg
+share/icons/scripteditor.png
+share/icons/selectnext.png
+share/icons/selectprevious.png
+share/icons/slide-camera.png
+share/icons/slideeditor.png
+share/icons/slidenext.png
+share/icons/slideprevious.png
+share/icons/sliderecord.png
+share/icons/system-shutdown.svg
+share/icons/taskeditor.png
+share/icons/taskfilter-activetask.png
+share/icons/taskfilter-currentmap.png
+share/icons/taskfilter-newtask.png
+share/icons/text_block.png
+share/icons/text_bold.png
+share/icons/text_center.png
+share/icons/text_italic.png
+share/icons/text_left.png
+share/icons/text_right.png
+share/icons/text_sub.png
+share/icons/text_super.png
+share/icons/text_under.png
+share/icons/transform-rotate-ccw.svg
+share/icons/transform-rotate-cw.svg
+share/icons/treeeditor.png
+share/icons/undo.png
+share/icons/up-diagonal-left.png
+share/icons/up-diagonal-right.png
+share/icons/up.png
+share/icons/video-projector.png
+share/icons/view-filter.png
+share/icons/viewmag+.png
+share/icons/viewmag-.png
+share/icons/viewmag-reset.png
+share/icons/viewshowsel.png
+share/icons/vym-128x128.ico
+share/icons/vym-128x128.png
+share/icons/vym-16x16.png
+share/icons/vym-editor.png
+share/icons/vym.icns
+share/icons/vym.png
+share/icons/vym.xpm
+share/macros/
+share/macros/macros.vys
+share/macros/slideeditor-snapshot.vys
+share/mime/packages/vym.xml
+share/scripts/
+share/scripts/vivym
+share/scripts/vym-addmail.rb
+share/scripts/vym-ruby.rb
+share/styles/
+share/styles/vym.css
+share/styles/vym2taskjuggler.xsl
+share/translations/
+share/translations/vym.cs_CZ.qm
+share/translations/vym.de.qm
+share/translations/vym.el.qm
+share/translations/vym.en.qm
+share/translations/vym.es.qm
+share/translations/vym.fr.qm
+share/translations/vym.hr_HR.qm
+share/translations/vym.ia.qm
+share/translations/vym.it.qm
+share/translations/vym.ja.qm
+share/translations/vym.pt_BR.qm
+share/translations/vym.ru.qm
+share/translations/vym.sv.qm
+share/translations/vym.zh_CN.qm
+share/translations/vym.zh_TW.qm
+@tag update-mime-database
+@tag gtk-update-icon-cache %D/share/icons/modifiers
+@tag gtk-update-icon-cache %D/share/icons/cursors
+@tag gtk-update-icon-cache %D/share/icons/hicolor
+@tag update-desktop-database
Index: patches/patch-src_main_cpp
===================================================================
RCS file: patches/patch-src_main_cpp
diff -N patches/patch-src_main_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_main_cpp 7 May 2023 18:11:29 -0000
@@ -0,0 +1,13 @@
+--- src/main.cpp.orig Sun May 7 16:11:22 2023
++++ src/main.cpp Sun May 7 16:11:46 2023
+@@ -301,8 +301,8 @@ int main(int argc, char *argv[])
+ // Only Windows 10 has tar. Older windows versions not supported.
+ zipToolPath = "tar";
+ #else
+- zipToolPath = "/usr/bin/zip";
+- unzipToolPath = "/usr/bin/unzip";
++ zipToolPath = "/usr/local/bin/zip";
++ unzipToolPath = "/usr/local/bin/unzip";
+ #endif
+ iconPath = vymBaseDir.path() + "/icons/";
+ flagsPath = vymBaseDir.path() + "/flags/";
