Attachment #85901 for bug #122229

View | Details | Raw Unified | Return to bug 122229
Collapse All | Expand All




#

PORTNAME=	qtiplot
DISTVERSION=	0.9.4
CATEGORIES=	math science
MASTER_SITES=	http://soft.proindependent.com/src/


LIB_DEPENDS=	gsl.10:${PORTSDIR}/math/gsl \
		muparser.0:${PORTSDIR}/math/muparser \
		qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4 \
		qwt.5:${PORTSDIR}/x11-toolkits/qwt5

USE_BZIP2=	yes
USE_GMAKE=	yes

PLIST_SUB+=	NLS="@comment "
.endif

QPRO_DIRS=	fitPlugins/fitRational0 \
		fitPlugins/fitRational1 \
		qtiplot

post-patch:
.if defined(WITH_PYTHON)
	@${REINPLACE_CMD} -e \

		${WRKSRC}/${PORTNAME}/qtiplot.pro
.endif
	@${REINPLACE_CMD} -e \
		's|/usr/lib/qtiplot/plugins|${DATADIR}/fitPlugins|' \
		 s|/usr/lib/qtiplot/plugins|${DATADIR}/fitPlugins|' \
		${WRKSRC}/qtiplot/src/ApplicationWindow.cpp
.if defined(WITH_DEBUG)
	@${REINPLACE_CMD} -e \

	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} -recursive)

post-configure:
	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
		's|^CC .*|CC=${CC}|; s|^CXX .*|CXX=${CXX}|; s|^LINK .*|LINK=${CXX}|'
		's|^CC .*|CC=${CC}|; \
		 s|^CXX .*|CXX=${CXX}|; \
		 s|^LINK .*|LINK=${CXX}|' \
		${WRKSRC}/${d}/Makefile
.endfor
	@${REINPLACE_CMD} -e 's|^\(INCPATH.*=\)|\1-I../3rdparty/liborigin|' ${WRKSRC}/qtiplot/Makefile

do-install:

Lines 1-3 Link Here

(-)/home/makc/porting/ports/math/qtiplot/distinfo (-3 / +3 lines)
1	MD5 (qtiplot-0.9.2.tar.bz2) = 943c50f7fb28e1b11ed0188ec918cf4c	1	MD5 (qtiplot-0.9.4.tar.bz2) = 25d32035c69095a2951967797c010c38
2	SHA256 (qtiplot-0.9.2.tar.bz2) = 051a55e3e120ad53b2463a3a9295d22f9d36d1146468c5ebd869a5f180c145fd	2	SHA256 (qtiplot-0.9.4.tar.bz2) = 7b4f9b734e8b258459a2a8d85beeda0c964340891d64822aa944a1fb93c60da1
3	SIZE (qtiplot-0.9.2.tar.bz2) = 897629	3	SIZE (qtiplot-0.9.4.tar.bz2) = 7025345

Line 0 Link Here

(-)/home/makc/porting/ports/math/qtiplot/files/patch-qtiplot.pro (+9 lines)
	1	--- ./qtiplot.pro.orig 2008-03-29 10:43:50.000000000 +0300
	2	+++ ./qtiplot.pro 2008-03-29 10:43:50.000000000 +0300
	3	@@ -2,6 +2,4 @@
	4
	5	SUBDIRS = fitPlugins/fitRational0\
	6	fitPlugins/fitRational1\
	7	- 3rdparty/qwt\
	8	- manual\
	9	qtiplot




--- ./qtiplot/qtiplot.pro.orig	2008-03-29 10:43:50.000000000 +0300
+++ ./qtiplot/qtiplot.pro	2008-03-29 10:46:00.000000000 +0300
@@ -45,12 +45,8 @@
 #!!! Warning: You must modify these paths according to your computer settings
 #############################################################################
 

 
 ##################### 3rd PARTY LIBRARIES SECTION ###########################
 #!!! Warning: You must modify these paths according to your computer settings
@@ -59,17 +55,13 @@
 ##################### Linux (Mac OS X) ######################################
 
 # statically link against libraries in 3rdparty

 
 ##################### Windows ###############################################
 
@@ -124,8 +116,8 @@
                   translations/qtiplot_ja.ts \
                   translations/qtiplot_sv.ts
 
