Attachment 81396 Details for Bug 116568 – file.diff

[patch] file.diff

file.diff (text/plain), 9.08 KB, created by Max Brazhnikov on 2007-09-22 23:10:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Brazhnikov

Created: 2007-09-22 23:10:07 UTC

Size: 9.08 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/math/qtiplot/Makefile /home/makc/porting/ports/math/qtiplot/Makefile
>--- /usr/ports/math/qtiplot/Makefile	2007-07-28 19:39:31.000000000 +0400
>+++ /home/makc/porting/ports/math/qtiplot/Makefile	2007-09-23 00:24:23.000000000 +0400
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	qtiplot
>-DISTVERSION=	0.9rc3
>+DISTVERSION=	0.9
> CATEGORIES=	math science
> MASTER_SITES=	http://soft.proindependent.com/src/
> 
>diff -ruN --exclude=CVS /usr/ports/math/qtiplot/distinfo /home/makc/porting/ports/math/qtiplot/distinfo
>--- /usr/ports/math/qtiplot/distinfo	2007-07-28 19:39:31.000000000 +0400
>+++ /home/makc/porting/ports/math/qtiplot/distinfo	2007-09-23 00:29:45.000000000 +0400
>@@ -1,3 +1,3 @@
>-MD5 (qtiplot-0.9rc3.tar.bz2) = 0a644f72bb1c0a107a64bbf5bae5ca17
>-SHA256 (qtiplot-0.9rc3.tar.bz2) = 44a6300705dca4921c8454e827e8c3d6e01f004b6a8ee3045b0bb02fa17454cc
>-SIZE (qtiplot-0.9rc3.tar.bz2) = 874660
>+MD5 (qtiplot-0.9.tar.bz2) = 117601fb9ba06b41f99e5492920f0864
>+SHA256 (qtiplot-0.9.tar.bz2) = a4a8cbf0619f902ce029286a9f2960da66d587d6b2f2fffdb9ed8042fa2873db
>+SIZE (qtiplot-0.9.tar.bz2) = 825530
>diff -ruN --exclude=CVS /usr/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro
>--- /usr/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro	2007-07-28 19:39:32.000000000 +0400
>+++ /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro	2007-09-23 01:14:11.000000000 +0400
>@@ -1,10 +1,10 @@
>---- ./qtiplot/qtiplot.pro.orig	Sat Jul 14 14:56:13 2007
>-+++ ./qtiplot/qtiplot.pro	Sat Jul 14 15:01:25 2007
>-@@ -25,12 +25,8 @@
>+--- ./qtiplot/qtiplot.pro.orig	2007-09-20 15:55:53.000000000 +0400
>++++ ./qtiplot/qtiplot.pro	2007-09-23 01:11:43.000000000 +0400
>+@@ -30,12 +30,8 @@
>  #!!! Warning: You must modify these paths according to your computer settings
>  #############################################################################
>  
>--INCLUDEPATH       += ../3rdparty/muParser
>+-INCLUDEPATH       += ../3rdparty/muparser/include
> -INCLUDEPATH       += ../3rdparty/qwtplot3d/include
> -INCLUDEPATH       += ../3rdparty/qwt/src
> -INCLUDEPATH       += ../3rdparty/liborigin
>@@ -15,77 +15,48 @@
>  
>  ##################### 3rd PARTY LIBRARIES SECTION ###########################
>  #!!! Warning: You must modify these paths according to your computer settings
>-@@ -43,18 +39,17 @@
>- unix:LIBS         += -L /usr/lib$${libsuff}
>+@@ -44,17 +40,13 @@
>+ ##################### Linux (Mac OS X) ######################################
>  
>- # statically link against Qwt(3D) in 3rdparty
>+ # statically link against libraries in 3rdparty
>+-unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a
> -unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
> -unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
>-+unix:LIBS         += -L$$(LOCALBASE)/lib -lqwt -lqwtplot3d-qt4 -lz
>- # dynamically link against Qwt(3D) installed system-wide
>- # WARNING: make sure they are compiled against Qt4
>- #unix:LIBS         += -lqwtplot3d
>- #unix:LIBS         += -lqwt
>- 
>- # statically link against GSL in 3rdparty
> -unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a
> -unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
>-+#unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a
>-+#unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
>- #dynamically link against GSL installed system-wide
>+ 
>+ # dynamically link against dependencies if they are installed system-wide
>+ #unix:LIBS         += -lmuparser
>+ #unix:LIBS         += -lqwtplot3d
>+-#unix:LIBS         += -lqwt
> -#unix:LIBS         += -lgsl -lgslcblas
>++unix:LIBS         += -lqwt
> +unix:LIBS         += -lgsl -lgslcblas
>++unix:LIBS         += -L$$(LOCALBASE)/lib -lqwtplot3d-qt4 -lz
>  
>  ##################### Windows ###############################################
>  
>-@@ -359,30 +354,12 @@
>+@@ -363,6 +355,7 @@
>+ ##################### Default: muParser v1.28 #################
>  
>  contains(SCRIPTING_LANGS, muParser) {
>-   DEFINES += SCRIPTING_MUPARSER
>--
> +  unix:LIBS         += -lmuparser
>-   HEADERS += src/muParserScript.h \
>--             src/muParserScripting.h \
>--             ../3rdparty/muParser/muParser.h \
>--             ../3rdparty/muParser/muParserBase.h \
>--             ../3rdparty/muParser/muParserInt.h \
>--             ../3rdparty/muParser/muParserError.h \
>--             ../3rdparty/muParser/muParserStack.h \
>--             ../3rdparty/muParser/muParserToken.h \
>--             ../3rdparty/muParser/muParserBytecode.h \
>--             ../3rdparty/muParser/muParserCallback.h \
>--             ../3rdparty/muParser/muParserTokenReader.h \
>--             ../3rdparty/muParser/muParserFixes.h \
>--             ../3rdparty/muParser/muParserDef.h \
>-+             src/muParserScripting.h
>- 
>-   SOURCES += src/muParserScript.cpp \
>--             src/muParserScripting.cpp \
>--             ../3rdparty/muParser/muParser.cpp \
>--             ../3rdparty/muParser/muParserBase.cpp \
>--             ../3rdparty/muParser/muParserInt.cpp \
>--             ../3rdparty/muParser/muParserBytecode.cpp \
>--             ../3rdparty/muParser/muParserCallback.cpp \
>--             ../3rdparty/muParser/muParserTokenReader.cpp \
>--             ../3rdparty/muParser/muParserError.cpp \
>-+             src/muParserScripting.cpp
>- 
>- }
>+   DEFINES += SCRIPTING_MUPARSER
>  
>-@@ -394,11 +371,11 @@
>+   HEADERS += src/muParserScript.h \
>+@@ -380,11 +373,11 @@
>    SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
>  
>    unix {
> -    INCLUDEPATH += $$system(python python-includepath.py)
> -    LIBS        += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
> -    LIBS        += -lm
>--    system(mkdir -p $${SIP_DIR})
>++    INCLUDEPATH += $$(PYTHON_INCLUDEDIR)
>++    LIBS +=	-lm -l$$(PYTHON_VERSION)
>+     system(mkdir -p $${SIP_DIR})
> -    system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)
>-+	INCLUDEPATH += $$(PYTHON_INCLUDEDIR)
>-+	LIBS +=	-lm -l$$(PYTHON_VERSION)
>-+	system(mkdir -p $${SIP_DIR})
>-+	SIPCMD = $$(PYTHON_VERSION) python-sipcmd.py
>-+	system($$system($$SIPCMD) -c $${SIP_DIR} src/qti.sip)
>++    SIPCMD = $$(PYTHON_VERSION) python-sipcmd.py
>++    system($$system($$SIPCMD) -c $${SIP_DIR} src/qti.sip)
>    }
>  
>-   win32 {
>+   win32 {
>\ No newline at end of file
>diff -ruN --exclude=CVS /usr/ports/math/qtiplot/pkg-descr /home/makc/porting/ports/math/qtiplot/pkg-descr
>--- /usr/ports/math/qtiplot/pkg-descr	2006-08-08 02:25:07.000000000 +0400
>+++ /home/makc/porting/ports/math/qtiplot/pkg-descr	2007-09-23 00:43:54.000000000 +0400
>@@ -1,22 +1,32 @@
>-The purpose of QtiPlot was to develop a free, platform independent clone of
>-Origin. The result is still far away from its model, but there's a "wish to"
>-list that is being constantly worked on.
>+The purpose of this project is to develop a free (open source),
>+platform independent alternative to Origin. QtiPlot is being actively
>+improved, all your suggestions to our "wish to" list and all your
>+contributions are most welcome!
> 
> Features:
>-   * 2D and 3D Plots
>-   * Powerful and versatile spreadsheets and calculations in column-logic
>-   * Easy ASCII-Import/Export of single or multiple files
>-   * Linear and non-linear y=f(x) curve fitting and estimation of statistical
>-errors of the fit-parameters
>-   * Multi-peak fitting with Gaussian and Lorentzian peak profiles
>-   * Data analysis: statistics, sorting, FFT, data smoothing (Savitzky-Golay,
>-FFT smoothing, and moving window average), data filtering (low/high/band pass
>-and band block filters), convolution/deconvolution, correlation, interpolation,
>-numerical integration/differentiation, etc...
>-   * Matrices optimized for 3D plotting
>-   * Templates support: all the settings for plots (2D/3D), tables and matrixes
>-can be saved to ASCII files and restored later on for a fast editing process
>-   * Project files based on folders, a powerful project explorer with extensive
>-built-in features: drag and drop, searching facilities, etc...
>+ * QtiPlot is fully scriptable via Python, which gives you the
>+ possibility to use powerfull existing scientific tools, such as
>+ SciPy
>+ * OpenGL based 3D Plotting
>+ * Publication quality 2D plots
>+ * Easy export of plots to vector formats (EPS, PS, PDF) and
>+ to other various image formats (BMP, JPG, PNG, TIFF etc ...)
>+ * Powerful and versatile spreadsheets and calculations in column-logic
>+ * Easy ASCII-Import/Export of single or multiple files
>+ * Linear and non-linear y=f(x) curve fitting and estimation of
>+ statistical errors of the fit-parameters
>+ * Multi-peak fitting with Gaussian and Lorentzian peak profiles
>+ * Data analysis: statistics, sorting, FFT, data smoothing
>+ (Savitzky-Golay, FFT smoothing, and moving window average), data
>+ filtering (low/high/band pass and band block filters),
>+ convolution/deconvolution, correlation, interpolation, numerical
>+ integration/differentiation, etc...
>+ * Matrices optimized for 3D plotting
>+ * Templates support: all the settings for plots (2D/3D), tables
>+ and matrixes can be saved to ASCII files and restored later on for
>+ a fast editing process
>+ * Project files based on folders, a powerful project explorer with
>+ extensive built-in features: drag and drop, searching facilities,
>+ etc...
> 
> WWW: http://soft.proindependent.com/qtiplot.html

Actions: View | Diff

Attachments on bug 116568: 81396