5 files changed, 47 insertions, 39 deletions

diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index 959d5ec7c376..0d9b56a4443d 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qtiplot
-DISTVERSION=	0.9
+DISTVERSION=	0.9.2
 CATEGORIES=	math science
 MASTER_SITES=	http://soft.proindependent.com/src/
 
@@ -21,9 +21,11 @@ LIB_DEPENDS=	gsl.10:${PORTSDIR}/math/gsl \
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	gui moc qmake opengl svg qt3support network assistantclient
+QT_COMPONENTS=	gui moc_build qmake_build opengl svg qt3support network assistantclient
 HAS_CONFIGURE=	yes
-USE_DOS2UNIX=	qtiplot/qtiplot.pro
+CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}"
+USE_DOS2UNIX=	*.pro
+MAN1=		qtiplot.1
 
 DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \
 		"${DATADIR}/qtiplot.png" \
@@ -42,7 +44,7 @@ USE_PYTHON=	yes
 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 "
@@ -60,8 +62,7 @@ PLIST_SUB+=	NLS=""
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-QPRO_DIRS=	. \
-		fitPlugins/fitRational0 \
+QPRO_DIRS=	fitPlugins/fitRational0 \
 		fitPlugins/fitRational1 \
 		qtiplot
 
@@ -70,26 +71,32 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|loadInitFile("qtiplotrc")|loadInitFile("${DATADIR}/qtiplotrc")|' \
 		${WRKSRC}/${PORTNAME}/src/PythonScripting.cpp
-	${REINPLACE_CMD} -e \
+	@${REINPLACE_CMD} -e \
 		'/^sys.path.append/s|"\."|"${DATADIR}"|' \
 		${WRKSRC}/${PORTNAME}/qtiplotrc.py
+	@${REINPLACE_CMD} -e \
+		"/^#SCRIPTING_LANGS.*Python/s|^#||" \
+		${WRKSRC}/${PORTNAME}/qtiplot.pro
 .else
-	@${REINPLACE_CMD} \
-		-e "s/^SCRIPTING_LANGS += Python//" \
+	@${REINPLACE_CMD} -e \
+		"s/^SCRIPTING_LANGS.*Python//" \
 		${WRKSRC}/${PORTNAME}/qtiplot.pro
 .endif
 	@${REINPLACE_CMD} -e \
 		's|/usr/share/doc/qtiplot/manual-%1|${DATADIR}/manual|; \
 		 s|/usr/lib/qtiplot/plugins|${DATADIR}/fitPlugins|' \
 		${WRKSRC}/qtiplot/src/ApplicationWindow.cpp
+.if defined(WITH_DEBUG)
+	@${REINPLACE_CMD} -e \
+		"/^CONFIG.*release/s|release|debug|" \
+		${WRKSRC}/${PORTNAME}/qtiplot.pro
+.endif
 
 do-configure:
 .if !defined(WITHOUT_NLS)
-	cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 -verbose qtiplot.pro
+	@(cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 qtiplot.pro)
 .endif
-.for d in ${QPRO_DIRS}
-	(cd ${WRKSRC}/${d} && ${SETENV} ${MAKE_ENV} ${QMAKE})
-.endfor
+	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} -recursive)
 
 post-configure:
 .for d in ${QPRO_DIRS}
@@ -99,12 +106,13 @@ post-configure:
 		 s|^LINK .*|LINK=${CXX}|' \
 		${WRKSRC}/${d}/Makefile
 .endfor
-	${REINPLACE_CMD} -e 's|^\(INCPATH.*=\)|\1-I../3rdparty/liborigin|' ${WRKSRC}/qtiplot/Makefile
+	@${REINPLACE_CMD} -e 's|^\(INCPATH.*=\)|\1-I../3rdparty/liborigin|' ${WRKSRC}/qtiplot/Makefile
 
 do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/qtiplot/qtiplot ${DATADIR}/qtiplot
 	${LN} -fs ${DATADIR}/qtiplot ${PREFIX}/bin/qtiplot
+	${INSTALL_MAN} ${WRKSRC}/qtiplot.1 ${PREFIX}/man/man1
 	${MKDIR} ${DATADIR}/fitPlugins
 	${INSTALL_PROGRAM} ${WRKSRC}/fitPlugins/libfitRational0.so.1.0.0 \
 				${DATADIR}/fitPlugins/libfitRational0.so
