diff --git a/misc/vym/Makefile b/misc/vym/Makefile index 124630b0e491..c0377bba2cb6 100644 --- a/misc/vym/Makefile +++ b/misc/vym/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.40 2019/08/11 13:22:00 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2019/10/30 13:05:16 kamil Exp $ # -DISTNAME= vym-2.2.4 -PKGREVISION= 16 +DISTNAME= vym-2.7.1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vym/} EXTRACT_SUFX= .tar.bz2 @@ -18,8 +17,13 @@ USE_LANGUAGES= c++ USE_TOOLS+= perl:run bash:run REPLACE_PERL+= scripts/exportvym scripts/niceXML -REPLACE_BASH+= scripts/release-mac scripts/update-bookmarks \ - scripts/makedist-vym scripts/vivym + +REPLACE_BASH+= scripts/release-mac scripts/update-bookmarks +REPLACE_BASH+= scripts/makedist-vym scripts/vivym +REPLACE_BASH+= scripts/getbinaries scripts/screencast + +REPLACE_RUBY+= scripts/jigger +REPLACE_RUBY+= scripts/make-qrc.rb CHECK_INTERPRETER_SKIP= share/vym/scripts/bugger \ share/vym/scripts/vym-addmail.rb @@ -42,8 +46,9 @@ do-configure: 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" - +.include "../../lang/ruby/buildlink3.mk" +.include "../../lang/ruby/replace.mk" +.include "../../x11/qt5-qtbase/buildlink3.mk" +.include "../../x11/qt5-qtscript/buildlink3.mk" +.include "../../x11/qt5-qtsvg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/vym/PLIST b/misc/vym/PLIST index 8bbb5251defc..240b4a098f3f 100644 --- a/misc/vym/PLIST +++ b/misc/vym/PLIST @@ -1,9 +1,13 @@ -@comment $NetBSD: PLIST,v 1.6 2013/01/03 15:44:19 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.7 2019/10/30 13:05:16 kamil Exp $ bin/vym -doc/vym/vym.pdf +share/vym/demos/ao-report-example.vym share/vym/demos/frames.vym share/vym/demos/lifeforms.vym share/vym/demos/math.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/strip-url.vys share/vym/demos/time-management.vym share/vym/demos/vym-contribute.vym share/vym/exports/orange-blue.conf @@ -17,10 +21,11 @@ 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-arrow-2down.png -share/vym/flags/flag-arrow-2up.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 @@ -28,9 +33,9 @@ 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-kalarm.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 @@ -38,7 +43,7 @@ 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-omg.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 @@ -114,7 +119,6 @@ share/vym/icons/fileprint.png share/vym/icons/filesave.png share/vym/icons/filesaveas.png share/vym/icons/find.png -share/vym/icons/flag-url-16x16.png share/vym/icons/formatcolorbranch.png share/vym/icons/formatcolorpicker.png share/vym/icons/formatcolorpicker.xpm @@ -170,36 +174,16 @@ share/vym/icons/vym.icns share/vym/icons/vym.ico share/vym/icons/vym.png share/vym/icons/vym.xpm -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.ts -share/vym/lang/vym_fr.ts -share/vym/lang/vym_ia.ts -share/vym/lang/vym_it.ts -share/vym/lang/vym_pt_BR.ts -share/vym/lang/vym_ru.ts -share/vym/lang/vym_sv.ts -share/vym/lang/vym_zh_CN.ts -share/vym/lang/vym_zh_TW.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/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/kdebookmarks2vym.xsl share/vym/styles/vym.css -share/vym/styles/vym2kdebookmarks.xsl share/vym/styles/vym2taskjuggler.xsl diff --git a/misc/vym/distinfo b/misc/vym/distinfo index bdf390c9eb83..1f1b2ae8e7a4 100644 --- a/misc/vym/distinfo +++ b/misc/vym/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.7 2015/11/03 23:49:54 agc Exp $ +$NetBSD: distinfo,v 1.8 2019/10/30 13:05:16 kamil Exp $ -SHA1 (vym-2.2.4.tar.bz2) = fcfe303bb5b731f0838dafb1709e2a78f30b2aec -RMD160 (vym-2.2.4.tar.bz2) = 83972f155ba69ae82d0d57c22042564198167227 -SHA512 (vym-2.2.4.tar.bz2) = b82d2100a3f26f6e19167066ec512e23c8f50ab7ef41ff130dd775964e189fb345e1e9877c96ceffe3db5c7ff6c361330f12a3eba554523f0c2dcf7c4877a712 -Size (vym-2.2.4.tar.bz2) = 6420100 bytes -SHA1 (patch-main.cpp) = c6b83228e467105996bb8c36ed03b41005a332d4 -SHA1 (patch-mainwindow.cpp) = 5b06c5302223000594bd9e3fef61c00d7832aeca +SHA1 (vym-2.7.1.tar.bz2) = 29dc9898e374b662806593d0a9d0e0b08e6997c2 +RMD160 (vym-2.7.1.tar.bz2) = fa3aba859cfdebd884aead017f116b180481e311 +SHA512 (vym-2.7.1.tar.bz2) = 985dbf18f743c36b484050ae24e4392eeae701c6c72fca6bd3dc5b70b38a283211946e279804c66253b5a394a642683ca4e3a66a7288400a9193fbcbfd8c9582 +Size (vym-2.7.1.tar.bz2) = 6718924 bytes diff --git a/misc/vym/patches/patch-main.cpp b/misc/vym/patches/patch-main.cpp deleted file mode 100644 index 54e1b6d6e2c2..000000000000 --- a/misc/vym/patches/patch-main.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 21a45377b5e7..000000000000 --- a/misc/vym/patches/patch-mainwindow.cpp +++ /dev/null @@ -1,22 +0,0 @@ -$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)