Attachment #81396 for bug #116568

View | Details | Raw Unified | Return to bug 116568
Collapse All | Expand All

Lines 6-12 Link Here

(-)/home/makc/porting/ports/math/qtiplot/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= qtiplot	8	PORTNAME= qtiplot
9	DISTVERSION= 0.9rc3	9	DISTVERSION= 0.9
10	CATEGORIES= math science	10	CATEGORIES= math science
11	MASTER_SITES= http://soft.proindependent.com/src/	11	MASTER_SITES= http://soft.proindependent.com/src/
12		12

Lines 1-3 Link Here

(-)/home/makc/porting/ports/math/qtiplot/distinfo (-3 / +3 lines)
1	MD5 (qtiplot-0.9rc3.tar.bz2) = 0a644f72bb1c0a107a64bbf5bae5ca17	1	MD5 (qtiplot-0.9.tar.bz2) = 117601fb9ba06b41f99e5492920f0864
2	SHA256 (qtiplot-0.9rc3.tar.bz2) = 44a6300705dca4921c8454e827e8c3d6e01f004b6a8ee3045b0bb02fa17454cc	2	SHA256 (qtiplot-0.9.tar.bz2) = a4a8cbf0619f902ce029286a9f2960da66d587d6b2f2fffdb9ed8042fa2873db
3	SIZE (qtiplot-0.9rc3.tar.bz2) = 874660	3	SIZE (qtiplot-0.9.tar.bz2) = 825530




--- ./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/include
-INCLUDEPATH       += ../3rdparty/qwtplot3d/include
-INCLUDEPATH       += ../3rdparty/qwt/src
-INCLUDEPATH       += ../3rdparty/liborigin

 
 ##################### 3rd PARTY LIBRARIES SECTION ###########################
 #!!! Warning: You must modify these paths according to your computer settings
@@ -44,17 +40,13 @@
 ##################### Linux (Mac OS X) ######################################
 
 # 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
 
 # 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 ###############################################
 
@@ -363,6 +355,7 @@
 ##################### Default: muParser v1.28 #################
 
 contains(SCRIPTING_LANGS, muParser) {
   DEFINES += SCRIPTING_MUPARSER
-
+  unix:LIBS         += -lmuparser
   DEFINES += SCRIPTING_MUPARSER
-             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
 
 }
 
   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
