diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2007-09-23 06:52:28 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2007-09-23 06:52:28 +0000 |
| commit | a783654994ff55b4094c7312a715f2f06548bee9 (patch) | |
| tree | 4f31523c136a3d2846fe93395e68fa2c7c7fca11 /math/qtiplot/files/patch-qtiplot__qtiplot.pro | |
| parent | maintainer update: math/qwtplot3d-qt4 (diff) | |
maintainer update: math/qtiplot
update to 0.9
PR: ports/116568
Submitted by: Max Brazhnikov <makc@issp.ac.ru>
Diffstat (limited to 'math/qtiplot/files/patch-qtiplot__qtiplot.pro')
| -rw-r--r-- | math/qtiplot/files/patch-qtiplot__qtiplot.pro | 81 |
1 files changed, 26 insertions, 55 deletions
diff --git a/math/qtiplot/files/patch-qtiplot__qtiplot.pro b/math/qtiplot/files/patch-qtiplot__qtiplot.pro index f65025fc569e..5dcf79cd8c84 100644 --- a/math/qtiplot/files/patch-qtiplot__qtiplot.pro +++ b/math/qtiplot/files/patch-qtiplot__qtiplot.pro @@ -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 |