ports/137388: math/qtiplot[-doc]:update to latest release

Dima Panov fluffy at fluffy.khv.ru
Mon Aug 3 12:20:04 UTC 2009


>Number:         137388
>Category:       ports
>Synopsis:       math/qtiplot[-doc]:update to latest release
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 03 12:20:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Dima Panov
>Release:        FreeBSD 8.0-800106-BETA2 i386
>Organization:
Fluffy.Khv.RU 
>Environment:


System: FreeBSD 8.0-800106-BETA2 #1: Thu Jul 30 17:59:30 VLAST 2009
    root at Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot



>Description:


math/qtiplot[-doc]:update to latest release

python support if off by default, author didn't support new sip/pyqt4


>How-To-Repeat:





>Fix:


--- qtiplot.diff begins here ---
Index: math/qtiplot/Makefile
===================================================================
RCS file: /home/ncvs/ports/math/qtiplot/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- math/qtiplot/Makefile	28 Jul 2009 11:45:02 -0000	1.33
+++ math/qtiplot/Makefile	3 Aug 2009 11:11:30 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qtiplot
-DISTVERSION=	0.9.7.6
+DISTVERSION=	0.9.7.8
 CATEGORIES=	math science
 MASTER_SITES=	BERLIOS http://soft.proindependent.com/src/
 
@@ -34,13 +34,14 @@
 		"qtiplot" "" false
 
 OPTIONS=	DOCS "Install the QtiPlot Handbook" on \