+    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)
+    SIPCMD = $$(PYTHON_VERSION) python-sipcmd.py
+    system($$system($$SIPCMD) -c $${SIP_DIR} src/qti.sip)
+	system(mkdir -p $${SIP_DIR})
+	SIPCMD = $$(PYTHON_VERSION) python-sipcmd.py
+	system($$system($$SIPCMD) -c $${SIP_DIR} src/qti.sip)
   }
 
   win32 {




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:
 * 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

Return to bug 116568

Lines 1-10 Link Here

(-)/home/makc/porting/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro (-55 / +26 lines)
1	--- ./qtiplot/qtiplot.pro.orig Sat Jul 14 14:56:13 2007	1	--- ./qtiplot/qtiplot.pro.orig 2007-09-20 15:55:53.000000000 +0400
2	+++ ./qtiplot/qtiplot.pro Sat Jul 14 15:01:25 2007	2	+++ ./qtiplot/qtiplot.pro 2007-09-23 01:11:43.000000000 +0400
3	@@ -25,12 +25,8 @@	3	@@ -30,12 +30,8 @@
4	#!!! Warning: You must modify these paths according to your computer settings	4	#!!! Warning: You must modify these paths according to your computer settings
5	#############################################################################	5	#############################################################################
6		6
7	-INCLUDEPATH += ../3rdparty/muParser	7	-INCLUDEPATH += ../3rdparty/muparser/include
8	-INCLUDEPATH += ../3rdparty/qwtplot3d/include	8	-INCLUDEPATH += ../3rdparty/qwtplot3d/include
9	-INCLUDEPATH += ../3rdparty/qwt/src	9	-INCLUDEPATH += ../3rdparty/qwt/src
10	-INCLUDEPATH += ../3rdparty/liborigin	10	-INCLUDEPATH += ../3rdparty/liborigin
Lines 15-91 Link Here
15		15
16	##################### 3rd PARTY LIBRARIES SECTION ###########################	16	##################### 3rd PARTY LIBRARIES SECTION ###########################
17	#!!! Warning: You must modify these paths according to your computer settings	17	#!!! Warning: You must modify these paths according to your computer settings
18	@@ -43,18 +39,17 @@	18	@@ -44,17 +40,13 @@
19	unix:LIBS += -L /usr/lib$${libsuff}	19	##################### Linux (Mac OS X) ######################################
20		20
21	# statically link against Qwt(3D) in 3rdparty	21	# statically link against libraries in 3rdparty
		22	-unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
22	-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a	23	-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
23	-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a	24	-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
24	+unix:LIBS += -L$$(LOCALBASE)/lib -lqwt -lqwtplot3d-qt4 -lz
25	# dynamically link against Qwt(3D) installed system-wide
26	# WARNING: make sure they are compiled against Qt4
27	#unix:LIBS += -lqwtplot3d
28	#unix:LIBS += -lqwt
29
30	# statically link against GSL in 3rdparty
31	-unix:LIBS += ../3rdparty/gsl/lib/libgsl.a	25	-unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
32	-unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a	26	-unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
33	+#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a	27
34	+#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a	28	# dynamically link against dependencies if they are installed system-wide
35	#dynamically link against GSL installed system-wide	29	#unix:LIBS += -lmuparser
		30	#unix:LIBS += -lqwtplot3d
		31	-#unix:LIBS += -lqwt
36	-#unix:LIBS += -lgsl -lgslcblas	32	-#unix:LIBS += -lgsl -lgslcblas
		33	+unix:LIBS += -lqwt
37	+unix:LIBS += -lgsl -lgslcblas	34	+unix:LIBS += -lgsl -lgslcblas
		35	+unix:LIBS += -L$$(LOCALBASE)/lib -lqwtplot3d-qt4 -lz
38		36
39	##################### Windows ###############################################	37	##################### Windows ###############################################
40		38
41	@@ -359,30 +354,12 @@	39	@@ -363,6 +355,7 @@
		40	##################### Default: muParser v1.28 #################
42		41
43	contains(SCRIPTING_LANGS, muParser) {	42	contains(SCRIPTING_LANGS, muParser) {
44	DEFINES += SCRIPTING_MUPARSER
45	-
46	+ unix:LIBS += -lmuparser	43	+ unix:LIBS += -lmuparser
47	HEADERS += src/muParserScript.h \	44	DEFINES += SCRIPTING_MUPARSER
48	- src/muParserScripting.h \
49	- ../3rdparty/muParser/muParser.h \
50	- ../3rdparty/muParser/muParserBase.h \
51	- ../3rdparty/muParser/muParserInt.h \
52	- ../3rdparty/muParser/muParserError.h \
53	- ../3rdparty/muParser/muParserStack.h \
54	- ../3rdparty/muParser/muParserToken.h \
55	- ../3rdparty/muParser/muParserBytecode.h \
56	- ../3rdparty/muParser/muParserCallback.h \
57	- ../3rdparty/muParser/muParserTokenReader.h \
58	- ../3rdparty/muParser/muParserFixes.h \
59	- ../3rdparty/muParser/muParserDef.h \
60	+ src/muParserScripting.h
61
62	SOURCES += src/muParserScript.cpp \
63	- src/muParserScripting.cpp \
64	- ../3rdparty/muParser/muParser.cpp \
65	- ../3rdparty/muParser/muParserBase.cpp \
66	- ../3rdparty/muParser/muParserInt.cpp \
67	- ../3rdparty/muParser/muParserBytecode.cpp \
68	- ../3rdparty/muParser/muParserCallback.cpp \
69	- ../3rdparty/muParser/muParserTokenReader.cpp \
70	- ../3rdparty/muParser/muParserError.cpp \
71	+ src/muParserScripting.cpp
72
73	}
74		45
75	@@ -394,11 +371,11 @@	46	HEADERS += src/muParserScript.h \
		47	@@ -380,11 +373,11 @@
76	SOURCES += src/PythonScript.cpp src/PythonScripting.cpp	48	SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
77		49
78	unix {	50	unix {
79	- INCLUDEPATH += $$system(python python-includepath.py)	51	- INCLUDEPATH += $$system(python python-includepath.py)
80	- LIBS += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")	52	- LIBS += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
81	- LIBS += -lm	53	- LIBS += -lm
82	- system(mkdir -p $${SIP_DIR})	54	+ INCLUDEPATH += $$(PYTHON_INCLUDEDIR)
		55	+ LIBS += -lm -l$$(PYTHON_VERSION)
		56	system(mkdir -p $${SIP_DIR})
83	- system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)	57	- system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)
84	+ INCLUDEPATH += $$(PYTHON_INCLUDEDIR)	58	+ SIPCMD = $$(PYTHON_VERSION) python-sipcmd.py
85	+ LIBS += -lm -l$$(PYTHON_VERSION)	59	+ system($$system($$SIPCMD) -c $${SIP_DIR} src/qti.sip)
86	+ system(mkdir -p $${SIP_DIR})
87	+ SIPCMD = $$(PYTHON_VERSION) python-sipcmd.py
88	+ system($$system($$SIPCMD) -c $${SIP_DIR} src/qti.sip)
89	}	60	}
90		61
91	win32 {	62	win32 {

Lines 1-22 Link Here

(-)/home/makc/porting/ports/math/qtiplot/pkg-descr (-18 / +28 lines)
1	The purpose of QtiPlot was to develop a free, platform independent clone of	1	The purpose of this project is to develop a free (open source),
2	Origin. The result is still far away from its model, but there's a "wish to"	2	platform independent alternative to Origin. QtiPlot is being actively
3	list that is being constantly worked on.	3	improved, all your suggestions to our "wish to" list and all your
		4	contributions are most welcome!
4		5
5	Features:	6	Features:
6	* 2D and 3D Plots	7	* QtiPlot is fully scriptable via Python, which gives you the
7	* Powerful and versatile spreadsheets and calculations in column-logic	8	possibility to use powerfull existing scientific tools, such as
8	* Easy ASCII-Import/Export of single or multiple files	9	SciPy
9	* Linear and non-linear y=f(x) curve fitting and estimation of statistical	10	* OpenGL based 3D Plotting
10	errors of the fit-parameters	11	* Publication quality 2D plots
11	* Multi-peak fitting with Gaussian and Lorentzian peak profiles	12	* Easy export of plots to vector formats (EPS, PS, PDF) and
12	* Data analysis: statistics, sorting, FFT, data smoothing (Savitzky-Golay,	13	to other various image formats (BMP, JPG, PNG, TIFF etc ...)
13	FFT smoothing, and moving window average), data filtering (low/high/band pass	14	* Powerful and versatile spreadsheets and calculations in column-logic
14	and band block filters), convolution/deconvolution, correlation, interpolation,	15	* Easy ASCII-Import/Export of single or multiple files
15	numerical integration/differentiation, etc...	16	* Linear and non-linear y=f(x) curve fitting and estimation of
16	* Matrices optimized for 3D plotting	17	statistical errors of the fit-parameters
17	* Templates support: all the settings for plots (2D/3D), tables and matrixes	18	* Multi-peak fitting with Gaussian and Lorentzian peak profiles
18	can be saved to ASCII files and restored later on for a fast editing process	19	* Data analysis: statistics, sorting, FFT, data smoothing
19	* Project files based on folders, a powerful project explorer with extensive	20	(Savitzky-Golay, FFT smoothing, and moving window average), data
20	built-in features: drag and drop, searching facilities, etc...	21	filtering (low/high/band pass and band block filters),
		22	convolution/deconvolution, correlation, interpolation, numerical
		23	integration/differentiation, etc...
		24	* Matrices optimized for 3D plotting
		25	* Templates support: all the settings for plots (2D/3D), tables
		26	and matrixes can be saved to ASCII files and restored later on for
		27	a fast editing process
		28	* Project files based on folders, a powerful project explorer with
		29	extensive built-in features: drag and drop, searching facilities,
		30	etc...
21		31
22	WWW: http://soft.proindependent.com/qtiplot.html	32	WWW: http://soft.proindependent.com/qtiplot.html