Index: math/qtiplot/Makefile
===================================================================
RCS file: /home/grads/gaoj/repository/ports/math/qtiplot/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- math/qtiplot/Makefile	7 Jul 2005 17:43:28 -0000	1.3
+++ math/qtiplot/Makefile	29 Jul 2005 15:59:54 -0000
@@ -6,24 +6,27 @@
 #
 
 PORTNAME=	qtiplot
-PORTVERSION=	0.6.2.2
+PORTVERSION=	0.6.4
 CATEGORIES=	math science
-MASTER_SITES=	http://soft.proindependent.com/
-DISTNAME=	${PORTNAME}-0.6.2-2
+MASTER_SITES=	http://soft.proindependent.com/src/
 
 MAINTAINER=	gaoj@cpsc.ucalgary.ca
 COMMENT=	An Origin clone for data analysis and scientific plotting
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl \
 		qwt:${PORTSDIR}/x11-toolkits/qwt \
 		qwtplot3d:${PORTSDIR}/math/qwtplot3d
 
-USE_ZIP=	yes
+USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
-PLIST_FILES=	bin/qtiplot
+PLIST_FILES=	bin/qtiplot \
+		%%PORTDOCS%%%%DOCSDIR%%/faq.html \
+		%%PORTDOCS%%%%DOCSDIR%%/help.html \
+		"%%PORTDOCS%%@dirrm %%DOCSDIR%%"
 
 USE_QT_VER=	3
 MAKE_ENV=	QTDIR=${QT_PREFIX}
@@ -40,16 +43,18 @@
 QMAKESPEC=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 .endif
 
-pre-configure:
+post-patch:
 	@${REINPLACE_CMD} -e \
-		"s:/home/ion/qt/qwt-4.2.0/include:${LOCALBASE}/include/qwt:" \
+		"s:../3rdparty/qwt/include:${LOCALBASE}/include/qwt:" \
 		-e "s:/home/ion/qt/qwtplot3d/include:${X11BASE}/include:" \
 		-e "/^unix:LIBS/s:-L /usr/lib:-L${LOCALBASE}/lib:" \
-		${WRKSRC}/qtiplot.pro
+		-e "/^unix:LIBS/s:../3rdparty/qwt/lib:${LOCALBASE}/lib:" \
+		-e "/^unix:documentation.path/s:/usr/share/doc/qtiplot:${DOCSDIR}:" \
+		${WRKSRC}/${PORTNAME}-${PORTVERSION}.pro
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
-		-spec ${QMAKESPEC} qtiplot.pro
+		-spec ${QMAKESPEC} ${PORTNAME}-${PORTVERSION}.pro
 
 post-configure:
 	@${REINPLACE_CMD} -e \
@@ -61,6 +66,12 @@
 		${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/qtiplot ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/../qtiplot ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for DOCFN in faq.html help.html
+	${INSTALL_MAN} ${WRKSRC}/doc/${DOCFN} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.post.mk>
Index: math/qtiplot/distinfo
===================================================================
RCS file: /home/grads/gaoj/repository/ports/math/qtiplot/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- math/qtiplot/distinfo	7 Jul 2005 17:43:28 -0000	1.2
+++ math/qtiplot/distinfo	29 Jul 2005 15:59:54 -0000
@@ -1,2 +1,2 @@
-MD5 (qtiplot-0.6.2-2.zip) = 251d406ad4ddfbbb10b7d347f755ee1b
-SIZE (qtiplot-0.6.2-2.zip) = 334479
+MD5 (qtiplot-0.6.4.tar.bz2) = f22bec91f66df4ab546a3befbbbb200e
+SIZE (qtiplot-0.6.4.tar.bz2) = 391282