From nobody@FreeBSD.org  Sat Jun  2 13:09:09 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 99FB116A468
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  2 Jun 2007 13:09:09 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id 88A1213C48A
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  2 Jun 2007 13:09:09 +0000 (UTC)
	(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 l52D99UW080489
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 2 Jun 2007 13:09:09 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l52D99g3080488;
	Sat, 2 Jun 2007 13:09:09 GMT
	(envelope-from nobody)
Message-Id: <200706021309.l52D99g3080488@www.freebsd.org>
Date: Sat, 2 Jun 2007 13:09:09 GMT
From: Max Brazhnikov<makc@issp.ac.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: maintainer update: math/qtiplot and dependencies (part 1)
X-Send-Pr-Version: www-3.0

>Number:         113251
>Category:       ports
>Synopsis:       maintainer update: math/qtiplot and dependencies (part 1)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 02 13:10:05 GMT 2007
>Closed-Date:    Fri Jun 15 09:47:01 GMT 2007
>Last-Modified:  Fri Jun 15 09:50:11 GMT 2007
>Originator:     Max Brazhnikov
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
FreeBSD luna.dio.ru 6.2-STABLE FreeBSD 6.2-STABLE #1: Sun Apr 29 09:40:21 MSD 2007     root@luna:/usr/obj/usr/src/sys/LUNA  i386
>Description:
Update QtiPlot to 0.9-rc2. Changes:
Migrate from Qt 3 to Qt 4.2.
Added support for antialiasing.
It is now possible to plot only a partial row range of a data column.
More symbols for text labels.
Improved printing and export of 2D plots to PDF, EPS and PS.
Full import of Origin 7.5 project files.
Lots of bug fixes and improvements.
-----------------------------------------
Update liborigin to 20070529. Changes:
Full support of 7.5 projects.
Support Origins's standdalone file formats: *.ogw (worksheet) and *.ogm (matrix).
-----------------------------------------
New port qwtplot3d-qt4-0.2.6 - qt4 version of qwtplot3d.
-----------------------------------------
Switch qwt-devel from qt3 to qt4.
>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	Sun May 20 00:15:16 2007
+++ /home/makc/porting/ports/math/qtiplot/Makefile	Sat Jun  2 16:13:14 2007
@@ -6,25 +6,27 @@
 #
 
 PORTNAME=	qtiplot
-PORTVERSION=	0.8.9
-PORTREVISION=	1
+#PORTVERSION=	0.9.r2
+DISTVERSION=	0.9rc2
 CATEGORIES=	math science
 MASTER_SITES=	http://soft.proindependent.com/src/
 
 MAINTAINER=	makc@issp.ac.ru
 COMMENT=	An Origin clone for data analysis and scientific plotting
 
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 LIB_DEPENDS=	gsl.9:${PORTSDIR}/math/gsl \
 		muparser.0:${PORTSDIR}/math/muparser \
 		origin.0:${PORTSDIR}/math/liborigin \
-		qwtplot3d:${PORTSDIR}/math/qwtplot3d \
+		qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4 \
 		qwt.5:${PORTSDIR}/x11-toolkits/qwt-devel
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_QT_VER=	3
-MAKE_ENV=	QTDIR=${QT_PREFIX}
+USE_QT_VER=	4
+QT_COMPONENTS=	gui moc qmake opengl qt3support network assistantclient
+HAS_CONFIGURE=	yes
+CONFIGURE_ENV+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
+USE_DOS2UNIX=	qtiplot/qtiplot.pro
 
 DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \
 		"${DATADIR}/manual/common/qtiplot_logo.png" \
@@ -36,15 +38,15 @@
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_PYTHON)
+BROKEN=	py-qt4-\* ports should be fixed first
 USE_PYTHON=	yes
 # manually include this, because USE_PYTHON is defined
 # after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.python.mk"
-BUILD_DEPENDS+=	sip:${PORTSDIR}/devel/py-sip \
-		${PYTHON_SITELIBDIR}/qt.so:${PORTSDIR}/x11-toolkits/py-qt
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/qt.so:${PORTSDIR}/x11-toolkits/py-qt
+BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
 PLIST_SUB+=	PYTHON=""
