Bug 103050 - maintainer update: math/qtiplot
Summary: maintainer update: math/qtiplot
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Ion-Mihai "IOnut" Tetcu
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-09-08 22:30 UTC by Max Brazhnikov
Modified: 2006-09-10 09:05 UTC (History)
0 users

See Also:


Attachments
file.diff (4.59 KB, patch)
2006-09-08 22:30 UTC, Max Brazhnikov
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Max Brazhnikov freebsd_committer freebsd_triage 2006-09-08 22:30:22 UTC
Update qtiplot from 0.8.6.2 to 0.8.7.2.
Added support for evaluating mathematical expressions and executing scripts using the Python.
Added translation for French, German, Russian, Spanish, Swedish.

devel/py-sip should be updated firstly:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/103040
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2006-09-08 22:30:31 UTC
Class Changed
From-To: maintainer-update->change-request

Fix category (submitter is not maintainer)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2006-09-08 22:30:43 UTC
Responsible Changed
From-To: freebsd-ports-bugs->makc

Submitter has GNATS access
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2006-09-08 22:30:52 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback
Comment 4 Max Brazhnikov 2006-09-08 23:45:07 UTC
Edwin,
I'm sorry, my e-mail is makc@issp.ac.ru. Not makc@freebsd.org.


Please, use this diff. I've added pkg-message to port.

diff -ruN --exclude=CVS /usr/ports/math/qtiplot/Makefile /home/makc/porting/ports/math/qtiplot/Makefile
--- /usr/ports/math/qtiplot/Makefile	Tue Sep  5 11:25:59 2006
+++ /home/makc/porting/ports/math/qtiplot/Makefile	Sat Sep  9 02:32:25 2006
@@ -6,24 +6,24 @@
 #
 
 PORTNAME=	qtiplot
-PORTVERSION=	0.8.6.2
+PORTVERSION=	0.8.7.2
 CATEGORIES=	math science
 MASTER_SITES=	http://soft.proindependent.com/src/
-DISTNAME=	${PORTNAME}-0.8.6-2
+DISTNAME=	${PORTNAME}-0.8.7-2
 
 MAINTAINER=	makc@issp.ac.ru
 COMMENT=	An Origin clone for data analysis and scientific plotting
 
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
+BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake \
+		sip:${PORTSDIR}/devel/py-sip \
+		pylupdate:${PORTSDIR}/x11-toolkits/py-qt
 LIB_DEPENDS=	gsl.9:${PORTSDIR}/math/gsl \
 		origin.0:${PORTSDIR}/math/liborigin \
 		qwtplot3d:${PORTSDIR}/math/qwtplot3d
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-
-PLIST_FILES=	bin/qtiplot
-#PORTDOCS=	faq.html help.html
+USE_PYTHON=	2.4
 
 USE_QT_VER=	3
 MAKE_ENV=	QTDIR=${QT_PREFIX}
@@ -34,6 +34,13 @@
 IGNORE=		does not compile on FreeBSD 4.x
 .endif
 
+.if !defined(WITHOUT_NLS)
+QTI_LANG=	de es fr ru sv
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 QMAKE=		qmake
 QMAKESPEC=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 
@@ -49,7 +56,9 @@
 		"s:../3rdparty/liborigin/include:${LOCALBASE}/include:" \
 		-e "s:/usr/include/qwtplot3d:${X11BASE}/include:" \
 		-e "/^unix:LIBS/s:-L /usr/lib:-L${LOCALBASE}/lib:" \
