From owner-svn-ports-head@freebsd.org Sun Dec 23 21:40:06 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 774FF1349BF3; Sun, 23 Dec 2018 21:40:06 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 193838FD7B; Sun, 23 Dec 2018 21:40:06 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0E5661AF6F; Sun, 23 Dec 2018 21:40:06 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBNLe5Zg076410; Sun, 23 Dec 2018 21:40:05 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBNLe4jQ076399; Sun, 23 Dec 2018 21:40:04 GMT (envelope-from makc@FreeBSD.org) Message-Id: <201812232140.wBNLe4jQ076399@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Sun, 23 Dec 2018 21:40:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488244 - in head/science: . scidavis scidavis/files X-SVN-Group: ports-head X-SVN-Commit-Author: makc X-SVN-Commit-Paths: in head/science: . scidavis scidavis/files X-SVN-Commit-Revision: 488244 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 193838FD7B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.981,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Dec 2018 21:40:06 -0000 Author: makc Date: Sun Dec 23 21:40:03 2018 New Revision: 488244 URL: https://svnweb.freebsd.org/changeset/ports/488244 Log: Add new port science/scidavis: Cross-platform program for data analysis and visualization. WWW: http://scidavis.sourceforge.net Added: head/science/scidavis/ head/science/scidavis/Makefile (contents, props changed) head/science/scidavis/distinfo (contents, props changed) head/science/scidavis/files/ head/science/scidavis/files/patch-config.pri (contents, props changed) head/science/scidavis/files/patch-libscidavis_python.pri (contents, props changed) head/science/scidavis/files/patch-libscidavis_src_ApplicationWindow.cpp (contents, props changed) head/science/scidavis/files/patch-libscidavis_src_future_table_TableModel.cpp (contents, props changed) head/science/scidavis/pkg-descr (contents, props changed) head/science/scidavis/pkg-plist (contents, props changed) Modified: head/science/Makefile Modified: head/science/Makefile ============================================================================== --- head/science/Makefile Sun Dec 23 21:13:12 2018 (r488243) +++ head/science/Makefile Sun Dec 23 21:40:03 2018 (r488244) @@ -282,6 +282,7 @@ SUBDIR += rubygem-rgeo-shapefile SUBDIR += rubygem-ruby-dcl SUBDIR += rubygem-ruby-netcdf + SUBDIR += scidavis SUBDIR += siesta SUBDIR += sigrok-cli SUBDIR += sigrok-firmware Added: head/science/scidavis/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/scidavis/Makefile Sun Dec 23 21:40:03 2018 (r488244) @@ -0,0 +1,64 @@ +# $FreeBSD$ + +PORTNAME= scidavis +PORTVERSION= 1.23.4 +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_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 + +post-install-PYTHON-on: + ${MV} ${STAGEDIR}${PREFIX}/etc/scidavisrc.py \ + ${STAGEDIR}${PREFIX}/etc/scidavisrc.py.sample + ${INSTALL_DATA} ${WRKSRC}/scidavis/scidavisUtil.pyc \ + ${STAGEDIR}${DATADIR} + +.include Added: head/science/scidavis/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/scidavis/distinfo Sun Dec 23 21:40:03 2018 (r488244) @@ -0,0 +1,3 @@ +TIMESTAMP = 1543176079 +SHA256 (highperformancecoder-scidavis-1.23.4_GH0.tar.gz) = 4d9e6adcb79f6c455a2d8b4e3bfdb61f974ce7a0b00527d89e608ac142d43044 +SIZE (highperformancecoder-scidavis-1.23.4_GH0.tar.gz) = 9146227 Added: head/science/scidavis/files/patch-config.pri ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/scidavis/files/patch-config.pri Sun Dec 23 21:40:03 2018 (r488244) @@ -0,0 +1,20 @@ +--- config.pri.orig 2018-10-17 03:28:35 UTC ++++ config.pri +@@ -61,7 +61,7 @@ unix:message(Building with preset $$PRES + + ### Linux Desktop integration + !contains(PRESET, self_contained) { +- unix:INSTALLS += desktop_entry mime_package mime_link icons man_page appdata ++ unix:INSTALLS += desktop_entry mime_package icons man_page appdata + } + + ################################################################################ +@@ -120,7 +120,7 @@ unix {# Linux / MacOS X + ### directory specified here or somewhere else in the python path (sys.path) where "import" can find it + + ### where scidavisrc.py is searched for at runtime +- pythonconfig.path = "$$INSTALLBASE/../etc" ++ pythonconfig.path = "$$INSTALLBASE/etc" + ### where the scidavisUtil python module is searched for at runtime + pythonutils.path = "$$INSTALLBASE/share/scidavis" + Added: head/science/scidavis/files/patch-libscidavis_python.pri ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/scidavis/files/patch-libscidavis_python.pri Sun Dec 23 21:40:03 2018 (r488244) @@ -0,0 +1,11 @@ +--- libscidavis/python.pri.orig 2018-10-17 03:28:35 UTC ++++ libscidavis/python.pri +@@ -27,7 +27,7 @@ + DEFINES += PYTHONHOME=/Applications/scidavis.app/Contents/Resources + } + 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 { Added: head/science/scidavis/files/patch-libscidavis_src_ApplicationWindow.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/scidavis/files/patch-libscidavis_src_ApplicationWindow.cpp Sun Dec 23 21:40:03 2018 (r488244) @@ -0,0 +1,31 @@ +--- libscidavis/src/ApplicationWindow.cpp.orig 2018-10-17 03:28:35 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 + 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 + const QString locateDefaultHelp = + QDir::toNativeSeparators("/usr/share/doc/scidavis/manual/index.html"); + #endif ++#endif // defined DOC_PATH ++ + if (QFile(locateDefaultHelp).exists()) + { + helpFilePath = locateDefaultHelp; Added: head/science/scidavis/files/patch-libscidavis_src_future_table_TableModel.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/scidavis/files/patch-libscidavis_src_future_table_TableModel.cpp Sun Dec 23 21:40:03 2018 (r488244) @@ -0,0 +1,16 @@ +--- libscidavis/src/future/table/TableModel.cpp.orig 2018-10-17 03:28:35 UTC ++++ libscidavis/src/future/table/TableModel.cpp +@@ -101,11 +101,11 @@ QVariant TableModel::data(const QModelIn + postfix = " " + tr("(masked)"); + if(col_ptr->isInvalid(row)) + return QVariant(tr("invalid cell (ignored in all operations)","tooltip string for invalid rows") + postfix); +- [[fallthrough]] ++ [[fallthrough]]; + case Qt::EditRole: + if(!d_formula_mode && col_ptr->isInvalid(row)) + return QVariant(); +- [[fallthrough]] ++ [[fallthrough]]; + case Qt::DisplayRole: + { + if(d_formula_mode) Added: head/science/scidavis/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/scidavis/pkg-descr Sun Dec 23 21:40:03 2018 (r488244) @@ -0,0 +1,5 @@ +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 Added: head/science/scidavis/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/scidavis/pkg-plist Sun Dec 23 21:40:03 2018 (r488244) @@ -0,0 +1,52 @@ +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