-MAKE_ENV+=	PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
+CONFIGURE_ENV+=	PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
 		PYTHON_VERSION=${PYTHON_VERSION}
 .else
 PLIST_SUB+=	PYTHON="@comment "
@@ -55,25 +57,19 @@
 .endif
 
 .if !defined(WITHOUT_NLS)
-QTI_LANG=	de es fr ru sv
+#QT_COMPONENTS+=	linguist
+BUILD_DEPENDS+=	${LOCALBASE}/bin/lupdate-qt4:${PORTSDIR}/devel/qt4-linguist
+QTI_LANG=	de es fr ja ru sv
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-QMAKE=		qmake
-QMAKESPEC=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-
 QPRO_DIRS=	. \
 		fitPlugins/fitRational0 \
 		fitPlugins/fitRational1 \
 		qtiplot
 
-pre-patch:
-	@${RM} -r ${WRKSRC}/3rdparty/muParser
-	@${RM} -r ${WRKSRC}/3rdparty/qwt
-	@${CP} ${FILESDIR}/${PORTNAME}.pro ${WRKSRC}/${PORTNAME}/${PORTNAME}.pro
-
 post-patch:
 .if defined(WITH_PYTHON)
 	@${REINPLACE_CMD} -e \
@@ -81,22 +77,13 @@
 		${WRKSRC}/${PORTNAME}/src/PythonScripting.cpp
 .else
 	@${REINPLACE_CMD} \
-		-e "s/unix:SCRIPTING_LANGS += Python//" \
+		-e "s/^SCRIPTING_LANGS += Python//" \
 		${WRKSRC}/${PORTNAME}/qtiplot.pro
 .endif
-	@${REINPLACE_CMD} -e "s:3rdparty/qwt::" ${WRKSRC}/${PORTNAME}.pro
-	@${REINPLACE_CMD} -e 's:"/usr/share/doc/qtiplot:"${DATADIR}/manual:' \
-		-e 's:QDir( "./" ).absPath():"":g' \
-		${WRKSRC}/${PORTNAME}/src/application.cpp
-	@${REINPLACE_CMD} -e 's:"../3rdparty/muParser/muParser.h":<muParser.h>:' \
-		${WRKSRC}/${PORTNAME}/src/parser.h
-	@${REINPLACE_CMD} -e 's:"../3rdparty/muParser/muParser.h":<muParser.h>:' \
-		${WRKSRC}/${PORTNAME}/src/muParserScripting.h
 
 do-configure:
 .for d in ${QPRO_DIRS}
-	@cd ${WRKSRC}/${d} && ${SETENV} ${MAKE_ENV} ${QMAKE} \
-		-spec ${QMAKESPEC} *.pro
+	(cd ${WRKSRC}/${d} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE})
 .endfor
 
 post-configure:
@@ -111,6 +98,11 @@
 		${WRKSRC}/${d}/Makefile
 .endfor
 
+do-build:
+.for d in ${QPRO_DIRS}
+	(cd ${WRKSRC}/${d}; ${SETENV} ${MAKE_ENV} ${GMAKE})
+.endfor
+
 do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/qtiplot/qtiplot ${DATADIR}/qtiplot
@@ -126,11 +118,7 @@
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/qtiplotrc.pyc ${DATADIR}/qtiplotrc.pyc
 .endif
 .if !defined(WITHOUT_NLS)
-.for i in ${QTI_LANG}
-	${MKDIR} ${DATADIR}/translations/
-	${INSTALL_DATA}	${WRKSRC}/qtiplot/translations/qtiplot_${i}.qm \
-	${DATADIR}/translations/
-.endfor
+	(cd ${WRKSRC}/qtiplot/translations/ && ${COPYTREE_SHARE} '*.qm' ${DATADIR}/translations)
 .endif
 
 .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	Sun Feb 11 14:49:16 2007
