- Update to 0.9.0 RC3

PR:		ports/114579
Submitted by:	Max Brazhnikov <makc at issp.ac.ru> (maintainer)

6 files changed, 46 insertions, 96 deletions

diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index 16fa32445a77..e89782ef0ca6 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qtiplot
-DISTVERSION=	0.9rc2
-PORTREVISION=	1
+DISTVERSION=	0.9rc3
 CATEGORIES=	math science
 MASTER_SITES=	http://soft.proindependent.com/src/
 
@@ -16,19 +15,18 @@ COMMENT=	An Origin clone for data analysis and scientific plotting
 
 LIB_DEPENDS=	gsl.10:${PORTSDIR}/math/gsl \
 		muparser.0:${PORTSDIR}/math/muparser \
-		origin.0:${PORTSDIR}/math/liborigin \
 		qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4 \
 		qwt.5:${PORTSDIR}/x11-toolkits/qwt-devel
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	gui moc qmake opengl qt3support network assistantclient
+QT_COMPONENTS=	gui moc qmake opengl svg qt3support network assistantclient
 HAS_CONFIGURE=	yes
 USE_DOS2UNIX=	qtiplot/qtiplot.pro
 
 DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \
-		"${DATADIR}/manual/common/qtiplot_logo.png" \
+		"${DATADIR}/qtiplot.png" \
 		"qtiplot" "" false
 
 OPTIONS=	DOCS "Install the QtiPlot Handbook" on \
@@ -77,8 +75,15 @@ post-patch:
 		-e "s/^SCRIPTING_LANGS += Python//" \
 		${WRKSRC}/${PORTNAME}/qtiplot.pro
 .endif
+	@${REINPLACE_CMD} -e \
+		's|/usr/share/doc/qtiplot/manual-%1|${DATADIR}/manual|; \
+		 s|/usr/lib/qtiplot/plugins|${DATADIR}/fitPlugins|' \
+		${WRKSRC}/qtiplot/src/ApplicationWindow.cpp
 
 do-configure:
+.if !defined(WITHOUT_NLS)
+	cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 -verbose qtiplot.pro
+.endif
 .for d in ${QPRO_DIRS}
 	(cd ${WRKSRC}/${d} && ${SETENV} ${MAKE_ENV} ${QMAKE})
 .endfor
@@ -91,6 +96,7 @@ post-configure:
 		 s|^LINK .*|LINK=${CXX}|' \
 		${WRKSRC}/${d}/Makefile
 .endfor
+	${REINPLACE_CMD} -e 's|^\(INCPATH.*=\)|\1-I../3rdparty/liborigin|' ${WRKSRC}/qtiplot/Makefile
 
 do-install:
 	${MKDIR} ${DATADIR}
@@ -101,6 +107,7 @@ do-install:
 				${DATADIR}/fitPlugins/libfitRational0.so
 	${INSTALL_PROGRAM} ${WRKSRC}/fitPlugins/libfitRational1.so.1.0.0 \
 				${DATADIR}/fitPlugins/libfitRational1.so
+	${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${DATADIR}/qtiplot.png
 .if defined(WITH_PYTHON)
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/qtiplotrc.py ${DATADIR}/qtiplotrc.py
 	@cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('qtiplotrc.py')"
diff --git a/math/qtiplot/distinfo b/math/qtiplot/distinfo
index ae61fd36e580..fad33acaf96f 100644
--- a/math/qtiplot/distinfo
+++ b/math/qtiplot/distinfo
@@ -1,3 +1,3 @@
-MD5 (qtiplot-0.9rc2.tar.bz2) = e848a4e802d00b8bd972df09b26dff49
-SHA256 (qtiplot-0.9rc2.tar.bz2) = 75f422372f5ca979316d8db4685d20b1324ca229e981322faff119c4aa2b38f1
-SIZE (qtiplot-0.9rc2.tar.bz2) = 787376
+MD5 (qtiplot-0.9rc3.tar.bz2) = 0a644f72bb1c0a107a64bbf5bae5ca17
+SHA256 (qtiplot-0.9rc3.tar.bz2) = 44a6300705dca4921c8454e827e8c3d6e01f004b6a8ee3045b0bb02fa17454cc
+SIZE (qtiplot-0.9rc3.tar.bz2) = 874660
diff --git a/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro b/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro
index a259d5ca09df..aa329695fba7 100644
--- a/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro
+++ b/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro
@@ -1,14 +1,14 @@
---- ./fitPlugins/fitRational0/fitRational0.pro.orig	Thu Apr 19 15:36:12 2007
-+++ ./fitPlugins/fitRational0/fitRational0.pro	Sat Jun  2 15:33:23 2007
-@@ -11,9 +11,8 @@
- 
+--- ./fitPlugins/fitRational0/fitRational0.pro.orig	Wed Jun 13 21:16:56 2007
++++ ./fitPlugins/fitRational0/fitRational0.pro	Sat Jul 14 14:56:13 2007
+@@ -12,9 +12,8 @@
  DESTDIR           = ../
   
+ # statically link against GSL in 3rdparty
 -INCLUDEPATH += ../../3rdparty/gsl
--LIBS        += ../../3rdparty/gsl/lib/libgsl.a
--LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
+-LIBS         += ../3rdparty/gsl/lib/libgsl.a
+-LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
 +unix:INCLUDEPATH += $$(LOCALBASE)/include
 +unix:LIBS         += -lgsl -lgslcblas
+ #dynamically link against GSL installed system-wide
+ #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
  
- #target.path=/usr/lib$${libsuff}
- #INSTALLS += target
diff --git a/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro b/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro
index c085a6b1a7b8..4921ef57a376 100644
--- a/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro
+++ b/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro
@@ -1,14 +1,14 @@
---- ./fitPlugins/fitRational1/fitRational1.pro.orig	Thu Apr 19 15:36:12 2007
-+++ ./fitPlugins/fitRational1/fitRational1.pro	Sat Jun  2 15:33:23 2007
-@@ -11,9 +11,8 @@
- 
+--- ./fitPlugins/fitRational1/fitRational1.pro.orig	Wed Jun 13 21:16:56 2007
++++ ./fitPlugins/fitRational1/fitRational1.pro	Sat Jul 14 14:56:13 2007
+@@ -12,9 +12,8 @@
  DESTDIR           = ../
- 
+  
+ # statically link against GSL in 3rdparty
 -INCLUDEPATH += ../../3rdparty/gsl
--LIBS        += ../../3rdparty/gsl/lib/libgsl.a
--LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
+-LIBS         += ../3rdparty/gsl/lib/libgsl.a
+-LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
 +unix:INCLUDEPATH += $$(LOCALBASE)/include
 +unix:LIBS         += -lgsl -lgslcblas
+ #dynamically link against GSL installed system-wide
+ #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
  
- target.path=/usr/lib$${libsuff}
- INSTALLS += target
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)
diff --git a/math/qtiplot/pkg-plist b/math/qtiplot/pkg-plist
index 1cafac80b896..77da79ac4b89 100644
--- a/math/qtiplot/pkg-plist
+++ b/math/qtiplot/pkg-plist
@@ -2,6 +2,7 @@ bin/qtiplot
 %%DATADIR%%/fitPlugins/libfitRational0.so
 %%DATADIR%%/fitPlugins/libfitRational1.so
 %%DATADIR%%/qtiplot
+%%DATADIR%%/qtiplot.png
 %%PYTHON%%%%DATADIR%%/qtiplotrc.py
 %%PYTHON%%%%DATADIR%%/qtiplotrc.pyc
 %%NLS%%%%DATADIR%%/translations/qtiplot_de.qm