-		-e "/^unix:documentation.path/s:/usr/share/doc/qtiplot:${DOCSDIR}:" \
+		-e "/^unix:documentation.path/s:/usr/share/doc/qtiplot:${DATADIR}/manual:" 
\
+		-e "s:/usr/include/python2.4:/usr/local/include/python2.4:" \
+		-e "s:/usr/share/sip:/usr/local/share/py-sip/:" \
 		${WRKSRC}/${d}/*.pro
 .endfor
 
@@ -71,12 +80,19 @@
 .endfor
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/qtiplot/qtiplot ${PREFIX}/bin
-#.if !defined(NOPORTDOCS)
-#	${MKDIR} ${DOCSDIR}
-#.for DOCFN in ${PORTDOCS}
-#	${INSTALL_MAN} ${WRKSRC}/doc/${DOCFN} ${DOCSDIR}
-#.endfor
-#.endif
+	${MKDIR} ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/qtiplot/qtiplot ${DATADIR}/qtiplot
+	${LN} -fs ${DATADIR}/qtiplot ${PREFIX}/bin/qtiplot
+	${INSTALL_DATA} ${WRKSRC}/qtiplot/qtiplotrc.py ${DATADIR}/qtiplotrc.py
+.if !defined(WITHOUT_NLS)
+.for i in ${QTI_LANG}
+	${MKDIR} ${DATADIR}/translations/
+	${INSTALL_DATA}	${WRKSRC}/qtiplot/translations/qtiplot_${i}.qm \
+	${DATADIR}/translations/
+.endfor
+.endif
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/math/qtiplot/distinfo /home/makc/porting/ports/math/qtiplot/distinfo
--- /usr/ports/math/qtiplot/distinfo	Tue Sep  5 11:25:59 2006
+++ /home/makc/porting/ports/math/qtiplot/distinfo	Fri Sep  8 15:27:13 2006
@@ -1,3 +1,3 @@
-MD5 (qtiplot-0.8.6-2.tar.bz2) = 6025c050b291671ffcfcac7949e97c4e
-SHA256 (qtiplot-0.8.6-2.tar.bz2) = 
64342a9c19ab7fff8dd1ea7e1dafe331709393a6ad892ffda8138ec07c3df657
-SIZE (qtiplot-0.8.6-2.tar.bz2) = 655993
+MD5 (qtiplot-0.8.7-2.tar.bz2) = 948cc4922eea51abb7016c6ca2d070d1
+SHA256 (qtiplot-0.8.7-2.tar.bz2) = 
70be0f8b5f137542a5d1d62c78a8a1d38f657ac69e33e483ff1546baa400ced7
+SIZE (qtiplot-0.8.7-2.tar.bz2) = 736394
diff -ruN --exclude=CVS /usr/ports/math/qtiplot/files/patch-qtiplot_src_application.cpp /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot_src_application.cpp
--- /usr/ports/math/qtiplot/files/patch-qtiplot_src_application.cpp	Thu Jan  1 
03:00:00 1970
+++ /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot_src_application.cpp	
Fri Sep  8 22:24:22 2006
@@ -0,0 +1,11 @@
+--- qtiplot/src/application.cpp.orig	Wed Sep  6 01:26:14 2006
++++ qtiplot/src/application.cpp	Fri Sep  8 22:21:43 2006
+@@ -4240,7 +4240,7 @@
+ 		workingDir = settings.readEntry("/WorkingDir", 
qApp->applicationDirPath());
+ 		templatesDir = settings.readEntry("/TemplatesDir", 
qApp->applicationDirPath());
+ 
+-		helpFilePath="/usr/share/doc/qtiplot/index.html";
++		helpFilePath=qApp->applicationDirPath()+"/manual/index.html";
+ 		#ifdef Q_OS_WIN // Windows systems
+ 			helpFilePath=qApp->applicationDirPath()+"/index.html";
+ 		#endif
diff -ruN --exclude=CVS /usr/ports/math/qtiplot/pkg-message /home/makc/porting/ports/math/qtiplot/pkg-message
--- /usr/ports/math/qtiplot/pkg-message	Thu Jan  1 03:00:00 1970
+++ /home/makc/porting/ports/math/qtiplot/pkg-message	Sat Sep  9 02:34:05 2006
@@ -0,0 +1,4 @@
+======================================================================
+To enable python scripting copy %PREFIX%/share/qtiplot/qtiplotrc.py to
+$HOME/.qtiplotrc.py
+======================================================================
diff -ruN --exclude=CVS /usr/ports/math/qtiplot/pkg-plist /home/makc/porting/ports/math/qtiplot/pkg-plist
--- /usr/ports/math/qtiplot/pkg-plist	Thu Jan  1 03:00:00 1970
+++ /home/makc/porting/ports/math/qtiplot/pkg-plist	Fri Sep  8 23:15:10 2006
@@ -0,0 +1,10 @@
+bin/qtiplot
+%%DATADIR%%/qtiplot
+%%DATADIR%%/qtiplotrc.py
+%%NLS%%%%DATADIR%%/translations/qtiplot_de.qm
+%%NLS%%%%DATADIR%%/translations/qtiplot_es.qm
+%%NLS%%%%DATADIR%%/translations/qtiplot_fr.qm
+%%NLS%%%%DATADIR%%/translations/qtiplot_ru.qm
+%%NLS%%%%DATADIR%%/translations/qtiplot_sv.qm
+%%NLS%%@dirrm %%DATADIR%%/translations
+@dirrm %%DATADIR%%
Comment 5 Edwin Groothuis freebsd_committer freebsd_triage 2006-09-09 00:40:56 UTC
Responsible Changed
From-To: makc->freebsd-ports-bugs

submitter is not @freebsd.org
Comment 6 Edwin Groothuis freebsd_committer freebsd_triage 2006-09-09 00:42:05 UTC
State Changed
From-To: feedback->open

throw back in the pool
Comment 7 Ion-Mihai "IOnut" Tetcu freebsd_committer freebsd_triage 2006-09-09 12:03:22 UTC
Responsible Changed
From-To: freebsd-ports-bugs->itetcu

I'll take it.
Comment 8 Ion-Mihai "IOnut" Tetcu freebsd_committer freebsd_triage 2006-09-09 12:53:55 UTC
State Changed
From-To: open->feedback

Doesn't patch: 
http://sce-tindy.tecnik93.com/tb-exp/index.php?action=describe_port&id=815
Comment 9 Ion-Mihai "IOnut" Tetcu freebsd_committer freebsd_triage 2006-09-10 09:05:52 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!