4 files changed, 61 insertions, 9 deletions

diff --git a/math/digitizer/Makefile b/math/digitizer/Makefile
index 101225f0eb93..5571bbfe1290 100644
--- a/math/digitizer/Makefile
+++ b/math/digitizer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	digitizer
-PORTVERSION=	3.0
+PORTVERSION=	4.0
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,6 +16,7 @@ MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Engauge Digitizer - Digitizing software to convert graphs into numbers
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
+LIB_DEPENDS=	fftw3.4:${PORTSDIR}/math/fftw3
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -27,12 +28,12 @@ MAKE_ENV=	QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++"	\
 DESKTOP_ENTRIES=	"Engauge Digitizer" \
 			"Digitizing software to convert graphs into numbers" \
 			"${DATADIR}/lo16-app-digitizer.png" \
-			"${PORTNAME}" \
+			"engauge" \
 			"Education;Math;" \
 			true
 
 .if !defined(NOPORTDOCS)
-DOCS=		README REGRESSION_TESTS
+DOCS=		README
 .endif
 
 .include <bsd.port.pre.mk>
@@ -52,7 +53,7 @@ pre-build:
 	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} qmake -unix digitizer.pro
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/engauge ${PREFIX}/bin
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/src/img/lo16-app-digitizer.png	\
 		${DATADIR}
