diff options
| author | Rong-En Fan <rafan@FreeBSD.org> | 2007-07-28 15:39:32 +0000 |
|---|---|---|
| committer | Rong-En Fan <rafan@FreeBSD.org> | 2007-07-28 15:39:32 +0000 |
| commit | 5f949243d433a0a2f1f9220730723d87d5c55a07 (patch) | |
| tree | 23f73744b0f4fd7a84a6c094525c0dbcf2b9f2de /math/qtiplot/files/patch-qtiplot__qtiplot.pro | |
| parent | - Update to 7.1 patchset 39 (diff) | |
- Update to 0.9.0 RC3
PR: ports/114579
Submitted by: Max Brazhnikov <makc at issp.ac.ru> (maintainer)
Diffstat (limited to 'math/qtiplot/files/patch-qtiplot__qtiplot.pro')
| -rw-r--r-- | math/qtiplot/files/patch-qtiplot__qtiplot.pro | 84 |
1 files changed, 13 insertions, 71 deletions
diff --git a/math/qtiplot/files/patch-qtiplot__qtiplot.pro b/math/qtiplot/files/patch-qtiplot__qtiplot.pro index 2252b24c1cc0..f65025fc569e 100644 --- a/math/qtiplot/files/patch-qtiplot__qtiplot.pro +++ b/math/qtiplot/files/patch-qtiplot__qtiplot.pro @@ -1,43 +1,27 @@ ---- ./qtiplot/qtiplot.pro.orig Fri Jun 8 00:55:33 2007 -+++ ./qtiplot/qtiplot.pro Fri Jun 8 00:58:19 2007 -@@ -17,24 +17,17 @@ - - # what to install and where - INSTALLS += target --INSTALLS += documentation --unix: target.path = /usr/bin -+#INSTALLS += documentation -+unix: target.path = $$(PREFIX) - unix: documentation.path = /usr/share/doc/qtiplot - - ##################### 3rd PARTY HEADER FILES SECTION ######################## +--- ./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 @@ #!!! Warning: You must modify these paths according to your computer settings ############################################################################# -INCLUDEPATH += ../3rdparty/muParser -- -INCLUDEPATH += ../3rdparty/qwtplot3d/include -INCLUDEPATH += ../3rdparty/qwt/src --#INCLUDEPATH += /usr/include/qwtplot3d --#INCLUDEPATH += /usr/include/qwt5 -- -INCLUDEPATH += ../3rdparty/liborigin -INCLUDEPATH += ../3rdparty/gsl/include -INCLUDEPATH += ../3rdparty/zlib123/include -+unix:INCLUDEPATH += $$(LOCALBASE)/include +unix:INCLUDEPATH += $$(LOCALBASE)/include/qwt +unix:INCLUDEPATH += $$(LOCALBASE)/include/qwtplot3d-qt4 ##################### 3rd PARTY LIBRARIES SECTION ########################### #!!! Warning: You must modify these paths according to your computer settings -@@ -47,18 +40,18 @@ +@@ -43,18 +39,17 @@ unix:LIBS += -L /usr/lib$${libsuff} # statically link against Qwt(3D) in 3rdparty -unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a -unix:LIBS += ../3rdparty/qwt/lib/libqwt.a -+unix:LIBS += -L$$(LOCALBASE)/lib -lqwt -lqwtplot3d-qt4 -lorigin -+unix:LIBS += -lz -lmuparser ++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 @@ -54,38 +38,14 @@ ##################### Windows ############################################### -@@ -110,8 +103,8 @@ - translations/qtiplot_ja.ts \ - translations/qtiplot_sv.ts - --#system(lupdate -verbose qtiplot.pro) --#system(lrelease -verbose qtiplot.pro) -+system($$(LOCALBASE)/bin/lupdate-qt4 -verbose qtiplot.pro) -+system($$(LOCALBASE)/bin/lrelease-qt4 -verbose qtiplot.pro) - - ###################### DOCUMENTATION ######################################## - -@@ -350,8 +343,8 @@ - ################# Origin Import (liborigin) ################### - ############################################################### - --HEADERS += ../3rdparty/liborigin/OPJFile.h --SOURCES += ../3rdparty/liborigin/OPJFile.cpp -+#HEADERS += ../3rdparty/liborigin/OPJFile.h -+#SOURCES += ../3rdparty/liborigin/OPJFile.cpp - - ############################################################### - ##################### SCRIPTING LANGUAGES SECTION ############# -@@ -361,30 +354,32 @@ +@@ -359,30 +354,12 @@ contains(SCRIPTING_LANGS, muParser) { DEFINES += SCRIPTING_MUPARSER - -+ -+ unix:LIBS += -lmuparser -+ ++ unix:LIBS += -lmuparser HEADERS += src/muParserScript.h \ - src/muParserScripting.h \ +- src/muParserScripting.h \ - ../3rdparty/muParser/muParser.h \ - ../3rdparty/muParser/muParserBase.h \ - ../3rdparty/muParser/muParserInt.h \ @@ -97,20 +57,10 @@ - ../3rdparty/muParser/muParserTokenReader.h \ - ../3rdparty/muParser/muParserFixes.h \ - ../3rdparty/muParser/muParserDef.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 \ +- src/muParserScripting.cpp \ - ../3rdparty/muParser/muParser.cpp \ - ../3rdparty/muParser/muParserBase.cpp \ - ../3rdparty/muParser/muParserInt.cpp \ @@ -118,17 +68,11 @@ - ../3rdparty/muParser/muParserCallback.cpp \ - ../3rdparty/muParser/muParserTokenReader.cpp \ - ../3rdparty/muParser/muParserError.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 } -@@ -396,12 +391,12 @@ +@@ -394,11 +371,11 @@ SOURCES += src/PythonScript.cpp src/PythonScripting.cpp unix { @@ -137,13 +81,11 @@ - LIBS += -lm - 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) -+ } + } win32 { - INCLUDEPATH += $$system(call python-includepath.py) |