@@ -114,12 +122,12 @@ do-install:
 .if defined(WITH_PYTHON)
 .for s in qtiplotrc.py qtiUtil.py
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${s} ${DATADIR}/${s}
-	@cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('${s}')"
+	@(cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('${s}')")
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${s}c ${DATADIR}/${s}c
 .endfor
 .endif
 .if !defined(WITHOUT_NLS)
-	(cd ${WRKSRC}/qtiplot/translations/ && ${COPYTREE_SHARE} '*.qm' ${DATADIR}/translations)
+	@(cd ${WRKSRC}/qtiplot/translations/ && ${COPYTREE_SHARE} '*.qm' ${DATADIR}/translations)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/qtiplot/distinfo b/math/qtiplot/distinfo
index 12d87ecefa48..f05967ee2c29 100644
--- a/math/qtiplot/distinfo
+++ b/math/qtiplot/distinfo
@@ -1,3 +1,3 @@
-MD5 (qtiplot-0.9.tar.bz2) = 117601fb9ba06b41f99e5492920f0864
-SHA256 (qtiplot-0.9.tar.bz2) = a4a8cbf0619f902ce029286a9f2960da66d587d6b2f2fffdb9ed8042fa2873db
-SIZE (qtiplot-0.9.tar.bz2) = 825530
+MD5 (qtiplot-0.9.2.tar.bz2) = 943c50f7fb28e1b11ed0188ec918cf4c
+SHA256 (qtiplot-0.9.2.tar.bz2) = 051a55e3e120ad53b2463a3a9295d22f9d36d1146468c5ebd869a5f180c145fd
+SIZE (qtiplot-0.9.2.tar.bz2) = 897629
diff --git a/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro b/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro
index aa329695fba7..0ffbc3335d20 100644
--- a/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro
+++ b/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro
@@ -1,14 +1,14 @@
---- ./fitPlugins/fitRational0/fitRational0.pro.orig	Wed Jun 13 21:16:56 2007
-+++ ./fitPlugins/fitRational0/fitRational0.pro	Sat Jul 14 14:56:13 2007
+--- fitPlugins/fitRational0/fitRational0.pro.orig	2007-10-27 00:15:32.000000000 +0200
++++ fitPlugins/fitRational0/fitRational0.pro	2007-12-15 12:14:56.000000000 +0100
 @@ -12,9 +12,8 @@
  DESTDIR           = ../
   
  # statically link against GSL in 3rdparty
--INCLUDEPATH += ../../3rdparty/gsl
--LIBS         += ../3rdparty/gsl/lib/libgsl.a
--LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS        += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
 +unix:INCLUDEPATH += $$(LOCALBASE)/include
-+unix:LIBS         += -lgsl -lgslcblas
++unix:LIBS        += -lgsl -lgslcblas
+ 
  #dynamically link against GSL installed system-wide
  #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
- 
diff --git a/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro b/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro
index 4921ef57a376..f8859274de00 100644
--- a/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro
+++ b/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro
@@ -1,14 +1,14 @@
---- ./fitPlugins/fitRational1/fitRational1.pro.orig	Wed Jun 13 21:16:56 2007
-+++ ./fitPlugins/fitRational1/fitRational1.pro	Sat Jul 14 14:56:13 2007
+--- ./fitPlugins/fitRational1/fitRational1.pro.orig	2007-10-27 02:15:18.000000000 +0400
++++ ./fitPlugins/fitRational1/fitRational1.pro	2007-11-14 20:19:55.000000000 +0300
 @@ -12,9 +12,8 @@
  DESTDIR           = ../
   
  # statically link against GSL in 3rdparty
--INCLUDEPATH += ../../3rdparty/gsl
--LIBS         += ../3rdparty/gsl/lib/libgsl.a
--LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS        += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
 +unix:INCLUDEPATH += $$(LOCALBASE)/include
 +unix:LIBS         += -lgsl -lgslcblas
+ 
  #dynamically link against GSL installed system-wide
  #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
- 
diff --git a/math/qtiplot/files/patch-qtiplot__qtiplot.pro b/math/qtiplot/files/patch-qtiplot__qtiplot.pro
index 5dcf79cd8c84..812d09708bf0 100644
--- a/math/qtiplot/files/patch-qtiplot__qtiplot.pro
+++ b/math/qtiplot/files/patch-qtiplot__qtiplot.pro
@@ -1,6 +1,6 @@
---- ./qtiplot/qtiplot.pro.orig	2007-09-20 15:55:53.000000000 +0400
-+++ ./qtiplot/qtiplot.pro	2007-09-23 01:11:43.000000000 +0400
-@@ -30,12 +30,8 @@
+--- ./qtiplot/qtiplot.pro.orig	2007-11-14 20:19:55.000000000 +0300
++++ ./qtiplot/qtiplot.pro	2007-11-14 20:19:55.000000000 +0300
+@@ -34,12 +34,8 @@
  #!!! Warning: You must modify these paths according to your computer settings
  #############################################################################
  
@@ -15,7 +15,7 @@
  
  ##################### 3rd PARTY LIBRARIES SECTION ###########################
  #!!! Warning: You must modify these paths according to your computer settings
-@@ -44,17 +40,13 @@
+@@ -48,17 +44,13 @@
  ##################### Linux (Mac OS X) ######################################
  
  # statically link against libraries in 3rdparty
@@ -36,7 +36,7 @@
  
  ##################### Windows ###############################################
  
-@@ -363,6 +355,7 @@
+@@ -400,6 +392,7 @@
  ##################### Default: muParser v1.28 #################
  
  contains(SCRIPTING_LANGS, muParser) {
@@ -44,7 +44,7 @@
    DEFINES += SCRIPTING_MUPARSER
  
    HEADERS += src/muParserScript.h \
-@@ -380,11 +373,11 @@
+@@ -417,11 +410,11 @@
    SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
  
    unix {
@@ -59,4 +59,4 @@
 +    system($$system($$SIPCMD) -c $${SIP_DIR} src/qti.sip)
    }
  
-   win32 {
\ No newline at end of file
+   win32 {