From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 14 17:40:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90D5A1065691 for ; Wed, 14 May 2008 17:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6EF708FC21 for ; Wed, 14 May 2008 17:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m4EHe2KF098181 for ; Wed, 14 May 2008 17:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m4EHe2O5098180; Wed, 14 May 2008 17:40:02 GMT (envelope-from gnats) Resent-Date: Wed, 14 May 2008 17:40:02 GMT Resent-Message-Id: <200805141740.m4EHe2O5098180@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 [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A53E6106567C for ; Wed, 14 May 2008 17:36:16 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 99A518FC0A for ; Wed, 14 May 2008 17:36:16 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m4EHZ7Dd008230 for ; Wed, 14 May 2008 17:35:07 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m4EHZ7l9008229; Wed, 14 May 2008 17:35:07 GMT (envelope-from nobody) Message-Id: <200805141735.m4EHZ7l9008229@www.freebsd.org> Date: Wed, 14 May 2008 17:35:07 GMT From: Max Brazhnikov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/123678: 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: Wed, 14 May 2008 17:40:02 -0000 >Number: 123678 >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: Wed May 14 17:40:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Max Brazhnikov >Release: FreeBSD 7.0-STABLE i386 >Organization: >Environment: FreeBSD luna.dio.ru 7.0-STABLE FreeBSD 7.0-STABLE #0: Thu Apr 17 12:14:46 MSD 2008 makc@luna.dio.ru:/usr/obj/usr/src/sys/LUNA i386 >Description: update qtiplot to 0.9.6. This release incompatible with x11-toolkits/qwt < 5.1.0 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN --exclude=CVS /usr/ports/math/qtiplot/Makefile /home/makc/porting/ports/math/qtiplot/Makefile --- /usr/ports/math/qtiplot/Makefile 2008-04-13 16:47:23.000000000 +0400 +++ /home/makc/porting/ports/math/qtiplot/Makefile 2008-05-14 18:53:48.000000000 +0400 @@ -6,7 +6,7 @@ # PORTNAME= qtiplot -DISTVERSION= 0.9.5 +DISTVERSION= 0.9.6 CATEGORIES= math science MASTER_SITES= http://soft.proindependent.com/src/ @@ -23,7 +23,7 @@ USE_QT_VER= 4 QT_COMPONENTS= gui moc_build qmake_build opengl svg qt3support network assistantclient HAS_CONFIGURE= yes -CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" +QMAKE_ARGS+= -unix -recursive LOCALBASE=${LOCALBASE} USE_DOS2UNIX= *.pro MAN1= qtiplot.1 @@ -65,9 +65,6 @@ 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 \ @@ -91,7 +88,7 @@ .if !defined(WITHOUT_NLS) @(cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 qtiplot.pro) .endif - @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} -recursive) + @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKE_ARGS}) post-configure: @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \ @@ -109,6 +106,7 @@ ${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} diff -ruN --exclude=CVS /usr/ports/math/qtiplot/distinfo /home/makc/porting/ports/math/qtiplot/distinfo --- /usr/ports/math/qtiplot/distinfo 2008-04-13 16:47:23.000000000 +0400 +++ /home/makc/porting/ports/math/qtiplot/distinfo 2008-05-14 18:59:12.000000000 +0400 @@ -1,3 +1,3 @@ -MD5 (qtiplot-0.9.5.tar.bz2) = 5e321e8b2fb4d9eb3f5f8703afdb84ae -SHA256 (qtiplot-0.9.5.tar.bz2) = 29f6f0b81ee02fa64db2f1024d3fafeedcf22ae498eadef04e5092371d1e3be2 -SIZE (qtiplot-0.9.5.tar.bz2) = 7047424 +MD5 (qtiplot-0.9.6.tar.bz2) = a0e35d674fdf76eeb86c921e26caec1a +SHA256 (qtiplot-0.9.6.tar.bz2) = 9892f48eaf08f7e9f9932156c755a37a3570f5028e1777263706cd1fb688c7c1 +SIZE (qtiplot-0.9.6.tar.bz2) = 6431763 diff -ruN --exclude=CVS /usr/ports/math/qtiplot/files/patch-qtiplot.pro /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot.pro --- /usr/ports/math/qtiplot/files/patch-qtiplot.pro 2008-04-02 13:08:17.000000000 +0400 +++ /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot.pro 2008-05-14 18:49:37.000000000 +0400 @@ -1,9 +1,9 @@ ---- ./qtiplot.pro.orig 2008-03-29 10:43:50.000000000 +0300 -+++ ./qtiplot.pro 2008-03-29 10:43:50.000000000 +0300 +--- ./qtiplot.pro.orig 2008-04-20 19:16:15.000000000 +0400 ++++ ./qtiplot.pro 2008-04-20 19:18:10.000000000 +0400 @@ -2,6 +2,4 @@ SUBDIRS = fitPlugins/fitRational0\ fitPlugins/fitRational1\ - 3rdparty/qwt\ -- manual\ +- manual\ qtiplot diff -ruN --exclude=CVS /usr/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro --- /usr/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro 2008-04-02 13:08:17.000000000 +0400 +++ /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro 2008-05-14 18:49:37.000000000 +0400 @@ -10,8 +10,8 @@ -INCLUDEPATH += ../3rdparty/liborigin -INCLUDEPATH += ../3rdparty/gsl/include -INCLUDEPATH += ../3rdparty/zlib123/include -+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwt -+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwtplot3d-qt4 ++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 @@ -32,21 +32,10 @@ -#unix:LIBS += -lgsl -lgslcblas +unix:LIBS += -lqwt +unix:LIBS += -lgsl -lgslcblas -+unix:LIBS += -L$$(LOCALBASE)/lib -lqwtplot3d-qt4 -lz ++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 ################# diff -ruN --exclude=CVS /usr/ports/math/qtiplot/pkg-plist /home/makc/porting/ports/math/qtiplot/pkg-plist --- /usr/ports/math/qtiplot/pkg-plist 2007-10-13 11:51:42.000000000 +0400 +++ /home/makc/porting/ports/math/qtiplot/pkg-plist 2008-05-14 18:49:37.000000000 +0400 @@ -1,6 +1,7 @@ bin/qtiplot %%DATADIR%%/fitPlugins/libfitRational0.so %%DATADIR%%/fitPlugins/libfitRational1.so +%%DATADIR%%/qti_wordlist.txt %%DATADIR%%/qtiplot %%DATADIR%%/qtiplot.png %%PYTHON%%%%DATADIR%%/qtiUtil.py >Release-Note: >Audit-Trail: >Unformatted: