diff options
| author | Tilman Keskinoz <arved@FreeBSD.org> | 2004-02-17 13:40:10 +0000 |
|---|---|---|
| committer | Tilman Keskinoz <arved@FreeBSD.org> | 2004-02-17 13:40:10 +0000 |
| commit | ee4f10cac04d5824a0bed32742f8cacacb3530e2 (patch) | |
| tree | eb4ce6f2224dadc148a227707a6c1d446aa3ffb5 /math | |
| parent | Add NO_LATEST_LINK flag. (diff) | |
Use QT3 instead of QT2.
Bump PORTREVISION.
Notes
Notes:
svn path=/head/; revision=101213
Diffstat (limited to 'math')
| -rw-r--r-- | math/qscanplot/Makefile | 8 | ||||
| -rw-r--r-- | math/qscanplot/files/patch-dinterpolator.cpp | 10 | ||||
| -rw-r--r-- | math/qscanplot/files/patch-qscanplot::plugins::make-plugin.sh | 27 | ||||
| -rw-r--r-- | math/qscanplot/files/patch-qscanplotview.cpp | 10 |
4 files changed, 42 insertions, 13 deletions
diff --git a/math/qscanplot/Makefile b/math/qscanplot/Makefile index dd9ad6931977..02476cac7a87 100644 --- a/math/qscanplot/Makefile +++ b/math/qscanplot/Makefile @@ -7,7 +7,7 @@ PORTNAME= qscanplot PORTVERSION= 0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math # per distfile survey, mastersite disappeared in March 2003 MASTER_SITES= # http://www.gae.ucm.es/~gonzalez/qscanplot/ @@ -15,16 +15,16 @@ MASTER_SITES= # http://www.gae.ucm.es/~gonzalez/qscanplot/ MAINTAINER= ports@FreeBSD.org COMMENT= A program to extract data from scanned plots, graphs and figures -BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake +BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake USE_X_PREFIX= yes -USE_QT_VER= 2 +USE_QT_VER= 3 USE_PERL5_BUILD=yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-lm ${PTHREAD_LIBS}" \ QTDIR=${X11BASE} \ - LIBQT=-lqt2 + LIBQT=-lqt-mt MAKE_ENV= QTDIR=${X11BASE} .include <bsd.port.pre.mk> diff --git a/math/qscanplot/files/patch-dinterpolator.cpp b/math/qscanplot/files/patch-dinterpolator.cpp new file mode 100644 index 000000000000..32ecab3fb7f5 --- /dev/null +++ b/math/qscanplot/files/patch-dinterpolator.cpp @@ -0,0 +1,10 @@ +--- qscanplot/dinterpolator.cpp.orig Tue Feb 17 14:15:08 2004 ++++ qscanplot/dinterpolator.cpp Tue Feb 17 14:15:25 2004 +@@ -30,6 +30,7 @@ + #include "dinterpolator.h" + #include <qlistbox.h> + #include <qmultilineedit.h> ++#include <qregexp.h> + + dInterpolator::dInterpolator(QWidget *parent, const char *name, bool modal ) + : dlgInterpolator(parent,name,modal) diff --git a/math/qscanplot/files/patch-qscanplot::plugins::make-plugin.sh b/math/qscanplot/files/patch-qscanplot::plugins::make-plugin.sh index 69c3ba0cafbf..6f630150df3a 100644 --- a/math/qscanplot/files/patch-qscanplot::plugins::make-plugin.sh +++ b/math/qscanplot/files/patch-qscanplot::plugins::make-plugin.sh @@ -1,17 +1,26 @@ - -$FreeBSD$ - ---- qscanplot/plugins/make-plugin.sh 2002/04/23 09:48:56 1.1 -+++ qscanplot/plugins/make-plugin.sh 2002/04/23 09:53:40 -@@ -1,6 +1,6 @@ +--- qscanplot/plugins/make-plugin.sh.orig Sun Apr 14 11:42:17 2002 ++++ qscanplot/plugins/make-plugin.sh Tue Feb 17 14:12:11 2004 +@@ -1,14 +1,5 @@ #! /bin/sh -TMAKEPATH=/usr/lib/tmake/linux-g++ -+TMAKEPATH=${LOCALBASE}/share/tmake/freebsd-g++ +- +-export TMAKEPATH +- +-if [ ! -d $TMAKEPATH ]; then +- echo Directory $TMAKEPATH selected for TMAKEPATH does not exist +- exit 1 +-fi +- + plg=$1 - export TMAKEPATH + plgcpp=$plg.cpp +@@ -34,11 +25,11 @@ -@@ -38,7 +38,7 @@ + echo Generating makefile . . . + +-tmake -o $plgmak $plgpro ++qmake -o $plgmak $plgpro echo Building plugin $plg diff --git a/math/qscanplot/files/patch-qscanplotview.cpp b/math/qscanplot/files/patch-qscanplotview.cpp new file mode 100644 index 000000000000..d1d816a9315b --- /dev/null +++ b/math/qscanplot/files/patch-qscanplotview.cpp @@ -0,0 +1,10 @@ +--- qscanplot/qscanplotview.cpp.orig Tue Feb 17 14:17:51 2004 ++++ qscanplot/qscanplotview.cpp Tue Feb 17 14:18:09 2004 +@@ -33,6 +33,7 @@ + #include <qpainter.h> + #include <qapplication.h> + #include <qmsgbox.h> ++#include <qcursor.h> + + #include "resource.h" + |