diff options
-rw-r--r-- | misc/vym/Makefile | 27 | ||||
-rw-r--r-- | misc/vym/PLIST | 79 | ||||
-rw-r--r-- | misc/vym/distinfo | 10 | ||||
-rw-r--r-- | misc/vym/patches/patch-main.cpp | 13 | ||||
-rw-r--r-- | misc/vym/patches/patch-mainwindow.cpp | 22 |
5 files changed, 111 insertions, 40 deletions
diff --git a/misc/vym/Makefile b/misc/vym/Makefile index cee9145d441..45cdd3e42ee 100644 --- a/misc/vym/Makefile +++ b/misc/vym/Makefile @@ -1,32 +1,47 @@ -# $NetBSD: Makefile,v 1.23 2012/10/08 23:02:09 adam Exp $ +# $NetBSD: Makefile,v 1.24 2013/01/03 15:44:19 ryoon Exp $ # -DISTNAME= vym-1.12.7 -PKGREVISION= 13 +DISTNAME= vym-2.2.4 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vym/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://vym.sourceforge.net/ +HOMEPAGE= http://www.insilmaril.de/vym/ COMMENT= Generate and manipulate maps which show your thoughts LICENSE= gnu-gpl-v2 +DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils + USE_LANGUAGES= c++ USE_TOOLS+= perl:run bash:run REPLACE_PERL+= scripts/exportvym scripts/niceXML -REPLACE_BASH+= scripts/release-mac scripts/update-bookmarks +REPLACE_BASH+= scripts/release-mac scripts/update-bookmarks \ + scripts/makedist-vym scripts/vivym + +CHECK_INTERPRETER_SKIP= share/vym/scripts/bugger \ + share/vym/scripts/vym-addmail.rb INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} +SUBST_CLASSES+= flags +SUBST_STAGE.flags= pre-configure +SUBST_MESSAGE.flags= Fix path to flags +SUBST_FILES.flags= main.cpp +SUBST_VARS.flags= PREFIX + post-extract: ${CHMOD} a-x ${WRKSRC}/icons/vym.ico do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QTDIR}/bin/qmake -unix PREFIX=${PREFIX} vym.pro + ${QTDIR}/bin/qmake -unix \ + PREFIX=${PREFIX} \ + DATADIR=${PREFIX}/share \ + DOCDIR=${PREFIX}/doc/vym vym.pro +.include "../../x11/qt4-qdbus/buildlink3.mk" .include "../../x11/qt4-libs/buildlink3.mk" .include "../../x11/qt4-tools/buildlink3.mk" diff --git a/misc/vym/PLIST b/misc/vym/PLIST index 95720fa4605..8bbb5251def 100644 --- a/misc/vym/PLIST +++ b/misc/vym/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.5 2010/07/27 18:27:34 gls Exp $ +@comment $NetBSD: PLIST,v 1.6 2013/01/03 15:44:19 ryoon Exp $ bin/vym -share/doc/packages/vym/vym.pdf +doc/vym/vym.pdf +share/vym/demos/frames.vym share/vym/demos/lifeforms.vym share/vym/demos/math.vym share/vym/demos/time-management.vym -share/vym/demos/vym-projectplan.vym +share/vym/demos/vym-contribute.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 @@ -14,7 +15,6 @@ share/vym/exports/template-orange-blue/content.xml share/vym/exports/template-orange-blue/meta.xml share/vym/exports/template-orange-blue/mimetype share/vym/exports/template-orange-blue/page-template.xml -share/vym/exports/template-orange-blue/section-template.xml share/vym/exports/template-orange-blue/settings.xml share/vym/exports/template-orange-blue/styles.xml share/vym/flags/flag-arrow-2down.png @@ -41,13 +41,26 @@ share/vym/flags/flag-smiley-good.png share/vym/flags/flag-smiley-omg.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/flags.xcf +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 @@ -78,8 +91,6 @@ 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 @@ -91,8 +102,10 @@ 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 @@ -107,14 +120,32 @@ 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/icons.xcf +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 @@ -124,8 +155,10 @@ 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 @@ -136,27 +169,18 @@ 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_cs_CZ.ts +share/vym/lang/vym_de_DE.ts 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_ia.ts 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_sv.qm share/vym/lang/vym_sv.ts -share/vym/lang/vym_zh_CN.qm share/vym/lang/vym_zh_CN.ts -share/vym/lang/vym_zh_TW.qm share/vym/lang/vym_zh_TW.ts share/vym/macros/macro-1.vys share/vym/macros/macro-10.vys @@ -170,17 +194,12 @@ 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/styles/cm.xsl +share/vym/scripts/bugger +share/vym/scripts/makedist-vym +share/vym/scripts/vivym +share/vym/scripts/vym-addmail.rb +share/vym/scripts/vym-ruby.rb share/vym/styles/kdebookmarks2vym.xsl -share/vym/styles/mmap2vym.xsl -share/vym/styles/tm.xsl share/vym/styles/vym.css -share/vym/styles/vym2html.xsl share/vym/styles/vym2kdebookmarks.xsl share/vym/styles/vym2taskjuggler.xsl -share/vym/styles/vym2txt.xsl -share/vym/styles/vym2xhtml.xsl diff --git a/misc/vym/distinfo b/misc/vym/distinfo index 4c62ba78528..9c2b55424d3 100644 --- a/misc/vym/distinfo +++ b/misc/vym/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.5 2010/07/27 18:27:34 gls Exp $ +$NetBSD: distinfo,v 1.6 2013/01/03 15:44:19 ryoon Exp $ -SHA1 (vym-1.12.7.tar.bz2) = 421ab5b15020a45890532a8ad2b53b986a6e16c7 -RMD160 (vym-1.12.7.tar.bz2) = 7a97653fe307fafe1d67fd2c73565a73d37695ff -Size (vym-1.12.7.tar.bz2) = 4231782 bytes +SHA1 (vym-2.2.4.tar.bz2) = fcfe303bb5b731f0838dafb1709e2a78f30b2aec +RMD160 (vym-2.2.4.tar.bz2) = 83972f155ba69ae82d0d57c22042564198167227 +Size (vym-2.2.4.tar.bz2) = 6420100 bytes +SHA1 (patch-main.cpp) = c6b83228e467105996bb8c36ed03b41005a332d4 +SHA1 (patch-mainwindow.cpp) = 5b06c5302223000594bd9e3fef61c00d7832aeca diff --git a/misc/vym/patches/patch-main.cpp b/misc/vym/patches/patch-main.cpp new file mode 100644 index 00000000000..54e1b6d6e2c --- /dev/null +++ b/misc/vym/patches/patch-main.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-main.cpp,v 1.1 2013/01/03 15:44:19 ryoon Exp $ + +--- main.cpp.orig 2012-07-04 13:28:11.000000000 +0000 ++++ main.cpp +@@ -251,7 +251,7 @@ int main(int argc, char* argv[]) + vymBaseDir.setPath(basePath + "/share/vym"); + + #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-mainwindow.cpp b/misc/vym/patches/patch-mainwindow.cpp new file mode 100644 index 00000000000..21a45377b5e --- /dev/null +++ b/misc/vym/patches/patch-mainwindow.cpp @@ -0,0 +1,22 @@ +$NetBSD: patch-mainwindow.cpp,v 1.1 2013/01/03 15:44:19 ryoon Exp $ + +--- mainwindow.cpp.orig 2012-07-04 13:28:11.000000000 +0000 ++++ mainwindow.cpp +@@ -228,7 +228,7 @@ Main::Main(QWidget* parent, Qt::WFlags f + + // application to open URLs + p="/mainwindow/readerURL"; +- #if defined(Q_OS_LINUX) ++ #if defined(Q_OS_UNIX) + s=settings.value (p,"xdg-open").toString(); + #else + #if defined(Q_OS_MACX) +@@ -249,7 +249,7 @@ Main::Main(QWidget* parent, Qt::WFlags f + + // application to open PDFs + p="/mainwindow/readerPDF"; +- #if defined(Q_OS_LINUX) ++ #if defined(Q_OS_UNIX) + s=settings.value (p,"xdg-open").toString(); + #else + #if defined(Q_OS_MACX) |