diff --git a/math/digitizer/distinfo b/math/digitizer/distinfo
index ebbb1dad495f..d01fe2d28d08 100644
--- a/math/digitizer/distinfo
+++ b/math/digitizer/distinfo
@@ -1,3 +1,3 @@
-MD5 (digit-src-3_0.tar.gz) = 8087ff58b5f562932e37c7044242a113
-SHA256 (digit-src-3_0.tar.gz) = 9880771fb95cf55b2c8ec917af38b2894e8699108b1ca63bf8a828ea4e880cec
-SIZE (digit-src-3_0.tar.gz) = 6261386
+MD5 (digit-src-4_0.tar.gz) = ee57f186b008e3c2358493e543f8c58a
+SHA256 (digit-src-4_0.tar.gz) = d66b8af89f01d5c09a53d14248b40745e344a50686a324974e4313667f5899e1
+SIZE (digit-src-4_0.tar.gz) = 5766057
diff --git a/math/digitizer/files/patch-src_helpwindow.cpp b/math/digitizer/files/patch-src_helpwindow.cpp
new file mode 100644
index 000000000000..0e28d2f41034
--- /dev/null
+++ b/math/digitizer/files/patch-src_helpwindow.cpp
@@ -0,0 +1,43 @@
+--- ./src/helpwindow.cpp.orig	Sun Oct  8 08:41:49 2006
++++ ./src/helpwindow.cpp	Sun Jan  7 22:03:39 2007
+@@ -172,7 +172,8 @@
+   for ( ; it != mHistory.end(); ++it )
+     history.append( *it );
+ 
+-  QFile f( QDir::currentDirPath() + "/.history" );
++  // FreeBSD: avoid conflict with editline
++  QFile f( QDir::homeDirPath () + "/.history-digitizer" );
+   f.open( IO_WriteOnly );
+   QDataStream s( &f );
+   s << history;
+@@ -183,7 +184,7 @@
+   for ( ; it2 != mBookmarks.end(); ++it2 )
+     bookmarks.append( *it2 );
+ 
+-  QFile f2( QDir::currentDirPath() + "/.bookmarks" );
++  QFile f2( QDir::homeDirPath () + "/.bookmarks-digitizer" );
+   f2.open( IO_WriteOnly );
+   QDataStream s2( &f2 );
+   s2 << bookmarks;
+@@ -295,8 +296,8 @@
+ 
+ void HelpWindow::readHistory()
+ {
+-  if ( QFile::exists( QDir::currentDirPath() + "/.history" ) ) {
+-    QFile f( QDir::currentDirPath() + "/.history" );
++  if ( QFile::exists( QDir::homeDirPath () + "/.history-digitizer" ) ) {
++    QFile f( QDir::homeDirPath () + "/.history-digitizer" );
+     f.open( IO_ReadOnly );
+     QDataStream s( &f );
+     s >> history;
+@@ -308,8 +309,8 @@
+ 
+ void HelpWindow::readBookmarks()
+ {
+-  if ( QFile::exists( QDir::currentDirPath() + "/.bookmarks" ) ) {
+-    QFile f( QDir::currentDirPath() + "/.bookmarks" );
++  if ( QFile::exists( QDir::homeDirPath () + "/.bookmarks-digitizer" ) ) {
++    QFile f( QDir::homeDirPath () + "/.bookmarks-digitizer" );
+     f.open( IO_ReadOnly );
+     QDataStream s( &f );
+     s >> bookmarks;
diff --git a/math/digitizer/pkg-plist b/math/digitizer/pkg-plist
index 3e9ccb2f1809..74751a69e6f4 100644
--- a/math/digitizer/pkg-plist
+++ b/math/digitizer/pkg-plist
@@ -1,9 +1,10 @@
-bin/digitizer
+bin/engauge
 %%DATADIR%%/lo16-app-digitizer.png
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/REGRESSION_TESTS
+%%PORTDOCS%%%%DOCSDIR%%/usermanual/README
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/animation.bmp
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/animation.gif
+%%PORTDOCS%%%%DOCSDIR%%/usermanual/animation.png
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/answerdiscretizing.html
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/answergridremoval.html
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/answerlinegraph.html
@@ -14,6 +15,7 @@ bin/digitizer
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/answerother.html
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/answerout.html
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/answerpointgraph.html
+%%PORTDOCS%%%%DOCSDIR%%/usermanual/answerselectmode.html
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/commandlineoptions.html
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/contextmenukonqueror.html
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/contextmenuwindows.html
@@ -61,6 +63,8 @@ bin/digitizer
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/gridremoveafter.png
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/gridremovebefore.png
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/index.html
+%%PORTDOCS%%%%DOCSDIR%%/usermanual/pointmatchrequirements.html
+%%PORTDOCS%%%%DOCSDIR%%/usermanual/pointmatchrequirements.png
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/tutorautolinegraph.html
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/tutorautolinegraph1.png
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/tutorautolinegraph10.png
@@ -104,6 +108,7 @@ bin/digitizer
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/tutormanmap5.png
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/tutormanmap6.png
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/tutormanmap7.png
+%%PORTDOCS%%%%DOCSDIR%%/usermanual/tutormanmap8.png
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/tutormanpointgraph.html
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/tutormanpointgraph1.png
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/tutormanpointgraph2.png
@@ -116,9 +121,11 @@ bin/digitizer
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/windowscontexta.jpg
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/windowscontextb.jpg
 %%PORTDOCS%%%%DOCSDIR%%/usermanual/windowscontextc.jpg
+%%PORTDOCS%%%%EXAMPLESDIR%%/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/corners.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/gridlines.gif
 %%PORTDOCS%%%%EXAMPLESDIR%%/gridlines_log.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/gridlines_log.src
 %%PORTDOCS%%%%EXAMPLESDIR%%/inverse.jpg
 %%PORTDOCS%%%%EXAMPLESDIR%%/inverse.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/linlog.jpg
@@ -127,6 +134,7 @@ bin/digitizer
 %%PORTDOCS%%%%EXAMPLESDIR%%/loglog.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/normdist.jpg
 %%PORTDOCS%%%%EXAMPLESDIR%%/normdist.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/pointmatch.jpg
 %%PORTDOCS%%%%EXAMPLESDIR%%/pointplot.bmp
 %%PORTDOCS%%%%EXAMPLESDIR%%/polarcircles.jpg
 %%PORTDOCS%%%%EXAMPLESDIR%%/polarplot.jpg