-		PYTHON "Python scripting support" on
+		PYTHON "Python scripting support" off
 
 STRIP_FILES=	bin/qtiplot share/qtiplot/fitPlugins/*.so.1.0.0
 
 .include <bsd.port.options.mk>
 
 .if defined(WITH_PYTHON)
+BROKEN=		Failed with new sip
 USE_PYTHON=	yes
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
Index: math/qtiplot/distinfo
===================================================================
RCS file: /home/ncvs/ports/math/qtiplot/distinfo,v
retrieving revision 1.22
diff -u -r1.22 distinfo
--- math/qtiplot/distinfo	5 Apr 2009 18:47:44 -0000	1.22
+++ math/qtiplot/distinfo	3 Aug 2009 07:18:40 -0000
@@ -1,3 +1,3 @@
-MD5 (qtiplot-0.9.7.6.tar.bz2) = a9b9b2fbd3044022a7afa3a89ec5c47d
-SHA256 (qtiplot-0.9.7.6.tar.bz2) = 1248b545103fa45e86c13c5e91d1c565c3d76b71e35582731fb39b538f0c6903
-SIZE (qtiplot-0.9.7.6.tar.bz2) = 6905629
+MD5 (qtiplot-0.9.7.8.tar.bz2) = 15a62821f6f69086e685c271fb510bd4
+SHA256 (qtiplot-0.9.7.8.tar.bz2) = 93dc338ef2be25a84e6edb2c8c4873711cad05a133dadd20c868faaf556990a3
+SIZE (qtiplot-0.9.7.8.tar.bz2) = 7302830
Index: math/qtiplot/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/math/qtiplot/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- math/qtiplot/pkg-plist	5 Apr 2009 18:47:44 -0000	1.8
+++ math/qtiplot/pkg-plist	3 Aug 2009 11:59:02 -0000
@@ -15,6 +15,10 @@
 %%DATADIR%%/fitPlugins/libfitRational1.so.1
 %%DATADIR%%/fitPlugins/libfitRational1.so.1.0
 %%DATADIR%%/fitPlugins/libfitRational1.so.1.0.0
+%%DATADIR%%/fitPlugins/libplanck_wavelength.so
+%%DATADIR%%/fitPlugins/libplanck_wavelength.so.1
+%%DATADIR%%/fitPlugins/libplanck_wavelength.so.1.0
+%%DATADIR%%/fitPlugins/libplanck_wavelength.so.1.0.0
 %%DATADIR%%/qtiplot.png
 %%PYTHON%%%%DATADIR%%/qtiUtil.py
 %%PYTHON%%%%DATADIR%%/qtiUtil.pyc
Index: math/qtiplot/files/patch-qtiplot.pro
===================================================================
RCS file: /home/ncvs/ports/math/qtiplot/files/patch-qtiplot.pro,v
retrieving revision 1.4
diff -u -r1.4 patch-qtiplot.pro
--- math/qtiplot/files/patch-qtiplot.pro	5 Apr 2009 18:47:44 -0000	1.4
+++ math/qtiplot/files/patch-qtiplot.pro	3 Aug 2009 12:00:14 -0000
@@ -1,8 +1,9 @@
 --- ./qtiplot.pro.orig	2009-04-01 18:16:49.000000000 +0400
 +++ ./qtiplot.pro	2009-04-04 12:17:20.000000000 +0400
-@@ -1,5 +1,4 @@
+@@ -1,6 +1,4 @@
  TEMPLATE = subdirs
  
  SUBDIRS = fitPlugins \
--	    manual \
+-	      manual \
+-	      3rdparty/qwt \
            qtiplot
--- /dev/null	2009-08-03 23:00:20.000000000 +1100
+++ math/qtiplot/files/patch-fitPlugins__planck_wavelenght__planck_wavelength.pro	2009-08-03 19:34:24.000000000 +1100
@@ -0,0 +1,20 @@
+--- ./fitPlugins/planck_wavelength/planck_wavelength.pro.orig	2009-08-03 19:30:36.000000000 +1100
++++ ./fitPlugins/planck_wavelength/planck_wavelength.pro	2009-08-03 19:33:14.000000000 +1100
+@@ -11,14 +11,13 @@
+ INSTALLS += target
+  
+ # statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-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}/qtiplot/plugins
++target.path=$$PREFIX/share/qtiplot/fitPlugins
+ 
+ SOURCES = planck_wavelength.c
+ 
--- /dev/null	2009-08-03 23:00:20.000000000 +1100
+++ math/qtiplot/files/patch-qtiplot__src__scripting__qti.sip	2009-08-02 17:03:11.000000000 +1100
@@ -0,0 +1,11 @@
+--- ./qtiplot/src/scripting/qti.sip.orig	2009-04-02 01:16:20.000000000 +1100
++++ ./qtiplot/src/scripting/qti.sip	2009-08-02 17:01:40.000000000 +1100
+@@ -1324,6 +1324,8 @@
+ }
+ %End
+ %ModuleHeaderCode
++#include "src/core/MdiSubWindow.h"
++typedef QList<MdiSubWindow*> MDIWindowList;
+ class ApplicationWindow;
+ ApplicationWindow *sipqti_app();
+ #define SIPQTI_APP(sipcppexpr)\
Index: math/qtiplot-doc/Makefile
===================================================================
RCS file: /home/ncvs/ports/math/qtiplot-doc/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- math/qtiplot-doc/Makefile	31 Jul 2009 13:53:47 -0000	1.13
+++ math/qtiplot-doc/Makefile	3 Aug 2009 06:18:03 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qtiplot
-DISTVERSION=	0.9.7.6
-PORTREVISION=	1
+DISTVERSION=	0.9.7.8
 CATEGORIES=	math
 MASTER_SITES=	BERLIOS http://soft.proindependent.com/src/
 PKGNAMESUFFIX=	-doc
Index: math/qtiplot-doc/distinfo
===================================================================
RCS file: /home/ncvs/ports/math/qtiplot-doc/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- math/qtiplot-doc/distinfo	5 Apr 2009 18:47:44 -0000	1.11
+++ math/qtiplot-doc/distinfo	3 Aug 2009 06:18:09 -0000
@@ -1,3 +1,3 @@
-MD5 (qtiplot-0.9.7.6.tar.bz2) = a9b9b2fbd3044022a7afa3a89ec5c47d
-SHA256 (qtiplot-0.9.7.6.tar.bz2) = 1248b545103fa45e86c13c5e91d1c565c3d76b71e35582731fb39b538f0c6903
-SIZE (qtiplot-0.9.7.6.tar.bz2) = 6905629
+MD5 (qtiplot-0.9.7.8.tar.bz2) = 15a62821f6f69086e685c271fb510bd4
+SHA256 (qtiplot-0.9.7.8.tar.bz2) = 93dc338ef2be25a84e6edb2c8c4873711cad05a133dadd20c868faaf556990a3
+SIZE (qtiplot-0.9.7.8.tar.bz2) = 7302830
Index: math/qtiplot-doc/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/math/qtiplot-doc/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- math/qtiplot-doc/pkg-plist	5 Apr 2009 18:47:44 -0000	1.8
+++ math/qtiplot-doc/pkg-plist	3 Aug 2009 06:46:21 -0000
@@ -1,12 +1,12 @@
-%%DATADIR%%/a6110.html
+%%DATADIR%%/a6226.html
 %%DATADIR%%/c2440.html
 %%DATADIR%%/c352.html
 %%DATADIR%%/c3656.html
-%%DATADIR%%/c4640.html
-%%DATADIR%%/c4911.html
+%%DATADIR%%/c4663.html
+%%DATADIR%%/c4934.html
 %%DATADIR%%/c55.html
-%%DATADIR%%/c6025.html
-%%DATADIR%%/c6198.html
+%%DATADIR%%/c6141.html
+%%DATADIR%%/c6314.html
 %%DATADIR%%/c671.html
 %%DATADIR%%/common/fond-titre-chapitre.png
 %%DATADIR%%/common/fond-titre-chapitre.xcf
@@ -236,6 +236,9 @@
 %%DATADIR%%/pics/contour-curve-dialog-4.png
 %%DATADIR%%/pics/contour-curve-dialog-5.png
 %%DATADIR%%/pics/contour-curve-dialog-6.png
+%%DATADIR%%/pics/contour-curve-dialog-7.png
+%%DATADIR%%/pics/contour-curve-dialog-8.png
+%%DATADIR%%/pics/contour-curve-dialog-9.png
 %%DATADIR%%/pics/custom-curves-1.png
 %%DATADIR%%/pics/custom-curves-2.png
 %%DATADIR%%/pics/custom-curves-3.png
@@ -443,38 +446,38 @@
 %%DATADIR%%/x3804.html
 %%DATADIR%%/x3839.html
 %%DATADIR%%/x3859.html
-%%DATADIR%%/x3901.html
-%%DATADIR%%/x4010.html
-%%DATADIR%%/x4033.html
-%%DATADIR%%/x4050.html
-%%DATADIR%%/x4074.html
-%%DATADIR%%/x4099.html
-%%DATADIR%%/x4112.html
-%%DATADIR%%/x4212.html
-%%DATADIR%%/x4245.html
-%%DATADIR%%/x4262.html
-%%DATADIR%%/x4270.html
-%%DATADIR%%/x4394.html
-%%DATADIR%%/x4406.html
-%%DATADIR%%/x4436.html
-%%DATADIR%%/x4451.html
-%%DATADIR%%/x4479.html
-%%DATADIR%%/x4489.html
-%%DATADIR%%/x4512.html
-%%DATADIR%%/x4552.html
-%%DATADIR%%/x4670.html
-%%DATADIR%%/x4705.html
-%%DATADIR%%/x4708.html
-%%DATADIR%%/x4711.html
-%%DATADIR%%/x4725.html
-%%DATADIR%%/x4820.html
-%%DATADIR%%/x4831.html
-%%DATADIR%%/x4896.html
-%%DATADIR%%/x5129.html
+%%DATADIR%%/x3923.html
+%%DATADIR%%/x4032.html
+%%DATADIR%%/x4055.html
+%%DATADIR%%/x4072.html
+%%DATADIR%%/x4096.html
+%%DATADIR%%/x4121.html
+%%DATADIR%%/x4134.html
+%%DATADIR%%/x4234.html
+%%DATADIR%%/x4267.html
+%%DATADIR%%/x4284.html
+%%DATADIR%%/x4292.html
+%%DATADIR%%/x4416.html
+%%DATADIR%%/x4428.html
+%%DATADIR%%/x4458.html
+%%DATADIR%%/x4473.html
+%%DATADIR%%/x4501.html
+%%DATADIR%%/x4511.html
+%%DATADIR%%/x4534.html
+%%DATADIR%%/x4574.html
+%%DATADIR%%/x4693.html
+%%DATADIR%%/x4728.html
+%%DATADIR%%/x4731.html
+%%DATADIR%%/x4734.html
+%%DATADIR%%/x4748.html
+%%DATADIR%%/x4843.html
+%%DATADIR%%/x4854.html
+%%DATADIR%%/x4919.html
 %%DATADIR%%/x513.html
+%%DATADIR%%/x5152.html
 %%DATADIR%%/x601.html
-%%DATADIR%%/x6116.html
-%%DATADIR%%/x6130.html
+%%DATADIR%%/x6232.html
+%%DATADIR%%/x6246.html
 %%DATADIR%%/x82.html
 %%DATADIR%%/x909.html
 %%DATADIR%%/x959.html
--- qtiplot.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list