From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 8 21:30:23 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F02E216A417 for ; Fri, 8 Sep 2006 21:30:23 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E416E43D46 for ; Fri, 8 Sep 2006 21:30:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k88LUMOO005798 for ; Fri, 8 Sep 2006 21:30:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k88LUMpO005797; Fri, 8 Sep 2006 21:30:22 GMT (envelope-from gnats) Resent-Date: Fri, 8 Sep 2006 21:30:22 GMT Resent-Message-Id: <200609082130.k88LUMpO005797@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Max Brazhnikov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F0BFA16A47C for ; Fri, 8 Sep 2006 21:24:47 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF4DA43D45 for ; Fri, 8 Sep 2006 21:24:47 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k88LOlEH025338 for ; Fri, 8 Sep 2006 21:24:47 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k88LOlM7025335; Fri, 8 Sep 2006 21:24:47 GMT (envelope-from nobody) Message-Id: <200609082124.k88LOlM7025335@www.freebsd.org> Date: Fri, 8 Sep 2006 21:24:47 GMT From: Max Brazhnikov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/103050: maintainer update: math/qtiplot X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Sep 2006 21:30:24 -0000 >Number: 103050 >Category: ports >Synopsis: maintainer update: math/qtiplot >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Sep 08 21:30:22 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Max Brazhnikov >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: FreeBSD luna.zuzino.mipt.ru 6.1-STABLE FreeBSD 6.1-STABLE #0: Mon Jun 5 18:46:21 MSD 2006 makc@luna.zuzino.mipt.ru:/usr/obj/usr/src/sys/LUNA i386 >Description: 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 >How-To-Repeat: >Fix: 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 Fri Sep 8 23:09:26 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,14 @@ 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 +57,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 +81,16 @@ .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 .include 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-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%% >Release-Note: >Audit-Trail: >Unformatted: