ports/109030: maintainer update: math/qtiplot
Max Brazhnikov
makc at issp.ac.ru
Sat Feb 10 21:40:05 UTC 2007
>Number: 109030
>Category: ports
>Synopsis: maintainer update: math/qtiplot
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 10 21:40:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Max Brazhnikov
>Release: FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
FreeBSD luna 6.2-STABLE FreeBSD 6.2-STABLE #0: Thu Jan 18 12:52:49 MSK 2007 root at luna.zuzino.mipt.ru:/usr/obj/usr/src/sys/LUNA i386
>Description:
update to 0.8.9
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN --exclude=CVS /usr/ports/math/qtiplot/Makefile /home/makc/porting/ports/math/qtiplot/Makefile
--- /usr/ports/math/qtiplot/Makefile Tue Dec 12 16:01:43 2006
+++ /home/makc/porting/ports/math/qtiplot/Makefile Sun Feb 11 00:24:22 2007
@@ -6,16 +6,16 @@
#
PORTNAME= qtiplot
-PORTVERSION= 0.8.9.r2
+PORTVERSION= 0.8.9
CATEGORIES= math science
MASTER_SITES= http://soft.proindependent.com/src/
-DISTNAME= ${PORTNAME}-0.8.9-rc2
MAINTAINER= makc at issp.ac.ru
COMMENT= An Origin clone for data analysis and scientific plotting
BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
LIB_DEPENDS= gsl.9:${PORTSDIR}/math/gsl \
+ muparser.0:${PORTSDIR}/math/muparser \
origin.0:${PORTSDIR}/math/liborigin \
qwtplot3d:${PORTSDIR}/math/qwtplot3d \
qwt.5:${PORTSDIR}/x11-toolkits/qwt-devel
@@ -26,7 +26,7 @@
MAKE_ENV= QTDIR=${QT_PREFIX}
DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \
- "${DOCSDIR}/common/qtiplot_logo.png" \
+ "${DATADIR}/manual/common/qtiplot_logo.png" \
"qtiplot" "" false
OPTIONS= DOCS "Install the QtiPlot Handbook" on \
@@ -39,7 +39,7 @@
.endif
.if defined(WITH_PYTHON)
-USE_PYTHON= 2.4
+USE_PYTHON= yes
# manually include this, because USE_PYTHON is defined
# after including bsd.port.pre.mk
.include "${PORTSDIR}/Mk/bsd.python.mk"
@@ -47,6 +47,8 @@
${PYTHON_SITELIBDIR}/qt.so:${PORTSDIR}/x11-toolkits/py-qt
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/qt.so:${PORTSDIR}/x11-toolkits/py-qt
PLIST_SUB+= PYTHON=""
+MAKE_ENV+= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
+ PYTHON_VERSION=${PYTHON_VERSION}
.else
PLIST_SUB+= PYTHON="@comment "
.endif
@@ -70,34 +72,29 @@
fitPlugins/fitRational1 \
qtiplot
+pre-patch:
+ @${RM} -r ${WRKSRC}/3rdparty/muParser
+ @${RM} -r ${WRKSRC}/3rdparty/qwt
+ @${CP} ${FILESDIR}/${PORTNAME}.pro ${WRKSRC}/${PORTNAME}/${PORTNAME}.pro
+
post-patch:
.if defined(WITH_PYTHON)
- @${REINPLACE_CMD} \
- -e "s:/usr/include/python2.4:${PYTHON_INCLUDEDIR}:" \
- -e "s:/usr/share/sip:${LOCALBASE}/share/py-sip/:" \
- ${WRKSRC}/qtiplot/qtiplot.pro
@${REINPLACE_CMD} -e \
's|loadInitFile("qtiplotrc")|loadInitFile("${DATADIR}/qtiplotrc")|' \
- ${WRKSRC}/qtiplot/src/PythonScripting.cpp
+ ${WRKSRC}/${PORTNAME}/src/PythonScripting.cpp
.else
@${REINPLACE_CMD} \
-e "s/unix:SCRIPTING_LANGS += Python//" \
- ${WRKSRC}/qtiplot/qtiplot.pro
+ ${WRKSRC}/${PORTNAME}/qtiplot.pro
.endif
-
-.for d in ${QPRO_DIRS}
- @${REINPLACE_CMD} \
- -e "s/#system/system/g" \
- -e "s:../3rdparty/liborigin:${LOCALBASE}/include:" \
- -e "s:../3rdparty/qwt/include:${LOCALBASE}/include/qwt:" \
- -e "s:/usr/include/qwtplot3d:${X11BASE}/include:" \
- -e "/^unix:LIBS/s:-L /usr/lib:-L${LOCALBASE}/lib:" \
- -e "/^unix:documentation.path/s:/usr/share/doc/qtiplot:${DATADIR}/manual:" \
- ${WRKSRC}/${d}/*.pro
-.endfor
- @${REINPLACE_CMD} -e "s:3rdparty/qwt::" ${WRKSRC}/qtiplot.pro
- @${REINPLACE_CMD} -e 's:"/usr/share/doc/qtiplot:"${DOCSDIR}:' \
- ${WRKSRC}/qtiplot/src/application.cpp
+ @${REINPLACE_CMD} -e "s:3rdparty/qwt::" ${WRKSRC}/${PORTNAME}.pro
+ @${REINPLACE_CMD} -e 's:"/usr/share/doc/qtiplot:"${DATADIR}/manual:' \
+ -e 's:QDir( "./" ).absPath():"":g' \
+ ${WRKSRC}/${PORTNAME}/src/application.cpp
+ @${REINPLACE_CMD} -e 's:"../3rdparty/muParser/muParser.h":<muParser.h>:' \
+ ${WRKSRC}/${PORTNAME}/src/parser.h
+ @${REINPLACE_CMD} -e 's:"../3rdparty/muParser/muParser.h":<muParser.h>:' \
+ ${WRKSRC}/${PORTNAME}/src/muParserScripting.h
do-configure:
.for d in ${QPRO_DIRS}
@@ -110,10 +107,10 @@
@${REINPLACE_CMD} -e \
's|^CC .*|CC=${CC}|; \
s|^CXX .*|CXX=${CXX}|; \
+ s|^LINK .*|LINK=${CXX}|; \
s|-pipe||; \
s|^\(CFLAGS .*= \)|\1${CFLAGS}|; \
- s|^\(CXXFLAGS = \)|\1${CXXFLAGS}|; \
- s|../3rdparty/qwt/lib/libqwt.a|-lqwt|' \
+ s|^\(CXXFLAGS = \)|\1${CXXFLAGS}|' \
${WRKSRC}/${d}/Makefile
.endfor
@@ -127,9 +124,9 @@
${INSTALL_PROGRAM} ${WRKSRC}/fitPlugins/libfitRational1.so.1.0.0 \
${DATADIR}/fitPlugins/libfitRational1.so
.if defined(WITH_PYTHON)
- ${INSTALL_DATA} ${WRKSRC}/qtiplot/qtiplotrc.py ${DATADIR}/qtiplotrc.py
+ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/qtiplotrc.py ${DATADIR}/qtiplotrc.py
@cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('qtiplotrc.py')"
- ${INSTALL_DATA} ${WRKSRC}/qtiplot/qtiplotrc.pyc ${DATADIR}/qtiplotrc.pyc
+ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/qtiplotrc.pyc ${DATADIR}/qtiplotrc.pyc
.endif
.if !defined(WITHOUT_NLS)
.for i in ${QTI_LANG}
diff -ruN --exclude=CVS /usr/ports/math/qtiplot/distinfo /home/makc/porting/ports/math/qtiplot/distinfo
--- /usr/ports/math/qtiplot/distinfo Tue Dec 12 16:01:43 2006
+++ /home/makc/porting/ports/math/qtiplot/distinfo Sun Jan 28 15:23:44 2007
@@ -1,3 +1,3 @@
-MD5 (qtiplot-0.8.9-rc2.tar.bz2) = fdf3996b4361c83c7e86ae4d8176bc04
-SHA256 (qtiplot-0.8.9-rc2.tar.bz2) = efc9090413e4d446b8eed2182f9fe956406d24e92e82a51396a400eee8ba8765
-SIZE (qtiplot-0.8.9-rc2.tar.bz2) = 598479
+MD5 (qtiplot-0.8.9.tar.bz2) = d4477a3d7d5a61d6f6da1af48424220f
+SHA256 (qtiplot-0.8.9.tar.bz2) = c1472192cb04a56a7b75155d2520add2e6571bc8ede40341b8720291aafea870
+SIZE (qtiplot-0.8.9.tar.bz2) = 848083
diff -ruN --exclude=CVS /usr/ports/math/qtiplot/files/qtiplot.pro /home/makc/porting/ports/math/qtiplot/files/qtiplot.pro
--- /usr/ports/math/qtiplot/files/qtiplot.pro Thu Jan 1 03:00:00 1970
+++ /home/makc/porting/ports/math/qtiplot/files/qtiplot.pro Sun Feb 11 00:26:30 2007
@@ -0,0 +1,288 @@
+QMAKE_PROJECT_DEPTH = 0
+
+TARGET = qtiplot
+TEMPLATE = app
+CONFIG += qt warn_on exceptions opengl
+CONFIG += thread
+CONFIG += release
+
+MOC_DIR = ../tmp/qtiplot
+OBJECTS_DIR = ../tmp/qtiplot
+DESTDIR = ./
+DEFINES += QT_PLUGIN
+
+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwt
+unix:INCLUDEPATH += $$(LOCALBASE)/include
+unix:INCLUDEPATH += $$(X11BASE)/include
+
+unix:LIBS += $$(QTDIR)/lib/libqassistantclient.a
+unix:LIBS += -L$$(LOCALBASE)/lib -lqwt -lgsl -lgslcblas -lorigin
+unix:LIBS += -L$$(X11BASE)/lib -lqwtplot3d
+unix:LIBS += -lz
+
+TRANSLATIONS = translations/qtiplot_de.ts \
+ translations/qtiplot_es.ts \
+ translations/qtiplot_fr.ts \
+ translations/qtiplot_ru.ts \
+ translations/qtiplot_sv.ts
+
+system($$(X11BASE)/bin/lupdate -verbose qtiplot.pro)
+system($$(X11BASE)/bin/lrelease -verbose qtiplot.pro)
+
+###################### HEADERS ##############################################
+HEADERS += src/application.h \
+ src/graph.h \
+ src/graph3D.h \
+ src/worksheet.h \
+ src/curvesDialog.h \
+ src/valuesDialog.h \
+ src/plotDialog.h \
+ src/plot3DDialog.h \
+ src/plotWizard.h \
+ src/exportDialog.h \
+ src/importDialog.h \
+ src/axesDialog.h \
+ src/pieDialog.h \
+ src/polynomFitDialog.h \
+ src/expDecayDialog.h \
+ src/functionDialog.h \
+ src/fitDialog.h \
+ src/surfaceDialog.h \
+ src/tableDialog.h \
+ src/textDialog.h \
+ src/lineDlg.h \
+ src/scalePicker.h \
+ src/canvaspicker.h \
+ src/ErrorBar.h \
+ src/pie.h \
+ src/errDlg.h \
+ src/LegendMarker.h \
+ src/LineMarker.h\
+ src/ImageMarker.h\
+ src/imageDialog.h \
+ src/fit.h \
+ src/nrutil.h\
+ src/pixmaps.h\
+ src/multilayer.h\
+ src/layerDialog.h \
+ src/intDialog.h \
+ src/sortDialog.h\
+ src/bars.h \
+ src/cones.h \
+ src/configDialog.h \
+ src/BarCurve.h \
+ src/BoxCurve.h \
+ src/Histogram.h \
+ src/VectorCurve.h \
+ src/scales.h \
+ src/imageExportDialog.h \
+ src/matrix.h \
+ src/matrixDialog.h \
+ src/matrixSizeDialog.h \
+ src/matrixValuesDialog.h \
+ src/analysisDialog.h \
+ src/parser.h \
+ src/colorBox.h \
+ src/symbolBox.h \
+ src/patternBox.h \
+ src/importOPJ.h\
+ src/symbolDialog.h \
+ src/plot.h \
+ src/colorButton.h \
+ src/associationsDialog.h \
+ src/renameWindowDialog.h \
+ src/widget.h \
+ src/interpolationDialog.h\
+ src/fileDialogs.h\
+ src/epsExportDialog.h\
+ src/smoothCurveDialog.h\
+ src/filterDialog.h\
+ src/fftDialog.h\
+ src/note.h\
+ src/folder.h\
+ src/findDialog.h\
+ src/Scripting.h\
+ src/scriptedit.h\
+ src/FunctionCurve.h\
+ src/Fitter.h\
+ src/customEvents.h\
+ src/ScriptingLangDialog.h\
+ src/ScriptWindow.h\
+ src/TableStatistics.h\
+ src/Spectrogram.h\
+ src/ColorMapEditor.h
+
+###################### SOURCES ##############################################
+
+SOURCES += src/application.cpp \
+ src/graph.cpp \
+ src/analysis.cpp \
+ src/graph3D.cpp \
+ src/worksheet.cpp \
+ src/valuesDialog.cpp \
+ src/curvesDialog.cpp \
+ src/plotDialog.cpp \
+ src/plot3DDialog.cpp \
+ src/plotWizard.cpp \
+ src/exportDialog.cpp \
+ src/importDialog.cpp \
+ src/axesDialog.cpp \
+ src/pieDialog.cpp \
+ src/polynomFitDialog.cpp \
+ src/tableDialog.cpp \
+ src/textDialog.cpp \
+ src/scalePicker.cpp \
+ src/canvaspicker.cpp \
+ src/expDecayDialog.cpp \
+ src/functionDialog.cpp \
+ src/fitDialog.cpp \
+ src/surfaceDialog.cpp \
+ src/lineDlg.cpp \
+ src/ErrorBar.cpp \
+ src/pie.cpp \
+ src/errDlg.cpp \
+ src/LegendMarker.cpp \
+ src/LineMarker.cpp \
+ src/ImageMarker.cpp\
+ src/imageDialog.cpp \
+ src/multilayer.cpp\
+ src/layerDialog.cpp \
+ src/intDialog.cpp \
+ src/sortDialog.cpp\
+ src/bars.cpp \
+ src/cones.cpp \
+ src/analysisDialog.cpp \
+ src/configDialog.cpp \
+ src/BarCurve.cpp \
+ src/BoxCurve.cpp \
+ src/Histogram.cpp \
+ src/VectorCurve.cpp \
+ src/imageExportDialog.cpp \
+ src/matrix.cpp \
+ src/matrixDialog.cpp \
+ src/matrixSizeDialog.cpp \
+ src/matrixValuesDialog.cpp \
+ src/parser.cpp\
+ src/colorBox.cpp \
+ src/symbolBox.cpp \
+ src/patternBox.cpp \
+ src/importOPJ.cpp\
+ src/main.cpp \
+ src/symbolDialog.cpp \
+ src/plot.cpp \
+ src/colorButton.cpp \
+ src/associationsDialog.cpp \
+ src/renameWindowDialog.cpp \
+ src/widget.cpp\
+ src/interpolationDialog.cpp\
+ src/epsExportDialog.cpp\
+ src/nrutil.cpp\
+ src/fit.cpp\
+ src/smoothCurveDialog.cpp\
+ src/filterDialog.cpp\
+ src/fftDialog.cpp\
+ src/note.cpp\
+ src/folder.cpp\
+ src/findDialog.cpp\
+ src/scriptedit.cpp\
+ src/fileDialogs.cpp\
+ src/scales.cpp\
+ src/FunctionCurve.cpp\
+ src/Fitter.cpp\
+ src/Scripting.cpp\
+ src/ScriptingLangDialog.cpp\
+ src/ScriptWindow.cpp\
+ src/TableStatistics.cpp\
+ src/Spectrogram.cpp\
+ src/ColorMapEditor.cpp
+
+SOURCES +=../3rdparty/zlib123/minigzip.c
+
+##################### SCRIPTING LANGUAGES SECTION #############
+
+ SCRIPTING_LANGS = muParser
+ DEFINES += SCRIPTING_CONSOLE
+ DEFINES += SCRIPTING_DIALOG
+
+# Python support is unstable; use at your own risk
+unix:SCRIPTING_LANGS += Python
+
+##################### Default: muParser #######################
+contains(SCRIPTING_LANGS, muParser) {
+ DEFINES += SCRIPTING_MUPARSER
+ unix:LIBS += -lmuparser
+ HEADERS += src/muParserScripting.h
+ SOURCES += src/muParserScripting.cpp
+}
+
+##################### PYTHON + SIP + PyQT #####################
+contains(SCRIPTING_LANGS, Python) {
+ DEFINES += SCRIPTING_PYTHON
+ HEADERS += src/PythonScripting.h
+ SOURCES += src/PythonScripting.cpp
+
+ SIP = $$(LOCALBASE)/bin/sip
+ SIPINCLUDE = $$(LOCALBASE)/share/py-sip
+
+ unix {
+ INCLUDEPATH += $$(PYTHON_INCLUDEDIR)
+ LIBS += -lm -l$$(PYTHON_VERSION)
+ system(mkdir -p $${MOC_DIR})
+ unix:system($${SIP} -I $${SIPINCLUDE} -t Qt_3_3_0 -t WS_X11 -c $${MOC_DIR} src/qti.sip)
+ }
+
+##################### SIP generated files #####################
+ HEADERS +=\
+ ../tmp/qtiplot/sipqtiApplicationWindow.h\
+ ../tmp/qtiplot/sipqtiGraph.h\
+ ../tmp/qtiplot/sipqtiLineMarker.h\
+ ../tmp/qtiplot/sipqtiMultiLayer.h\
+ ../tmp/qtiplot/sipqtiTable.h\
+ ../tmp/qtiplot/sipqtimyWidget.h\
+ ../tmp/qtiplot/sipqtiScriptEdit.h\
+ ../tmp/qtiplot/sipqtiNote.h\
+ ../tmp/qtiplot/sipqtiFit.h\
+ ../tmp/qtiplot/sipqtiExponentialFit.h\
+ ../tmp/qtiplot/sipqtiTwoExpFit.h\
+ ../tmp/qtiplot/sipqtiThreeExpFit.h\
+ ../tmp/qtiplot/sipqtiSigmoidalFit.h\
+ ../tmp/qtiplot/sipqtiGaussAmpFit.h\
+ ../tmp/qtiplot/sipqtiLorentzFit.h\
+ ../tmp/qtiplot/sipqtiNonLinearFit.h\
+ ../tmp/qtiplot/sipqtiPluginFit.h\
+ ../tmp/qtiplot/sipqtiMultiPeakFit.h\
+ ../tmp/qtiplot/sipqtiPolynomialFit.h\
+ ../tmp/qtiplot/sipqtiLinearFit.h\
+ ../tmp/qtiplot/sipqtiMatrix.h\
+ ../tmp/qtiplot/sipqtiGaussFit.h\
+ ../tmp/qtiplot/sipqtiPythonScript.h\
+ ../tmp/qtiplot/sipqtiFolder.h\
+ ../tmp/qtiplot/sipqtiQPtrList.h
+ SOURCES +=\
+ ../tmp/qtiplot/sipqticmodule.cpp\
+ ../tmp/qtiplot/sipqtiApplicationWindow.cpp\
+ ../tmp/qtiplot/sipqtiGraph.cpp\
+ ../tmp/qtiplot/sipqtiLineMarker.cpp\
+ ../tmp/qtiplot/sipqtiMultiLayer.cpp\
+ ../tmp/qtiplot/sipqtiTable.cpp\
+ ../tmp/qtiplot/sipqtimyWidget.cpp\
+ ../tmp/qtiplot/sipqtiScriptEdit.cpp\
+ ../tmp/qtiplot/sipqtiNote.cpp\
+ ../tmp/qtiplot/sipqtiFit.cpp\
+ ../tmp/qtiplot/sipqtiExponentialFit.cpp\
+ ../tmp/qtiplot/sipqtiTwoExpFit.cpp\
+ ../tmp/qtiplot/sipqtiThreeExpFit.cpp\
+ ../tmp/qtiplot/sipqtiSigmoidalFit.cpp\
+ ../tmp/qtiplot/sipqtiGaussAmpFit.cpp\
+ ../tmp/qtiplot/sipqtiLorentzFit.cpp\
+ ../tmp/qtiplot/sipqtiNonLinearFit.cpp\
+ ../tmp/qtiplot/sipqtiPluginFit.cpp\
+ ../tmp/qtiplot/sipqtiMultiPeakFit.cpp\
+ ../tmp/qtiplot/sipqtiPolynomialFit.cpp\
+ ../tmp/qtiplot/sipqtiLinearFit.cpp\
+ ../tmp/qtiplot/sipqtiMatrix.cpp\
+ ../tmp/qtiplot/sipqtiGaussFit.cpp\
+ ../tmp/qtiplot/sipqtiPythonScript.cpp\
+ ../tmp/qtiplot/sipqtiFolder.cpp\
+ ../tmp/qtiplot/sipqtiQPtrList.cpp
+}
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list