From 6e2218087f7ec90e9129343a8df417838b27b5e7 Mon Sep 17 00:00:00 2001 From: reed Date: Sun, 19 Apr 2009 04:07:51 +0000 Subject: Update to 1.12.2. Thanks to Izaac via pkg/41227 Remove two patches. Improve DESCR, COMMENT, HOMEPAGE, USE_LANGUAGES. Now using qt4 instead of qt3. From vym-1.12.2/README.txt Changelog since 1.8.1 --------------------- - Feature: Restructured internal handling of XML based maps - Feature: Switched from QSimpleTextItem to QTextItem for Freemind support - Feature: Import of Freemind maps - Feature: Extended fileformat with object IDs to ease export from tomboy to vym - Feature: Completed german translation - Feature: Center on selection with "." - Feature: Most important exports can be scripted now - Feature: Creating new map with selection as MapCenter - Feature: Simple export to CSV spreadsheet - Feature: Copy from past steps in history to current one - Feature: Editing of frame attributes in branch property window - Feature: autosave - Feature: number of undo/redo levels can be changed in settings - Feature: branch property window settings are saved - Feature: Added basic macros and documentation - Feature: Color of selection can be changed now - Feature: Pen and brush for frames can be set - Feature: Simple Editor for scripts - Feature: Added syntax highlighting for editor - Feature: Unscroll all now only affects selected subtree - Feature: Modifier Modes now change cursor when CTRL is pressed - Feature: vym opens spanish documentation, if locale is es* - Feature: New Frame format - Feature: Properties dialog for branches instead of context menu entries - Feature: Only one history window for all editors. State is saved. - Feature: Canvas ported to QT 4.2 GraphicsView - Feature: Options to use AntiaAliasing and smooth pixmap transformations - Feature: Thick links use polygons now, less objects in scene - Feature: More undo commands (and fixes there) - Feature: Note Editor completly based on QT4 now. - Feature: Opening of all URLs in a subtree - Feature: Opening of all vymLinks in a subtree - Feature: Changed format of configuration file a bit (new file anyway with introduction of QT4) - Feature: Toolbar Layout is saved now - Feature: Moved floats in XML Export, e.g. XHTML shows floatimages at - Bugfix: Added missing standard flag (one of the smileys got lost) - Bugfix: Wrong parsing of relative positions after load of previously zoomed map - Bugfix: Smother parabel links (Alexander Rettig) - Bugfix: Workaround for wrong XML generated by QT with in QRichText list items - Bugfix: No output from tags in ASCII export any longer - Bugfix: Don't ask for directory in XML-based exports like KDE-bookmarks - Bugfix: auto-select/auto-edit new branches - Bugfix: Visibility of BranchProperty window is saved now - Bugfix: Undo/Redo dropping images into map - Bugfix: Undo/Redo of copy/paste steps - Bugfix: NoteEditor now appears on first click (not 2nd) - Bugfix: Disable autosave while there are redos available - Bugfix: After changing link color, that color is applied to all links now - Bugfix: Pasting of FIOs - Bugfix: No selection of branches while editing heading - Bugfix: geometry of selection box gets updated while setting scroll or hide flag - Bugfix: Possible segfault when redoing deleteChilds() - Bugfix: autosave timeout now read from settings file - Bugfix: Settings for historywindow correclty read now - Bugfix: Closing property window toggle corresponding button - Bugfix: Unscroll all childs has saveState now - Bugfix: Invisible selection after switching mapeditor - Bugfix: For frames the links always were drawn at bottom of heading - Bugfix: BranchPropertyWindow updates when selection is changed - Bugfix: Crash when trying to temporary link to floatimage - Bugfix: Drawing error when temporary linking subtrees - Bugfix: Import of KDE Bookmarks - Bugfix: Export to KDE Bookmarks - Bugfix: Export to XHTML - Bugfix: Drag and Drop of URLs now only creates one branch - Bugfix: Remember last directory before ASCII/LaTeX export - Bugfix: Editing in NoteEditor now updates actions (save) again - Bugfix: Deleting last branch automatically unscrolls parent now - Bugfix: Scroll/Unscroll has undo/redo now - Bugfix: xml-parsing code simplified - Bugfix: Fixed pretty annoying repositioning of view after editing a heading. (don't call show() before positioning in heading...) - Bugfix: Wrong Cursors after pressing CTRL and inserting/relinking - Bugfix: Save PNG images with quality 100 to workaround image problems - Bugfix: Remember last directory before XML export - Bugfix: move branch up/down calls scene()->update() now => much faster - Bugfix: Relinking of floatimages undo/redo - Bugfix: printing scales correctly again - Bugfix: Drag & Drop (basically) works again - Bugfix: Crash caused by BranchObj::getLastSelected - Bugfix: Signal handling by changes in TextEditor: Much faster now - Bugfix: printing is working again - Bugfix: move up/down to next subtree is working again - Bugfix: Flags are working again - Bugfix: Floatimages have correct select box again - Bugfix: Image format is saved with floatimage - Bugfix: New recent file handling, fixes crash on Mac OS X - Bugfix: Position of floatimages is saved again - Bugfix: Position of floatimages survives adjustCanvasSize() - Bugfix: Adding branch to scrolled branch unscroll the former - Bugfix: More undo commands (removed saveStateComplete) - Bugfix: No more hopping around of floats, when canvas is resized (by using relative positions for mainbranches. This might confuse parsing 1.8.56 documents with vym <= 1.8.1 - Bugfix: Mac - XSL stylesheets are found - Bugfix: Mac - fonts are scaling - Bugfix: Mac - hand cursor is shown correctly - Bugfix: Undo/Redo moving floatimages - Bugfix: Shortcuts for scrolling branches/removing branch - Bugfix: update-bookmarks script is not only executed, but also found now... - Bugfix: More undo/redo (move of floatimages, relinking of branches) - Bugfix: More undo/redo commands - Bugfix: Actions updated after moving a branch now - Bugfix: vym refuses to start if vymTmpDir can't be created - Bugfix: Editing headings now works both on Mac and Linux beginning of export now - Bugfix: Floatimages internally are saved as png, preserving the alpha channel - Bugfix: Fixed broken check for non-existent OO-export configuration --- misc/vym/DESCR | 9 ++--- misc/vym/Makefile | 26 +++++++------- misc/vym/PLIST | 88 +++++++++++++++++++++++++++++++++++++++-------- misc/vym/distinfo | 10 +++--- misc/vym/patches/patch-aa | 13 ------- misc/vym/patches/patch-ab | 13 ------- 6 files changed, 95 insertions(+), 64 deletions(-) delete mode 100644 misc/vym/patches/patch-aa delete mode 100644 misc/vym/patches/patch-ab (limited to 'misc') diff --git a/misc/vym/DESCR b/misc/vym/DESCR index 687451aae26..b2e4fd71f2f 100644 --- a/misc/vym/DESCR +++ b/misc/vym/DESCR @@ -1,4 +1,5 @@ -VYM (View Your Mind) is a tool to generate and manipulate maps which -show your thoughts. Such maps can help you to improve your creativity -and effectivity. You can use them for time management, to organize -tasks, to get an overview over complex contexts. +VYM (View Your Mind) is a tool to generate and manipulate maps +which show your thoughts. Such maps can help you to improve your +creativity and effectivity. You can use them for time management, +to organize tasks, to get an overview over complex contexts, to +sort your ideas etc. diff --git a/misc/vym/Makefile b/misc/vym/Makefile index cf945abaca3..12fbd16cb73 100644 --- a/misc/vym/Makefile +++ b/misc/vym/Makefile @@ -1,29 +1,29 @@ -# $NetBSD: Makefile,v 1.2 2008/07/10 12:27:59 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2009/04/19 04:07:52 reed Exp $ # -DISTNAME= vym-1.8.1 -PKGREVISION= 1 +DISTNAME= vym-1.12.2 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vym/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://sourceforge.net/projects/vym/ -COMMENT= Mind-mapping software +HOMEPAGE= http://vym.sourceforge.net/ +COMMENT= Generate and manipulate maps which show your thoughts -USE_LANGUAGES+= c c++ +USE_LANGUAGES= c++ USE_TOOLS+= perl:run bash:run REPLACE_PERL+= scripts/exportvym scripts/niceXML -REPLACE_BASH+= scripts/update-bookmarks +REPLACE_BASH+= scripts/release-mac scripts/update-bookmarks -SUBST_CLASSES+= appdir -SUBST_STAGE.appdir= post-patch -SUBST_FILES.appdir= vym.pro -SUBST_SED.appdir= -e 's|/usr/local/bin|${PREFIX}|' # sic +post-extract: + ${CHMOD} a-x ${WRKSRC}/icons/vym.ico do-configure: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake -o Makefile vym.pro + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ + ${QTDIR}/bin/qmake -unix PREFIX=${PREFIX} vym.pro -.include "../../x11/qt3/application.mk" +.include "../../x11/qt4-libs/buildlink3.mk" +.include "../../x11/qt4-tools/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/vym/PLIST b/misc/vym/PLIST index 830b77f96f6..9b2b5a9af53 100644 --- a/misc/vym/PLIST +++ b/misc/vym/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/07/05 19:36:37 agc Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/04/19 04:07:52 reed Exp $ bin/vym -share/doc/packages/vym/demos/liveform.vym -share/doc/packages/vym/demos/math.vym -share/doc/packages/vym/demos/time-management.vym -share/doc/packages/vym/demos/todo.vym +share/doc/packages/vym/vym.pdf +share/vym/demos/lifeforms.vym +share/vym/demos/math.vym +share/vym/demos/time-management.vym +share/vym/demos/vym-projectplan.vym share/vym/exports/orange-blue.conf share/vym/exports/template-orange-blue/META-INF/manifest.xml share/vym/exports/template-orange-blue/Pictures/1000000000000040000000400142E835.png @@ -46,34 +47,67 @@ share/vym/flags/flag-url-16x16.png share/vym/flags/flag-url.png share/vym/flags/flag-vymlink.png share/vym/flags/flags.xcf +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/icons/cursor.xcf share/vym/icons/cursor16.xcf 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/edittrash.png share/vym/icons/exit.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/flag-hideexport.png share/vym/icons/flag-url-16x16.png share/vym/icons/formatcolorbranch.png -share/vym/icons/formatcoloritem.png -share/vym/icons/formatcoloritem.xpm share/vym/icons/formatcolorpicker.png share/vym/icons/formatcolorpicker.xpm +share/vym/icons/formatcolorsubtree.png share/vym/icons/formatfixedfont.png share/vym/icons/formatvarfont.png +share/vym/icons/history.png share/vym/icons/icons.xcf share/vym/icons/modecolor.png share/vym/icons/modecopy.png @@ -94,21 +128,47 @@ share/vym/icons/up.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.xcf share/vym/icons/vym.xpm +share/vym/lang/vym_de.qm share/vym/lang/vym_de.ts +share/vym/lang/vym_en.qm share/vym/lang/vym_en.ts +share/vym/lang/vym_es.qm share/vym/lang/vym_es.ts +share/vym/lang/vym_fr.qm +share/vym/lang/vym_fr.ts +share/vym/lang/vym_it.qm share/vym/lang/vym_it.ts +share/vym/lang/vym_pt_BR.qm +share/vym/lang/vym_pt_BR.ts +share/vym/lang/vym_ru.qm +share/vym/lang/vym_ru.ts +share/vym/lang/vym_zh_CN.qm +share/vym/lang/vym_zh_CN.ts +share/vym/macros/macro-1.vys +share/vym/macros/macro-10.vys +share/vym/macros/macro-11.vys +share/vym/macros/macro-12.vys +share/vym/macros/macro-2.vys +share/vym/macros/macro-3.vys +share/vym/macros/macro-4.vys +share/vym/macros/macro-5.vys +share/vym/macros/macro-6.vys +share/vym/macros/macro-7.vys +share/vym/macros/macro-8.vys +share/vym/macros/macro-9.vys share/vym/scripts/exportvym share/vym/scripts/niceXML +share/vym/scripts/release-mac share/vym/scripts/update-bookmarks -share/vym/scripts/vym2html.sh -share/vym/scripts/vym2txt.sh share/vym/styles/cm.xsl share/vym/styles/kdebookmarks2vym.xsl share/vym/styles/mmap2vym.xsl @@ -119,21 +179,19 @@ share/vym/styles/vym2kdebookmarks.xsl share/vym/styles/vym2taskjuggler.xsl share/vym/styles/vym2txt.xsl share/vym/styles/vym2xhtml.xsl -@exec ${MKDIR} %D/share/vym/styles/wiki -@dirrm share/vym/styles/wiki @dirrm share/vym/styles @dirrm share/vym/scripts +@dirrm share/vym/macros @dirrm share/vym/lang @dirrm share/vym/icons +@dirrm share/vym/flags/freemind @dirrm share/vym/flags @dirrm share/vym/exports/template-orange-blue/Thumbnails @dirrm share/vym/exports/template-orange-blue/Pictures @dirrm share/vym/exports/template-orange-blue/META-INF -@exec ${MKDIR} %D/share/vym/exports/template-orange-blue/Configurations2 -@dirrm share/vym/exports/template-orange-blue/Configurations2 @dirrm share/vym/exports/template-orange-blue @dirrm share/vym/exports +@dirrm share/vym/demos @dirrm share/vym -@dirrm share/doc/packages/vym/demos @dirrm share/doc/packages/vym @dirrm share/doc/packages diff --git a/misc/vym/distinfo b/misc/vym/distinfo index 18794723d2c..eaa6e7f5f91 100644 --- a/misc/vym/distinfo +++ b/misc/vym/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.2 2007/08/05 16:36:11 joerg Exp $ +$NetBSD: distinfo,v 1.3 2009/04/19 04:07:52 reed Exp $ -SHA1 (vym-1.8.1.tar.gz) = 39e565203bee2a55b97c19b67dc39dc3a8085d71 -RMD160 (vym-1.8.1.tar.gz) = 63ee9a31625b44ef3d28a143174f98bbf961b531 -Size (vym-1.8.1.tar.gz) = 1377030 bytes -SHA1 (patch-aa) = 583f2eb639091f44d56bf24489dfef2195a0e5f6 -SHA1 (patch-ab) = 3ec57cc0210637006ae34b9450c062c44869f214 +SHA1 (vym-1.12.2.tar.bz2) = 2fd8319707668f3e87f8ecfc06d8a91e5a0c1f2c +RMD160 (vym-1.12.2.tar.bz2) = 02a42d0a697981ea1301c6126455115ef8ea4f9c +Size (vym-1.12.2.tar.bz2) = 4198516 bytes diff --git a/misc/vym/patches/patch-aa b/misc/vym/patches/patch-aa deleted file mode 100644 index ff3fae38caa..00000000000 --- a/misc/vym/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2007/08/05 16:36:11 joerg Exp $ - ---- file.cpp.orig 2007-08-05 15:41:08.000000000 +0000 -+++ file.cpp -@@ -2,6 +2,8 @@ - #include - #include - -+#include -+ - #include "file.h" - #include "process.h" - diff --git a/misc/vym/patches/patch-ab b/misc/vym/patches/patch-ab deleted file mode 100644 index aa7eca7c305..00000000000 --- a/misc/vym/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2007/08/05 16:36:11 joerg Exp $ - ---- mainwindow.cpp.orig 2007-08-05 15:57:51.000000000 +0000 -+++ mainwindow.cpp -@@ -19,6 +19,8 @@ - #include - #include - -+#include -+ - #include "aboutdialog.h" - #include "exportoofiledialog.h" - #include "exports.h" -- cgit v1.2.3