-system(lupdate -verbose qtiplot.pro)
-system(lrelease -verbose qtiplot.pro)
+#system(lupdate -verbose qtiplot.pro)
+#system(lrelease -verbose qtiplot.pro)
 
 translations.files += translations/qtiplot_de.qm \
                   translations/qtiplot_es.qm \
@@ -435,6 +427,7 @@
 ##################### Default: muParser v1.28 #################
 
 contains(SCRIPTING_LANGS, muParser) {

   DEFINES += SCRIPTING_MUPARSER
 
   HEADERS += src/muParserScript.h \
@@ -461,11 +454,12 @@
   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
+    INCLUDEPATH += $$(PYTHON_INCLUDEDIR)
+    LIBS        += -l$$(PYTHON_VERSION)
     LIBS        += -lm
     system(mkdir -p $${SIP_DIR})
-    system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)
+    SIPCMD = $$(PYTHON_VERSION) python-sipcmd.py

Return to bug 122229

Lines 6-12 Link Here

(-)/home/makc/porting/ports/math/qtiplot/Makefile (-15 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= qtiplot	8	PORTNAME= qtiplot
9	DISTVERSION= 0.9.2	9	DISTVERSION= 0.9.4
10	CATEGORIES= math science	10	CATEGORIES= math science
11	MASTER_SITES= http://soft.proindependent.com/src/	11	MASTER_SITES= http://soft.proindependent.com/src/
12		12
Lines 16-22 Link Here
16	LIB_DEPENDS= gsl.10:${PORTSDIR}/math/gsl \	16	LIB_DEPENDS= gsl.10:${PORTSDIR}/math/gsl \
17	muparser.0:${PORTSDIR}/math/muparser \	17	muparser.0:${PORTSDIR}/math/muparser \
18	qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4 \	18	qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4 \
19	qwt.5:${PORTSDIR}/x11-toolkits/qwt-devel	19	qwt.5:${PORTSDIR}/x11-toolkits/qwt5
20		20
21	USE_BZIP2= yes	21	USE_BZIP2= yes
22	USE_GMAKE= yes	22	USE_GMAKE= yes
Lines 62-71 Link Here
62	PLIST_SUB+= NLS="@comment "	62	PLIST_SUB+= NLS="@comment "
63	.endif	63	.endif
64		64
65	QPRO_DIRS= fitPlugins/fitRational0 \
66	fitPlugins/fitRational1 \
67	qtiplot
68
69	post-patch:	65	post-patch:
70	.if defined(WITH_PYTHON)	66	.if defined(WITH_PYTHON)
71	@${REINPLACE_CMD} -e \	67	@${REINPLACE_CMD} -e \
Lines 83-90 Link Here
83	${WRKSRC}/${PORTNAME}/qtiplot.pro	79	${WRKSRC}/${PORTNAME}/qtiplot.pro
84	.endif	80	.endif
85	@${REINPLACE_CMD} -e \	81	@${REINPLACE_CMD} -e \
86	's\|/usr/share/doc/qtiplot/manual-%1\|${DATADIR}/manual\|; \	82	's\|/usr/lib/qtiplot/plugins\|${DATADIR}/fitPlugins\|' \
87	s\|/usr/lib/qtiplot/plugins\|${DATADIR}/fitPlugins\|' \
88	${WRKSRC}/qtiplot/src/ApplicationWindow.cpp	83	${WRKSRC}/qtiplot/src/ApplicationWindow.cpp
89	.if defined(WITH_DEBUG)	84	.if defined(WITH_DEBUG)
90	@${REINPLACE_CMD} -e \	85	@${REINPLACE_CMD} -e \
Lines 99-111 Link Here
99	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} -recursive)	94	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} -recursive)
100		95
101	post-configure:	96	post-configure:
102	.for d in ${QPRO_DIRS}	97	@${FIND} ${WRKSRC} -name Makefile \| ${XARGS} ${REINPLACE_CMD} -e \
103	@${REINPLACE_CMD} -e \	98	's\|^CC .\|CC=${CC}\|; s\|^CXX .\|CXX=${CXX}\|; s\|^LINK .*\|LINK=${CXX}\|'
104	's\|^CC .*\|CC=${CC}\|; \
105	s\|^CXX .*\|CXX=${CXX}\|; \
106	s\|^LINK .*\|LINK=${CXX}\|' \
107	${WRKSRC}/${d}/Makefile
108	.endfor
109	@${REINPLACE_CMD} -e 's\|^\(INCPATH.*=\)\|\1-I../3rdparty/liborigin\|' ${WRKSRC}/qtiplot/Makefile	99	@${REINPLACE_CMD} -e 's\|^\(INCPATH.*=\)\|\1-I../3rdparty/liborigin\|' ${WRKSRC}/qtiplot/Makefile
110		100
111	do-install:	101	do-install:

