Index: head/science/scidavis/Makefile =================================================================== --- head/science/scidavis/Makefile (revision 536713) +++ head/science/scidavis/Makefile (revision 536714) @@ -1,78 +1,77 @@ # $FreeBSD$ PORTNAME= scidavis -PORTVERSION= 2.0.1 -PORTREVISION= 3 +PORTVERSION= 2.2.0 CATEGORIES= science MAINTAINER= makc@FreeBSD.org COMMENT= Scientific data analysis and visualization LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgsl.so:math/gsl \ libmuparser.so:math/muparser \ libpng.so:graphics/png \ libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \ libqwtplot3d-qt5.so:math/qwtplot3d \ liborigin.so:math/liborigin USES= compiler:c++11-lang desktop-file-utils gl qmake qt:5 \ shared-mime-info USE_GL= gl glu USE_QT= core gui network opengl printsupport svg widgets xml \ buildtools_build linguisttools_build USE_GITHUB= yes GH_ACCOUNT= highperformancecoder QMAKE_ARGS= INSTALLBASE=${PREFIX} \ CONFIG+=liborigin \ LIBS+="-L${LOCALBASE}/${QT_LIBDIR_REL} -L${LOCALBASE}/lib" \ LIBS+="-lqwt5-qt5 -lqwtplot3d-qt5" \ INCLUDEPATH+=${LOCALBASE}/${QT_INCDIR_REL}/qwt5-qt5 \ INCLUDEPATH+=${LOCALBASE}/${QT_INCDIR_REL}/qwtplot3d-qt5 OPTIONS_DEFINE= DOCS NLS PYTHON OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes PYTHON_DESC= Python scripting support PYTHON_USES= pyqt:5 python PYTHON_USE= pyqt=core,gui,printsupport,sip,widgets python=py3kplist PYTHON_QMAKE_ON= PYTHON=${PYTHON_CMD} CONFIG+=python \ PYQT_SIPDIR=${LOCALBASE}/${_SIPDIR_REL} post-patch: ${REINPLACE_CMD} '/target.path/s,/usr/lib,${PREFIX}/lib,' \ ${WRKSRC}/fitPlugins/*/*.pro ${REINPLACE_CMD} 's,share/man,man,' \ ${WRKSRC}/config.pri \ ${WRKSRC}/scidavis/scidavis.pro post-install-NLS-on: ${MKDIR} ${STAGEDIR}${DATADIR}/translations ${INSTALL_DATA} ${WRKSRC}/scidavis/translations/*.qm \ ${STAGEDIR}${DATADIR}/translations .include .if ${PORT_OPTIONS:MPYTHON} .if ${PYTHON_REL} < 3200 PYCACHE_DIR= # none PYCACHE_FILE= scidavisUtil.pyc .else PYCACHE_DIR= __pycache__/ PYCACHE_FILE= scidavisUtil.cpython-${PYTHON_SUFFIX}.pyc .endif .endif post-install-PYTHON-on: ${MV} ${STAGEDIR}${PREFIX}/etc/scidavisrc.py \ ${STAGEDIR}${PREFIX}/etc/scidavisrc.py.sample ${MKDIR} ${STAGEDIR}${DATADIR}/${PYCACHE_DIR} ${INSTALL_DATA} ${WRKSRC}/scidavis/${PYCACHE_DIR}${PYCACHE_FILE} \ ${STAGEDIR}${DATADIR}/${PYCACHE_DIR} .include Index: head/science/scidavis/distinfo =================================================================== --- head/science/scidavis/distinfo (revision 536713) +++ head/science/scidavis/distinfo (revision 536714) @@ -1,3 +1,3 @@ -TIMESTAMP = 1554553663 -SHA256 (highperformancecoder-scidavis-2.0.1_GH0.tar.gz) = dd3afe13a5a73fa7da55bee579db8d996f0054800edf5145290656aa41666f7d -SIZE (highperformancecoder-scidavis-2.0.1_GH0.tar.gz) = 9715181 +TIMESTAMP = 1589881662 +SHA256 (highperformancecoder-scidavis-2.2.0_GH0.tar.gz) = 58e88a0f538b4bc22376069dccaa343ce2fc179b1d00d6a4f4bd27fbbab8a3f2 +SIZE (highperformancecoder-scidavis-2.2.0_GH0.tar.gz) = 9820993 Index: head/science/scidavis/files/patch-libscidavis_python.pri =================================================================== --- head/science/scidavis/files/patch-libscidavis_python.pri (revision 536713) +++ head/science/scidavis/files/patch-libscidavis_python.pri (revision 536714) @@ -1,11 +1,11 @@ ---- libscidavis/python.pri.orig 2018-10-17 03:28:35 UTC +--- libscidavis/python.pri.orig 2020-05-10 23:27:36 UTC +++ libscidavis/python.pri -@@ -27,7 +27,7 @@ - DEFINES += PYTHONHOME=/Applications/scidavis.app/Contents/Resources +@@ -28,7 +28,7 @@ } + SIP_FAILURE = TRUE system(mkdir -p $${SIP_DIR}) -- system($$system($$PYTHONBIN python-sipcmd.py PyQt$$QT_MAJOR_VERSION) $$system($$PYTHONBIN-config --includes) -c $${SIP_DIR} src/scidavis.sip) -+ system($$system($$PYTHONBIN python-sipcmd.py PyQt$$QT_MAJOR_VERSION) -I $$PYQT_SIPDIR $$system($$PYTHONBIN-config --includes) -c $${SIP_DIR} src/scidavis.sip) - } - - win32 { +- system($$system($$PYTHONBIN python-sipcmd.py PyQt$$QT_MAJOR_VERSION) $$system($$PYTHONBIN-config --includes) -c $${SIP_DIR} src/scidavis.sip): SIP_FAILURE = FALSE ++ system($$system($$PYTHONBIN python-sipcmd.py PyQt$$QT_MAJOR_VERSION) -I $$PYQT_SIPDIR $$system($$PYTHONBIN-config --includes) -c $${SIP_DIR} src/scidavis.sip): SIP_FAILURE = FALSE + equals(SIP_FAILURE, "TRUE") { + error(`$$PYTHONBIN python-sipcmd.py PyQt$$QT_MAJOR_VERSION` `$$PYTHONBIN-config --includes` -c $${SIP_DIR} src/scidavis.sip FAILED in $$PWD) + } Index: head/science/scidavis/files/patch-libscidavis_src_ApplicationWindow.cpp =================================================================== --- head/science/scidavis/files/patch-libscidavis_src_ApplicationWindow.cpp (revision 536713) +++ head/science/scidavis/files/patch-libscidavis_src_ApplicationWindow.cpp (revision 536714) @@ -1,31 +1,31 @@ ---- libscidavis/src/ApplicationWindow.cpp.orig 2018-10-17 03:28:35 UTC +--- libscidavis/src/ApplicationWindow.cpp.orig 2020-05-10 23:27:36 UTC +++ libscidavis/src/ApplicationWindow.cpp @@ -4253,7 +4253,7 @@ void ApplicationWindow::readSettings() settings.endGroup(); // Colors settings.beginGroup("/Paths"); - workingDir = settings.value("/WorkingDir", qApp->applicationDirPath()).toString(); + workingDir = settings.value("/WorkingDir", QDir::homePath()).toString(); helpFilePath = settings.value("/HelpFile", "").toString(); #ifdef PLUGIN_PATH QString defaultFitPluginsPath = PLUGIN_PATH; -@@ -8209,6 +8209,10 @@ void ApplicationWindow::showWindowTitleB +@@ -8211,6 +8211,10 @@ void ApplicationWindow::showWindowTitleBarMenu() void ApplicationWindow::chooseHelpFolder() { // TODO: move all paths & location handling to anothor class +#ifdef DOC_PATH + const QString locateDefaultHelp = DOC_PATH + + QDir::toNativeSeparators("/manual/index.html"); +#else // defined DOC_PATH #if defined(Q_OS_WIN) const QString locateDefaultHelp = qApp->applicationDirPath() + QDir::toNativeSeparators("/manual/index.html"); -@@ -8216,6 +8220,8 @@ void ApplicationWindow::chooseHelpFolder +@@ -8218,6 +8222,8 @@ void ApplicationWindow::chooseHelpFolder() const QString locateDefaultHelp = QDir::toNativeSeparators("/usr/share/doc/scidavis/manual/index.html"); #endif +#endif // defined DOC_PATH + if (QFile(locateDefaultHelp).exists()) { helpFilePath = locateDefaultHelp; Index: head/science/scidavis/pkg-descr =================================================================== --- head/science/scidavis/pkg-descr (revision 536713) +++ head/science/scidavis/pkg-descr (revision 536714) @@ -1,5 +1,6 @@ -SciDAVis is a free cross-platform program for two- and three-dimensional graphical -presentation of data sets and for data analysis. It combines easy-to-use graphical -user interface with powerful features such as Python scripting. +SciDAVis is a free cross-platform program for two- and three-dimensional +graphical presentation of data sets and for data analysis. It combines +easy-to-use graphical user interface with powerful features such as Python +scripting. WWW: http://scidavis.sourceforge.net Index: head/science/scidavis/pkg-plist =================================================================== --- head/science/scidavis/pkg-plist (revision 536713) +++ head/science/scidavis/pkg-plist (revision 536714) @@ -1,52 +1,54 @@ bin/scidavis %%PYTHON%%@sample etc/scidavisrc.py.sample lib/scidavis/plugins/libexp_saturation.so lib/scidavis/plugins/libexp_saturation.so.1 lib/scidavis/plugins/libexp_saturation.so.1.0 lib/scidavis/plugins/libexp_saturation.so.1.0.0 lib/scidavis/plugins/libexplin.so lib/scidavis/plugins/libexplin.so.1 lib/scidavis/plugins/libexplin.so.1.0 lib/scidavis/plugins/libexplin.so.1.0.0 lib/scidavis/plugins/libfitRational0.so lib/scidavis/plugins/libfitRational0.so.1 lib/scidavis/plugins/libfitRational0.so.1.0 lib/scidavis/plugins/libfitRational0.so.1.0.0 lib/scidavis/plugins/libfitRational1.so lib/scidavis/plugins/libfitRational1.so.1 lib/scidavis/plugins/libfitRational1.so.1.0 lib/scidavis/plugins/libfitRational1.so.1.0.0 lib/scidavis/plugins/libplanck_wavelength.so lib/scidavis/plugins/libplanck_wavelength.so.1 lib/scidavis/plugins/libplanck_wavelength.so.1.0 lib/scidavis/plugins/libplanck_wavelength.so.1.0.0 man/man1/scidavis.1.gz share/appdata/scidavis.appdata.xml share/applications/scidavis.desktop %%PORTDOCS%%%%DOCSDIR%%/gpl.txt %%PORTDOCS%%%%DOCSDIR%%/manual/index.html %%PORTDOCS%%%%DOCSDIR%%/scidavis-logo.png %%PORTDOCS%%%%DOCSDIR%%/scidavis.css share/icons/hicolor/128x128/apps/scidavis.png share/icons/hicolor/16x16/apps/scidavis.png share/icons/hicolor/22x22/apps/scidavis.png share/icons/hicolor/32x32/apps/scidavis.png share/icons/hicolor/48x48/apps/scidavis.png share/icons/hicolor/64x64/apps/scidavis.png share/icons/hicolor/scalable/apps/scidavis.svg share/icons/locolor/16x16/apps/scidavis.png share/icons/locolor/22x22/apps/scidavis.png share/icons/locolor/32x32/apps/scidavis.png share/mime/packages/scidavis.xml %%PYTHON%%%%DATADIR%%/scidavisUtil.py %%PYTHON%%%%DATADIR%%/scidavisUtil.pyc %%NLS%%%%DATADIR%%/translations/scidavis_cs-alt.qm %%NLS%%%%DATADIR%%/translations/scidavis_cs.qm %%NLS%%%%DATADIR%%/translations/scidavis_de.qm %%NLS%%%%DATADIR%%/translations/scidavis_es.qm %%NLS%%%%DATADIR%%/translations/scidavis_fr.qm %%NLS%%%%DATADIR%%/translations/scidavis_ja.qm %%NLS%%%%DATADIR%%/translations/scidavis_pl.qm %%NLS%%%%DATADIR%%/translations/scidavis_pt-br.qm %%NLS%%%%DATADIR%%/translations/scidavis_ru.qm %%NLS%%%%DATADIR%%/translations/scidavis_sv.qm +%%NLS%%%%DATADIR%%/translations/scidavis_zh-cn.qm +%%NLS%%%%DATADIR%%/translations/scidavis_zh-tw.qm