Index: head/science/scidavis/Makefile =================================================================== --- head/science/scidavis/Makefile (revision 498154) +++ head/science/scidavis/Makefile (revision 498155) @@ -1,78 +1,77 @@ # $FreeBSD$ PORTNAME= scidavis -PORTVERSION= 1.23.4 -PORTREVISION= 1 +PORTVERSION= 2.0.1 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 498154) +++ head/science/scidavis/distinfo (revision 498155) @@ -1,3 +1,3 @@ -TIMESTAMP = 1543176079 -SHA256 (highperformancecoder-scidavis-1.23.4_GH0.tar.gz) = 4d9e6adcb79f6c455a2d8b4e3bfdb61f974ce7a0b00527d89e608ac142d43044 -SIZE (highperformancecoder-scidavis-1.23.4_GH0.tar.gz) = 9146227 +TIMESTAMP = 1554553663 +SHA256 (highperformancecoder-scidavis-2.0.1_GH0.tar.gz) = dd3afe13a5a73fa7da55bee579db8d996f0054800edf5145290656aa41666f7d +SIZE (highperformancecoder-scidavis-2.0.1_GH0.tar.gz) = 9715181 Index: head/science/scidavis/files/patch-libscidavis_src_future_table_TableModel.cpp =================================================================== --- head/science/scidavis/files/patch-libscidavis_src_future_table_TableModel.cpp (revision 498154) +++ head/science/scidavis/files/patch-libscidavis_src_future_table_TableModel.cpp (nonexistent) @@ -1,16 +0,0 @@ ---- 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) Property changes on: head/science/scidavis/files/patch-libscidavis_src_future_table_TableModel.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property