- Update to 0.8.5.

- Pass maintainership to submitter.

PR:		ports/99248
Submitted by:	Max Brazhnikov <makc@issp.ac.ru>
Approved by:	Jie Gao <gaoj@cpsc.ucalgary.ca> (former maintainer)

3 files changed, 32 insertions, 26 deletions

diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index b7b2df1..2d9ab9c 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	qtiplot
-PORTVERSION=	0.6.4
-PORTREVISION=	1
+PORTVERSION=	0.8.5
 CATEGORIES=	math science
 MASTER_SITES=	http://soft.proindependent.com/src/
 
-MAINTAINER=	gaoj@cpsc.ucalgary.ca
+MAINTAINER=	makc@issp.ac.ru
 COMMENT=	An Origin clone for data analysis and scientific plotting
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
@@ -22,10 +21,8 @@ LIB_DEPENDS=	gsl.9:${PORTSDIR}/math/gsl \
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}
-
 PLIST_FILES=	bin/qtiplot
-PORTDOCS=	faq.html help.html
+#PORTDOCS=	faq.html help.html
 
 USE_QT_VER=	3
 MAKE_ENV=	QTDIR=${QT_PREFIX}
@@ -45,15 +42,15 @@ QMAKESPEC=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 post-patch:
 	@${REINPLACE_CMD} -e \
 		"s:../3rdparty/qwt/include:${LOCALBASE}/include/qwt:" \
-		-e "s:/home/ion/qt/qwtplot3d/include:${X11BASE}/include:" \
+		-e "s:/usr/include/qwtplot3d:${X11BASE}/include:" \
 		-e "/^unix:LIBS/s:-L /usr/lib:-L${LOCALBASE}/lib:" \
-		-e "/^unix:LIBS/s:../3rdparty/qwt/lib:${LOCALBASE}/lib:" \
+		-e "/^unix:LIBS/s:../3rdparty/qwt/lib/libqwt.a:-L ${LOCALBASE}/lib -lqwt:" \
 		-e "/^unix:documentation.path/s:/usr/share/doc/qtiplot:${DOCSDIR}:" \
-		${WRKSRC}/${PORTNAME}-${PORTVERSION}.pro
+		${WRKSRC}/${PORTNAME}.pro
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
-		-spec ${QMAKESPEC} ${PORTNAME}-${PORTVERSION}.pro
+		-spec ${QMAKESPEC} ${PORTNAME}.pro
 
 post-configure:
 	@${REINPLACE_CMD} -e \
@@ -65,12 +62,12 @@ post-configure:
 		${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/../qtiplot ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for DOCFN in ${PORTDOCS}
-	${INSTALL_MAN} ${WRKSRC}/doc/${DOCFN} ${DOCSDIR}
-.endfor
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/qtiplot/qtiplot ${PREFIX}/bin
+#.if !defined(NOPORTDOCS)
+#	${MKDIR} ${DOCSDIR}
+#.for DOCFN in ${PORTDOCS}
+#	${INSTALL_MAN} ${WRKSRC}/doc/${DOCFN} ${DOCSDIR}
+#.endfor
+#.endif
 
 .include <bsd.port.post.mk>
diff --git a/math/qtiplot/distinfo b/math/qtiplot/distinfo
index 6426c83..45dc9c9 100644
--- a/math/qtiplot/distinfo
+++ b/math/qtiplot/distinfo
@@ -1,3 +1,3 @@
-MD5 (qtiplot-0.6.4.tar.bz2) = f22bec91f66df4ab546a3befbbbb200e
-SHA256 (qtiplot-0.6.4.tar.bz2) = b656cc601a6c54644dbb35ff55658c3be654c287cdf3a0f0e45bcbf000b61976
-SIZE (qtiplot-0.6.4.tar.bz2) = 391282
+MD5 (qtiplot-0.8.5.tar.bz2) = aa7350a3e5f2662077684421e0deb21f
+SHA256 (qtiplot-0.8.5.tar.bz2) = 81831d8dfaddbdf32d85a6e7eaf0e54e2321e2fba6ffaabfe6943bc326a6f874
+SIZE (qtiplot-0.8.5.tar.bz2) = 530579
diff --git a/math/qtiplot/pkg-descr b/math/qtiplot/pkg-descr
index 986760e..e7db80a 100644
--- a/math/qtiplot/pkg-descr
+++ b/math/qtiplot/pkg-descr
@@ -3,11 +3,20 @@ Origin. The result is still far away from its model, but there's a "wish to"
 list that is being constantly worked on.
 
 Features:
-
-  * Neat 2D and 3D data plotting
-  * ASCII-Import
-  * Spreadsheet and calculations in column-logic
-  * Great non-linear y=f(x) curve fitting and estimation of statistical
-    errors of the fit-parameters
+   * 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...
 
 WWW: http://soft.proindependent.com/qtiplot.html