Lines 1-6 Link Here

(-)/home/makc/porting/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro (-8 / +19 lines)
1	--- ./qtiplot/qtiplot.pro.orig 2007-11-14 20:19:55.000000000 +0300	1	--- ./qtiplot/qtiplot.pro.orig 2008-03-29 10:43:50.000000000 +0300
2	+++ ./qtiplot/qtiplot.pro 2007-11-14 20:19:55.000000000 +0300	2	+++ ./qtiplot/qtiplot.pro 2008-03-29 10:46:00.000000000 +0300
3	@@ -34,12 +34,8 @@	3	@@ -45,12 +45,8 @@
4	#!!! Warning: You must modify these paths according to your computer settings	4	#!!! Warning: You must modify these paths according to your computer settings
5	#############################################################################	5	#############################################################################
6		6
Lines 15-21 Link Here
15		15
16	##################### 3rd PARTY LIBRARIES SECTION ###########################	16	##################### 3rd PARTY LIBRARIES SECTION ###########################
17	#!!! Warning: You must modify these paths according to your computer settings	17	#!!! Warning: You must modify these paths according to your computer settings
18	@@ -48,17 +44,13 @@	18	@@ -59,17 +55,13 @@
19	##################### Linux (Mac OS X) ######################################	19	##################### Linux (Mac OS X) ######################################
20		20
21	# statically link against libraries in 3rdparty	21	# statically link against libraries in 3rdparty
Lines 36-42 Link Here
36		36
37	##################### Windows ###############################################	37	##################### Windows ###############################################
38		38
39	@@ -400,6 +392,7 @@	39	@@ -124,8 +116,8 @@
		40	translations/qtiplot_ja.ts \
		41	translations/qtiplot_sv.ts
		42
		43	-system(lupdate -verbose qtiplot.pro)
		44	-system(lrelease -verbose qtiplot.pro)
		45	+#system(lupdate -verbose qtiplot.pro)
		46	+#system(lrelease -verbose qtiplot.pro)
		47
		48	translations.files += translations/qtiplot_de.qm \
		49	translations/qtiplot_es.qm \
		50	@@ -435,6 +427,7 @@
40	##################### Default: muParser v1.28 #################	51	##################### Default: muParser v1.28 #################
41		52
42	contains(SCRIPTING_LANGS, muParser) {	53	contains(SCRIPTING_LANGS, muParser) {
Lines 44-58 Link Here
44	DEFINES += SCRIPTING_MUPARSER	55	DEFINES += SCRIPTING_MUPARSER
45		56
46	HEADERS += src/muParserScript.h \	57	HEADERS += src/muParserScript.h \
47	@@ -417,11 +410,11 @@	58	@@ -461,11 +454,12 @@
48	SOURCES += src/PythonScript.cpp src/PythonScripting.cpp	59	SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
49		60
50	unix {	61	unix {
51	- INCLUDEPATH += $$system(python python-includepath.py)	62	- INCLUDEPATH += $$system(python python-includepath.py)
52	- LIBS += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")	63	- LIBS += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
53	- LIBS += -lm
54	+ INCLUDEPATH += $$(PYTHON_INCLUDEDIR)	64	+ INCLUDEPATH += $$(PYTHON_INCLUDEDIR)
55	+ LIBS += -lm -l$$(PYTHON_VERSION)	65	+ LIBS += -l$$(PYTHON_VERSION)
		66	LIBS += -lm
56	system(mkdir -p $${SIP_DIR})	67	system(mkdir -p $${SIP_DIR})
57	- system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)	68	- system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)
58	+ SIPCMD = $$(PYTHON_VERSION) python-sipcmd.py	69	+ SIPCMD = $$(PYTHON_VERSION) python-sipcmd.py