+++ /home/makc/porting/ports/math/qtiplot/distinfo	Sun May 27 21:31:12 2007
@@ -1,3 +1,3 @@
-MD5 (qtiplot-0.8.9.tar.bz2) = d4477a3d7d5a61d6f6da1af48424220f
-SHA256 (qtiplot-0.8.9.tar.bz2) = c1472192cb04a56a7b75155d2520add2e6571bc8ede40341b8720291aafea870
-SIZE (qtiplot-0.8.9.tar.bz2) = 848083
+MD5 (qtiplot-0.9rc2.tar.bz2) = e848a4e802d00b8bd972df09b26dff49
+SHA256 (qtiplot-0.9rc2.tar.bz2) = 75f422372f5ca979316d8db4685d20b1324ca229e981322faff119c4aa2b38f1
+SIZE (qtiplot-0.9rc2.tar.bz2) = 787376
diff -ruN --exclude=CVS /usr/ports/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro /home/makc/porting/ports/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro
--- /usr/ports/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro	Thu Jan  1 03:00:00 1970
+++ /home/makc/porting/ports/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro	Sat Jun  2 15:35:27 2007
@@ -0,0 +1,14 @@
+--- ./fitPlugins/fitRational0/fitRational0.pro.orig	Thu Apr 19 15:36:12 2007
++++ ./fitPlugins/fitRational0/fitRational0.pro	Sat Jun  2 15:33:23 2007
+@@ -11,9 +11,8 @@
+ 
+ DESTDIR           = ../
+  
+-INCLUDEPATH += ../../3rdparty/gsl
+-LIBS        += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
++unix:INCLUDEPATH += $$(LOCALBASE)/include
++unix:LIBS         += -lgsl -lgslcblas
+ 
+ #target.path=/usr/lib$${libsuff}
+ #INSTALLS += target
diff -ruN --exclude=CVS /usr/ports/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro /home/makc/porting/ports/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro
--- /usr/ports/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro	Thu Jan  1 03:00:00 1970
+++ /home/makc/porting/ports/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro	Sat Jun  2 15:35:27 2007
@@ -0,0 +1,14 @@
+--- ./fitPlugins/fitRational1/fitRational1.pro.orig	Thu Apr 19 15:36:12 2007
++++ ./fitPlugins/fitRational1/fitRational1.pro	Sat Jun  2 15:33:23 2007
+@@ -11,9 +11,8 @@
+ 
+ DESTDIR           = ../
+ 
+-INCLUDEPATH += ../../3rdparty/gsl
+-LIBS        += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
++unix:INCLUDEPATH += $$(LOCALBASE)/include
++unix:LIBS         += -lgsl -lgslcblas
+ 
+ target.path=/usr/lib$${libsuff}
+ INSTALLS += target
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	Thu Jan  1 03:00:00 1970
+++ /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro	Sat Jun  2 15:35:27 2007
@@ -0,0 +1,148 @@
+--- ./qtiplot/qtiplot.pro.orig	Sat Jun  2 15:33:23 2007
++++ ./qtiplot/qtiplot.pro	Sat Jun  2 15:35:21 2007
+@@ -17,24 +17,17 @@
+ 
+ # what to install and where
+ INSTALLS        += target
+-INSTALLS        += documentation
+-unix: target.path = /usr/bin
++#INSTALLS        += documentation
++unix: target.path = $$(PREFIX)
+ unix: documentation.path = /usr/share/doc/qtiplot
+ 
+ ##################### 3rd PARTY HEADER FILES SECTION ########################
+ #!!! Warning: You must modify these paths according to your computer settings
+ #############################################################################
+ 
+-INCLUDEPATH       += ../3rdparty/muParser
+-
+-INCLUDEPATH       += ../3rdparty/qwtplot3d/include
+-INCLUDEPATH       += ../3rdparty/qwt/src
+-#INCLUDEPATH       += /usr/include/qwtplot3d
+-#INCLUDEPATH       += /usr/include/qwt5
+-
+-INCLUDEPATH       += ../3rdparty/liborigin
+-INCLUDEPATH       += ../3rdparty/gsl/include
+-INCLUDEPATH       += ../3rdparty/zlib123/include
++unix:INCLUDEPATH += $$(LOCALBASE)/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
+@@ -47,18 +40,18 @@
+ unix:LIBS         += -L /usr/lib$${libsuff}
+ 
+ # statically link against Qwt(3D) in 3rdparty
+-unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+-unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
++unix:LIBS         += -L$$(LOCALBASE)/lib -lqwt -lqwtplot3d-qt4 -lorigin
++unix:LIBS         += -lz -lmuparser
+ # dynamically link against Qwt(3D) installed system-wide
+ # WARNING: make sure they are compiled against Qt4
+ #unix:LIBS         += -lqwtplot3d
+ #unix:LIBS         += -lqwt
+ 
+ # statically link against GSL in 3rdparty
+-unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a
+-unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
++#unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a
++#unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
+ #dynamically link against GSL installed system-wide
+-#unix:LIBS         += -lgsl -lgslcblas
++unix:LIBS         += -lgsl -lgslcblas
+ 
+ ##################### Windows ###############################################
+ 
+@@ -110,8 +103,8 @@
+                   translations/qtiplot_ja.ts \
+                   translations/qtiplot_sv.ts
+ 
+-#system(lupdate -verbose qtiplot.pro)
+-#system(lrelease -verbose qtiplot.pro)
++system($$(LOCALBASE)/bin/lupdate-qt4 -verbose qtiplot.pro)
++system($$(LOCALBASE)/bin/lrelease-qt4 -verbose qtiplot.pro)
+ 
+ ###################### DOCUMENTATION ########################################
+ 
+@@ -350,8 +343,8 @@
+ ################# Origin Import (liborigin) ###################
+ ###############################################################
+ 
+-HEADERS += ../3rdparty/liborigin/OPJFile.h
+-SOURCES += ../3rdparty/liborigin/OPJFile.cpp
++#HEADERS += ../3rdparty/liborigin/OPJFile.h
++#SOURCES += ../3rdparty/liborigin/OPJFile.cpp
+ 
+ ###############################################################
+ ##################### SCRIPTING LANGUAGES SECTION #############
+@@ -361,30 +354,32 @@
+ 
+ contains(SCRIPTING_LANGS, muParser) {
+   DEFINES += SCRIPTING_MUPARSER
+-
++  
++  unix:LIBS +=	-lmuparser
++  
+   HEADERS += src/muParserScript.h \
+              src/muParserScripting.h \
+-             ../3rdparty/muParser/muParser.h \
+-             ../3rdparty/muParser/muParserBase.h \
+-             ../3rdparty/muParser/muParserInt.h \
+-             ../3rdparty/muParser/muParserError.h \
+-             ../3rdparty/muParser/muParserStack.h \
+-             ../3rdparty/muParser/muParserToken.h \
+-             ../3rdparty/muParser/muParserBytecode.h \
+-             ../3rdparty/muParser/muParserCallback.h \
+-             ../3rdparty/muParser/muParserTokenReader.h \
+-             ../3rdparty/muParser/muParserFixes.h \
+-             ../3rdparty/muParser/muParserDef.h \
++#              ../3rdparty/muParser/muParser.h \
++#              ../3rdparty/muParser/muParserBase.h \
++#              ../3rdparty/muParser/muParserInt.h \
++#              ../3rdparty/muParser/muParserError.h \
++#              ../3rdparty/muParser/muParserStack.h \
++#              ../3rdparty/muParser/muParserToken.h \
++#              ../3rdparty/muParser/muParserBytecode.h \
++#              ../3rdparty/muParser/muParserCallback.h \
++#              ../3rdparty/muParser/muParserTokenReader.h \
++#              ../3rdparty/muParser/muParserFixes.h \
++#              ../3rdparty/muParser/muParserDef.h \
+ 
+   SOURCES += src/muParserScript.cpp \
+              src/muParserScripting.cpp \
+-             ../3rdparty/muParser/muParser.cpp \
+-             ../3rdparty/muParser/muParserBase.cpp \
+-             ../3rdparty/muParser/muParserInt.cpp \
+-             ../3rdparty/muParser/muParserBytecode.cpp \
+-             ../3rdparty/muParser/muParserCallback.cpp \
+-             ../3rdparty/muParser/muParserTokenReader.cpp \
+-             ../3rdparty/muParser/muParserError.cpp \
++#              ../3rdparty/muParser/muParser.cpp \
++#              ../3rdparty/muParser/muParserBase.cpp \
++#              ../3rdparty/muParser/muParserInt.cpp \
++#              ../3rdparty/muParser/muParserBytecode.cpp \
++#              ../3rdparty/muParser/muParserCallback.cpp \
++#              ../3rdparty/muParser/muParserTokenReader.cpp \
++#              ../3rdparty/muParser/muParserError.cpp \
+ 
+ }
+ 
+@@ -396,12 +391,11 @@
+   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
+-    system(mkdir -p $${SIP_DIR})
+-    system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)
+-  }
++	INCLUDEPATH += $$(PYTHON_INCLUDEDIR)
++	LIBS +=	-lm -l$$(PYTHON_VERSION)
++	system(mkdir -p $${SIP_DIR})
++	system($$(PYTHON_VERSION) -c $${SIP_DIR} src/qti.sip)
++	}
+ 
+   win32 {
+     INCLUDEPATH += $$system(call python-includepath.py)
diff -ruN --exclude=CVS /usr/ports/math/qtiplot/files/qtiplot.pro /home/makc/porting/ports/math/qtiplot/files/qtiplot.pro
--- /usr/ports/math/qtiplot/files/qtiplot.pro	Sun Feb 11 14:50:19 2007
+++ /home/makc/porting/ports/math/qtiplot/files/qtiplot.pro	Thu Jan  1 03:00:00 1970
@@ -1,288 +0,0 @@
-QMAKE_PROJECT_DEPTH = 0
-
-TARGET		 = qtiplot
-TEMPLATE	 = app
-CONFIG		+= qt warn_on exceptions opengl
-CONFIG		+= thread
-CONFIG		+= release
-
-MOC_DIR		 = ../tmp/qtiplot
-OBJECTS_DIR	 = ../tmp/qtiplot
-DESTDIR		 = ./
-DEFINES		+= QT_PLUGIN
-
-unix:INCLUDEPATH += $$(LOCALBASE)/include/qwt
-unix:INCLUDEPATH += $$(LOCALBASE)/include
-unix:INCLUDEPATH += $$(X11BASE)/include
-
-unix:LIBS         +=  $$(QTDIR)/lib/libqassistantclient.a
-unix:LIBS         += -L$$(LOCALBASE)/lib -lqwt -lgsl -lgslcblas -lorigin
-unix:LIBS         += -L$$(X11BASE)/lib -lqwtplot3d
-unix:LIBS         += -lz
-
-TRANSLATIONS      = translations/qtiplot_de.ts \
-			        translations/qtiplot_es.ts \
-			        translations/qtiplot_fr.ts \
-			        translations/qtiplot_ru.ts \
-			        translations/qtiplot_sv.ts 
-
-system($$(X11BASE)/bin/lupdate -verbose qtiplot.pro)
-system($$(X11BASE)/bin/lrelease -verbose qtiplot.pro)
-
-###################### HEADERS ##############################################
-HEADERS  += src/application.h \
-     src/graph.h \
-     src/graph3D.h \
-     src/worksheet.h \
-     src/curvesDialog.h \
-     src/valuesDialog.h \
-     src/plotDialog.h \
-     src/plot3DDialog.h \
-     src/plotWizard.h \
-     src/exportDialog.h \
-     src/importDialog.h \
-     src/axesDialog.h \
-     src/pieDialog.h \
-     src/polynomFitDialog.h \
-     src/expDecayDialog.h \
-     src/functionDialog.h \
-     src/fitDialog.h \
-     src/surfaceDialog.h \
-     src/tableDialog.h \
-     src/textDialog.h \
-     src/lineDlg.h \
-     src/scalePicker.h \
-     src/canvaspicker.h \
-     src/ErrorBar.h \
-     src/pie.h \
-     src/errDlg.h \
-     src/LegendMarker.h \
-     src/LineMarker.h\
-     src/ImageMarker.h\
-     src/imageDialog.h \
-     src/fit.h \
-     src/nrutil.h\
-     src/pixmaps.h\
-     src/multilayer.h\
-     src/layerDialog.h \
-     src/intDialog.h \
-     src/sortDialog.h\
-         src/bars.h \
-         src/cones.h \
-         src/configDialog.h \
-         src/BarCurve.h \
-         src/BoxCurve.h \
-         src/Histogram.h \
-         src/VectorCurve.h \
-     src/scales.h \
-         src/imageExportDialog.h \
-         src/matrix.h \
-         src/matrixDialog.h \
-         src/matrixSizeDialog.h \
-         src/matrixValuesDialog.h \
-     src/analysisDialog.h \
-         src/parser.h \
-         src/colorBox.h \
-         src/symbolBox.h \
-         src/patternBox.h \
-         src/importOPJ.h\
-         src/symbolDialog.h \
-         src/plot.h \
-         src/colorButton.h \
-         src/associationsDialog.h \
-         src/renameWindowDialog.h \
-         src/widget.h \
-         src/interpolationDialog.h\
-         src/fileDialogs.h\
-         src/epsExportDialog.h\
-         src/smoothCurveDialog.h\
-         src/filterDialog.h\
-         src/fftDialog.h\
-         src/note.h\
-         src/folder.h\
-         src/findDialog.h\
-         src/Scripting.h\
-         src/scriptedit.h\
-         src/FunctionCurve.h\
-         src/Fitter.h\
-         src/customEvents.h\
-         src/ScriptingLangDialog.h\
-         src/ScriptWindow.h\
-         src/TableStatistics.h\
-         src/Spectrogram.h\
-         src/ColorMapEditor.h
- 
-###################### SOURCES  ##############################################  
-  
-SOURCES  += src/application.cpp \
-     src/graph.cpp \
-     src/analysis.cpp \
-     src/graph3D.cpp \
-     src/worksheet.cpp \
-     src/valuesDialog.cpp \
-     src/curvesDialog.cpp \
-     src/plotDialog.cpp \
-     src/plot3DDialog.cpp \
-     src/plotWizard.cpp \
-     src/exportDialog.cpp \
-     src/importDialog.cpp \
-     src/axesDialog.cpp \
-     src/pieDialog.cpp \
-     src/polynomFitDialog.cpp \
-     src/tableDialog.cpp \
-     src/textDialog.cpp \
-     src/scalePicker.cpp \
-     src/canvaspicker.cpp \
-     src/expDecayDialog.cpp \
-     src/functionDialog.cpp \
-     src/fitDialog.cpp \
-     src/surfaceDialog.cpp \
-     src/lineDlg.cpp \
-     src/ErrorBar.cpp \
-     src/pie.cpp \
-     src/errDlg.cpp \
-     src/LegendMarker.cpp \
-     src/LineMarker.cpp \
-     src/ImageMarker.cpp\
-     src/imageDialog.cpp \
-     src/multilayer.cpp\
-     src/layerDialog.cpp \
-     src/intDialog.cpp \
-     src/sortDialog.cpp\
-         src/bars.cpp \
-         src/cones.cpp \
-     src/analysisDialog.cpp \
-         src/configDialog.cpp \
-         src/BarCurve.cpp \
-         src/BoxCurve.cpp \
-         src/Histogram.cpp \
-         src/VectorCurve.cpp \
-         src/imageExportDialog.cpp \
-         src/matrix.cpp \
-         src/matrixDialog.cpp \
-         src/matrixSizeDialog.cpp \
-         src/matrixValuesDialog.cpp \
-         src/parser.cpp\
-         src/colorBox.cpp \
-         src/symbolBox.cpp \
-         src/patternBox.cpp \
-         src/importOPJ.cpp\
-         src/main.cpp \
-         src/symbolDialog.cpp \
-         src/plot.cpp \
-         src/colorButton.cpp \
-         src/associationsDialog.cpp \
-         src/renameWindowDialog.cpp \
-         src/widget.cpp\
-         src/interpolationDialog.cpp\
-         src/epsExportDialog.cpp\
-         src/nrutil.cpp\
-     src/fit.cpp\
-         src/smoothCurveDialog.cpp\
-         src/filterDialog.cpp\
-         src/fftDialog.cpp\
-         src/note.cpp\
-         src/folder.cpp\
-         src/findDialog.cpp\
-         src/scriptedit.cpp\
-         src/fileDialogs.cpp\
-     src/scales.cpp\
-         src/FunctionCurve.cpp\
-         src/Fitter.cpp\
-         src/Scripting.cpp\
-         src/ScriptingLangDialog.cpp\
-         src/ScriptWindow.cpp\
-         src/TableStatistics.cpp\
-         src/Spectrogram.cpp\
-         src/ColorMapEditor.cpp
-
-SOURCES   +=../3rdparty/zlib123/minigzip.c
-
-##################### SCRIPTING LANGUAGES SECTION #############
- 
- SCRIPTING_LANGS = muParser
- DEFINES	+= SCRIPTING_CONSOLE
- DEFINES	+= SCRIPTING_DIALOG
-
-# Python support is unstable; use at your own risk
-unix:SCRIPTING_LANGS += Python
-
-##################### Default: muParser #######################
-contains(SCRIPTING_LANGS, muParser) {
-  DEFINES +=	SCRIPTING_MUPARSER
-  unix:LIBS +=	-lmuparser
-  HEADERS +=	src/muParserScripting.h 
-  SOURCES +=	src/muParserScripting.cpp 
-}
-
-##################### PYTHON + SIP + PyQT #####################
-contains(SCRIPTING_LANGS, Python) {
-  DEFINES +=	SCRIPTING_PYTHON
-  HEADERS +=	src/PythonScripting.h
-  SOURCES +=	src/PythonScripting.cpp
-
-  SIP =		$$(LOCALBASE)/bin/sip
-  SIPINCLUDE =	$$(LOCALBASE)/share/py-sip
-
- unix {
-	INCLUDEPATH += $$(PYTHON_INCLUDEDIR)
-	LIBS +=	-lm -l$$(PYTHON_VERSION)
-	system(mkdir -p $${MOC_DIR})
-	unix:system($${SIP} -I $${SIPINCLUDE} -t Qt_3_3_0 -t WS_X11 -c $${MOC_DIR} src/qti.sip)
-	}
-
-##################### SIP generated files #####################
-  HEADERS +=\
-	 ../tmp/qtiplot/sipqtiApplicationWindow.h\
-	 ../tmp/qtiplot/sipqtiGraph.h\
-	 ../tmp/qtiplot/sipqtiLineMarker.h\
-	 ../tmp/qtiplot/sipqtiMultiLayer.h\
-	 ../tmp/qtiplot/sipqtiTable.h\
-	 ../tmp/qtiplot/sipqtimyWidget.h\
-	 ../tmp/qtiplot/sipqtiScriptEdit.h\
-	 ../tmp/qtiplot/sipqtiNote.h\
-	 ../tmp/qtiplot/sipqtiFit.h\
-	 ../tmp/qtiplot/sipqtiExponentialFit.h\
-	 ../tmp/qtiplot/sipqtiTwoExpFit.h\
-	 ../tmp/qtiplot/sipqtiThreeExpFit.h\
-	 ../tmp/qtiplot/sipqtiSigmoidalFit.h\
-	 ../tmp/qtiplot/sipqtiGaussAmpFit.h\
-	 ../tmp/qtiplot/sipqtiLorentzFit.h\
-	 ../tmp/qtiplot/sipqtiNonLinearFit.h\
-	 ../tmp/qtiplot/sipqtiPluginFit.h\
-	 ../tmp/qtiplot/sipqtiMultiPeakFit.h\
-	 ../tmp/qtiplot/sipqtiPolynomialFit.h\
-	 ../tmp/qtiplot/sipqtiLinearFit.h\
-	 ../tmp/qtiplot/sipqtiMatrix.h\
-	 ../tmp/qtiplot/sipqtiGaussFit.h\
-	 ../tmp/qtiplot/sipqtiPythonScript.h\
-	 ../tmp/qtiplot/sipqtiFolder.h\
-	 ../tmp/qtiplot/sipqtiQPtrList.h
-  SOURCES +=\
-	 ../tmp/qtiplot/sipqticmodule.cpp\
-	 ../tmp/qtiplot/sipqtiApplicationWindow.cpp\
-	 ../tmp/qtiplot/sipqtiGraph.cpp\
-	 ../tmp/qtiplot/sipqtiLineMarker.cpp\
-	 ../tmp/qtiplot/sipqtiMultiLayer.cpp\
-	 ../tmp/qtiplot/sipqtiTable.cpp\
-	 ../tmp/qtiplot/sipqtimyWidget.cpp\
-	 ../tmp/qtiplot/sipqtiScriptEdit.cpp\
-	 ../tmp/qtiplot/sipqtiNote.cpp\
-	 ../tmp/qtiplot/sipqtiFit.cpp\
-	 ../tmp/qtiplot/sipqtiExponentialFit.cpp\
-	 ../tmp/qtiplot/sipqtiTwoExpFit.cpp\
-	 ../tmp/qtiplot/sipqtiThreeExpFit.cpp\
-	 ../tmp/qtiplot/sipqtiSigmoidalFit.cpp\
-	 ../tmp/qtiplot/sipqtiGaussAmpFit.cpp\
-	 ../tmp/qtiplot/sipqtiLorentzFit.cpp\
-	 ../tmp/qtiplot/sipqtiNonLinearFit.cpp\
-	 ../tmp/qtiplot/sipqtiPluginFit.cpp\
-	 ../tmp/qtiplot/sipqtiMultiPeakFit.cpp\
-	 ../tmp/qtiplot/sipqtiPolynomialFit.cpp\
-	 ../tmp/qtiplot/sipqtiLinearFit.cpp\
-	 ../tmp/qtiplot/sipqtiMatrix.cpp\
-	 ../tmp/qtiplot/sipqtiGaussFit.cpp\
-	 ../tmp/qtiplot/sipqtiPythonScript.cpp\
-	 ../tmp/qtiplot/sipqtiFolder.cpp\
-	 ../tmp/qtiplot/sipqtiQPtrList.cpp
-}
diff -ruN --exclude=CVS /usr/ports/math/qtiplot/pkg-plist /home/makc/porting/ports/math/qtiplot/pkg-plist
--- /usr/ports/math/qtiplot/pkg-plist	Tue Dec 12 16:01:43 2006
+++ /home/makc/porting/ports/math/qtiplot/pkg-plist	Wed May 30 00:28:56 2007
@@ -7,6 +7,7 @@
 %%NLS%%%%DATADIR%%/translations/qtiplot_de.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_es.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_fr.qm
+%%NLS%%%%DATADIR%%/translations/qtiplot_ja.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_ru.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_sv.qm
 %%NLS%%@dirrm %%DATADIR%%/translations


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Wed Jun 6 17:33:32 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113251 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Fri Jun 15 09:47:00 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113251 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/113251: commit references a PR
Date: Fri, 15 Jun 2007 09:46:49 +0000 (UTC)

 miwi        2007-06-15 09:46:44 UTC
 
   FreeBSD ports repository
 
   Modified files:
     math/qtiplot         Makefile distinfo pkg-plist 
   Added files:
     math/qtiplot/files   
                          patch-fitPlugins__fitRational0__fitRational0.pro 
                          patch-fitPlugins__fitRational1__fitRational1.pro 
                          patch-qtiplot__qtiplot.pro 
   Removed files:
     math/qtiplot/files   qtiplot.pro 
   Log:
   - Update to 0.9-rc2
   
   PR:             113251
   Submitted by:   Max Brazhnikov <makc@issp.ac.ru> (maintainer)
   
   Revision  Changes    Path
   1.12      +20 -34    ports/math/qtiplot/Makefile
   1.11      +3 -3      ports/math/qtiplot/distinfo
   1.1       +14 -0     ports/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro (new)
   1.1       +14 -0     ports/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro (new)
   1.1       +148 -0    ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro (new)
   1.2       +0 -288    ports/math/qtiplot/files/qtiplot.pro (dead)
   1.3       +1 -0      ports/math/qtiplot/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
