Attachment #87115 for bug #123678

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




#

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


USE_QT_VER=	4
QT_COMPONENTS=	gui moc_build qmake_build opengl svg qt3support network assistantclient
HAS_CONFIGURE=	yes
QMAKE_ARGS+=	-unix -recursive LOCALBASE=${LOCALBASE}
USE_DOS2UNIX=	*.pro
MAN1=		qtiplot.1


post-patch:
.if defined(WITH_PYTHON)
	@${REINPLACE_CMD} -e \
		's|loadInitFile("qtiplotrc")|loadInitFile("${DATADIR}/qtiplotrc")|' \
		${WRKSRC}/${PORTNAME}/src/PythonScripting.cpp
	@${REINPLACE_CMD} -e \
		'/^sys.path.append/s|"\."|"${DATADIR}"|' \
		${WRKSRC}/${PORTNAME}/qtiplotrc.py
	@${REINPLACE_CMD} -e \

.if !defined(WITHOUT_NLS)
	@(cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 qtiplot.pro)
.endif
	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKE_ARGS})

post-configure:
	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \

	${INSTALL_PROGRAM} ${WRKSRC}/fitPlugins/libfitRational1.so.1.0.0 \
				${DATADIR}/fitPlugins/libfitRational1.so
	${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${DATADIR}/qtiplot.png
	${INSTALL_DATA} ${WRKSRC}/qtiplot/qti_wordlist.txt ${DATADIR}
.if defined(WITH_PYTHON)
.for s in qtiplotrc.py qtiUtil.py
	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${s} ${DATADIR}/${s}

Lines 1-3 Link Here

(-)/home/makc/porting/ports/math/qtiplot/distinfo (-3 / +3 lines)
1	MD5 (qtiplot-0.9.5.tar.bz2) = 5e321e8b2fb4d9eb3f5f8703afdb84ae	1	MD5 (qtiplot-0.9.6.tar.bz2) = a0e35d674fdf76eeb86c921e26caec1a
2	SHA256 (qtiplot-0.9.5.tar.bz2) = 29f6f0b81ee02fa64db2f1024d3fafeedcf22ae498eadef04e5092371d1e3be2	2	SHA256 (qtiplot-0.9.6.tar.bz2) = 9892f48eaf08f7e9f9932156c755a37a3570f5028e1777263706cd1fb688c7c1
3	SIZE (qtiplot-0.9.5.tar.bz2) = 7047424	3	SIZE (qtiplot-0.9.6.tar.bz2) = 6431763

Lines 1-9 Link Here

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




-INCLUDEPATH       += ../3rdparty/liborigin
-INCLUDEPATH       += ../3rdparty/gsl/include
-INCLUDEPATH       += ../3rdparty/zlib123/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

-#unix:LIBS         += -lgsl -lgslcblas
+unix:LIBS         += -lqwt
+unix:LIBS         += -lgsl -lgslcblas
+unix:LIBS         += -L$$LOCALBASE/lib -lqwtplot3d-qt4 -lz
 
 ##################### 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 #################
 

Lines 1-6 Link Here

(-)/home/makc/porting/ports/math/qtiplot/pkg-plist (+1 lines)
1	bin/qtiplot	1	bin/qtiplot
2	%%DATADIR%%/fitPlugins/libfitRational0.so	2	%%DATADIR%%/fitPlugins/libfitRational0.so
3	%%DATADIR%%/fitPlugins/libfitRational1.so	3	%%DATADIR%%/fitPlugins/libfitRational1.so
		4	%%DATADIR%%/qti_wordlist.txt
4	%%DATADIR%%/qtiplot	5	%%DATADIR%%/qtiplot
5	%%DATADIR%%/qtiplot.png	6	%%DATADIR%%/qtiplot.png
6	%%PYTHON%%%%DATADIR%%/qtiUtil.py	7	%%PYTHON%%%%DATADIR%%/qtiUtil.py

Return to bug 123678

Lines 6-12 Link Here

(-)/home/makc/porting/ports/math/qtiplot/Makefile (-6 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= qtiplot	8	PORTNAME= qtiplot
9	DISTVERSION= 0.9.5	9	DISTVERSION= 0.9.6
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 23-29 Link Here
23	USE_QT_VER= 4	23	USE_QT_VER= 4
24	QT_COMPONENTS= gui moc_build qmake_build opengl svg qt3support network assistantclient	24	QT_COMPONENTS= gui moc_build qmake_build opengl svg qt3support network assistantclient
25	HAS_CONFIGURE= yes	25	HAS_CONFIGURE= yes
26	CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}"	26	QMAKE_ARGS+= -unix -recursive LOCALBASE=${LOCALBASE}
27	USE_DOS2UNIX= *.pro	27	USE_DOS2UNIX= *.pro
28	MAN1= qtiplot.1	28	MAN1= qtiplot.1
29		29
Lines 65-73 Link Here
65	post-patch:	65	post-patch:
66	.if defined(WITH_PYTHON)	66	.if defined(WITH_PYTHON)
67	@${REINPLACE_CMD} -e \	67	@${REINPLACE_CMD} -e \
68	's\|loadInitFile("qtiplotrc")\|loadInitFile("${DATADIR}/qtiplotrc")\|' \
69	${WRKSRC}/${PORTNAME}/src/PythonScripting.cpp
70	@${REINPLACE_CMD} -e \
71	'/^sys.path.append/s\|"\."\|"${DATADIR}"\|' \	68	'/^sys.path.append/s\|"\."\|"${DATADIR}"\|' \
72	${WRKSRC}/${PORTNAME}/qtiplotrc.py	69	${WRKSRC}/${PORTNAME}/qtiplotrc.py
73	@${REINPLACE_CMD} -e \	70	@${REINPLACE_CMD} -e \
Lines 91-97 Link Here
91	.if !defined(WITHOUT_NLS)	88	.if !defined(WITHOUT_NLS)
92	@(cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 qtiplot.pro)	89	@(cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 qtiplot.pro)
93	.endif	90	.endif
94	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} -recursive)	91	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKE_ARGS})
95		92
96	post-configure:	93	post-configure:
97	@${FIND} ${WRKSRC} -name Makefile \| ${XARGS} ${REINPLACE_CMD} -e \	94	@${FIND} ${WRKSRC} -name Makefile \| ${XARGS} ${REINPLACE_CMD} -e \
Lines 109-114 Link Here
109	${INSTALL_PROGRAM} ${WRKSRC}/fitPlugins/libfitRational1.so.1.0.0 \	106	${INSTALL_PROGRAM} ${WRKSRC}/fitPlugins/libfitRational1.so.1.0.0 \
110	${DATADIR}/fitPlugins/libfitRational1.so	107	${DATADIR}/fitPlugins/libfitRational1.so
111	${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${DATADIR}/qtiplot.png	108	${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${DATADIR}/qtiplot.png
		109	${INSTALL_DATA} ${WRKSRC}/qtiplot/qti_wordlist.txt ${DATADIR}
112	.if defined(WITH_PYTHON)	110	.if defined(WITH_PYTHON)
113	.for s in qtiplotrc.py qtiUtil.py	111	.for s in qtiplotrc.py qtiUtil.py
114	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${s} ${DATADIR}/${s}	112	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${s} ${DATADIR}/${s}

Lines 10-17 Link Here

(-)/home/makc/porting/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro (-14 / +3 lines)
10	-INCLUDEPATH += ../3rdparty/liborigin	10	-INCLUDEPATH += ../3rdparty/liborigin
11	-INCLUDEPATH += ../3rdparty/gsl/include	11	-INCLUDEPATH += ../3rdparty/gsl/include
12	-INCLUDEPATH += ../3rdparty/zlib123/include	12	-INCLUDEPATH += ../3rdparty/zlib123/include
13	+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwt	13	+unix:INCLUDEPATH += $$LOCALBASE/include/qwt
14	+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwtplot3d-qt4	14	+unix:INCLUDEPATH += $$LOCALBASE/include/qwtplot3d-qt4
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
Lines 32-52 Link Here
32	-#unix:LIBS += -lgsl -lgslcblas	32	-#unix:LIBS += -lgsl -lgslcblas
33	+unix:LIBS += -lqwt	33	+unix:LIBS += -lqwt
34	+unix:LIBS += -lgsl -lgslcblas	34	+unix:LIBS += -lgsl -lgslcblas
35	+unix:LIBS += -L$$(LOCALBASE)/lib -lqwtplot3d-qt4 -lz	35	+unix:LIBS += -L$$LOCALBASE/lib -lqwtplot3d-qt4 -lz
36		36
37	##################### Windows ###############################################	37	##################### Windows ###############################################
38		38
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 @@	39	@@ -435,6 +427,7 @@
51	##################### Default: muParser v1.28 #################	40	##################### Default: muParser v1.28 #################
52		41