8 files changed, 40 insertions, 132 deletions

diff --git a/deskutils/vym/Makefile b/deskutils/vym/Makefile
index 51c462fc1be8..742eee3a75ab 100644
--- a/deskutils/vym/Makefile
+++ b/deskutils/vym/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vym
-PORTVERSION=	1.6.0
+PORTVERSION=	1.7.0
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/vym/distinfo b/deskutils/vym/distinfo
index 0017e85312dd..a636bd7a92da 100644
--- a/deskutils/vym/distinfo
+++ b/deskutils/vym/distinfo
@@ -1,2 +1,2 @@
-MD5 (vym-1.6.0.tar.gz) = e0e2c6058c750d6429ee37652bc5f843
-SIZE (vym-1.6.0.tar.gz) = 538617
+MD5 (vym-1.7.0.tar.gz) = f1d4ba9f5a2362a213f7ff90ad6cdfec
+SIZE (vym-1.7.0.tar.gz) = 592231
diff --git a/deskutils/vym/files/patch-floatimageobj.cpp b/deskutils/vym/files/patch-floatimageobj.cpp
deleted file mode 100644
index 682518bd12ce..000000000000
--- a/deskutils/vym/files/patch-floatimageobj.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- floatimageobj.cpp.orig	Tue Oct 19 18:31:12 2004
-+++ floatimageobj.cpp	Sat Jan 15 12:25:08 2005
-@@ -1,6 +1,6 @@
-+#include <math.h>
- #include "floatimageobj.h"
- #include "branchobj.h"
--#include <math.h>
- 
- 
- /////////////////////////////////////////////////////////////////
-@@ -67,7 +67,7 @@
- 
- int FloatImageObj::z ()
- {
--	return lrint (icon->z());
-+	return (long)rint (icon->z());
- }
- 
- bool FloatImageObj::load (const QString &fn)
diff --git a/deskutils/vym/files/patch-linkablemapobj.cpp b/deskutils/vym/files/patch-linkablemapobj.cpp
index c2200236fd30..32bc686a3bb1 100644
--- a/deskutils/vym/files/patch-linkablemapobj.cpp
+++ b/deskutils/vym/files/patch-linkablemapobj.cpp
@@ -1,85 +1,8 @@
---- linkablemapobj.cpp.orig	Tue Jan  4 10:49:50 2005
-+++ linkablemapobj.cpp	Sat Jan 15 12:41:45 2005
-@@ -1,4 +1,4 @@
--//#include <math.h>
+--- linkablemapobj.cpp.orig	Fri Jul  8 09:24:42 2005
++++ linkablemapobj.cpp	Sat Aug  6 17:22:48 2005
+@@ -1,3 +1,5 @@
 +#include <math.h>
- 
++
  #include "linkablemapobj.h"
  #include "branchobj.h"
-@@ -456,10 +456,10 @@
- 	double vy=p2y - p1y;
- 
- 	// Draw the horizontal line below heading (from ChildPos to ParPos)
--	bottomline->setPoints (lrint(childPos.x()),
--		lrint(childPos.y()),
--		lrint(p1x),
--		lrint(p1y) );
-+	bottomline->setPoints ((long)rint(childPos.x()),
-+		(long)rint(childPos.y()),
-+		(long)rint(p1x),
-+		(long)rint(p1y) );
- 
- 	double a;	// angle
- 	if (vx > -0.000001 && vx < 0.000001)
-@@ -467,7 +467,7 @@
- 	else
- 		a=atan( vy / vx );
- 	// "turning point" for drawing polygonal links
--	QPoint tp (-lrint(sin (a)*thickness_start), lrint(cos (a)*thickness_start));	
-+	QPoint tp (-(long)rint(sin (a)*thickness_start), (long)rint(cos (a)*thickness_start));	
- 	
- 	QCanvasLine *cl;
- 
-@@ -477,10 +477,10 @@
- 	switch (style)
- 	{
- 		case StyleLine:
--			l->setPoints( lrint (parPos.x()),
--				lrint(parPos.y()),
--				lrint(p2x),
--				lrint(p2y) );
-+			l->setPoints( (long)rint (parPos.x()),
-+				(long)rint(parPos.y()),
-+				(long)rint(p2x),
-+				(long)rint(p2y) );
- 			break;	
- 		case StyleParabel:	
- 			parabel (pa0, p1x,p1y,p2x,p2y);
-@@ -492,15 +492,15 @@
- 			}
- 			break;
- 		case StylePolyLine:
--			pa0[0]=QPoint (lrint(p2x+tp.x()), lrint(p2y+tp.y()));
--			pa0[1]=QPoint (lrint(p2x-tp.x()), lrint(p2y-tp.y()));
--			pa0[2]=QPoint (lrint (parPos.x()), lrint(parPos.y()) );
-+			pa0[0]=QPoint ((long)rint(p2x+tp.x()), (long)rint(p2y+tp.y()));
-+			pa0[1]=QPoint ((long)rint(p2x-tp.x()), (long)rint(p2y-tp.y()));
-+			pa0[2]=QPoint ((long)rint (parPos.x()), (long)rint(parPos.y()) );
- 			p->setPoints (pa0);
- 			// here too, draw line to avoid missing pixels
--			l->setPoints( lrint (parPos.x()),
--				lrint(parPos.y()),
--				lrint(p2x),
--				lrint(p2y) );
-+			l->setPoints( (long)rint (parPos.x()),
-+				(long)rint(parPos.y()),
-+				(long)rint(p2x),
-+				(long)rint(p2y) );
- 			break;
- 		case StylePolyParabel:	
- 			parabel (pa1, p1x,p1y,p2x+tp.x(),p2y+tp.y());
-@@ -680,12 +680,12 @@
- 		m=(vy / (vx*vx));
- 	dx=vx/(arcsegs);
- 	int i;
--	ya.setPoint (0,QPoint (lrint(p1x),lrint(p1y)));
-+	ya.setPoint (0,QPoint ((long)rint(p1x),(long)rint(p1y)));
- 	for (i=1;i<=arcsegs;i++)
- 	{	
- 		pnx=p1x+dx;
- 		pny=m*(pnx-parPos.x())*(pnx-parPos.x())+parPos.y();
--		ya.setPoint (i,QPoint (lrint(pnx),lrint(pny)));
-+		ya.setPoint (i,QPoint ((long)rint(pnx),(long)rint(pny)));
- 		p1x=pnx;
- 		p1y=pny;
- 	}	
+ #include "mapeditor.h"
diff --git a/deskutils/vym/files/patch-mainwindow.cpp b/deskutils/vym/files/patch-mainwindow.cpp
index daf05aa2cb73..42c45112f2d4 100644
--- a/deskutils/vym/files/patch-mainwindow.cpp
+++ b/deskutils/vym/files/patch-mainwindow.cpp
@@ -1,11 +1,22 @@
---- mainwindow.cpp.orig	Tue Sep 28 14:13:06 2004
-+++ mainwindow.cpp	Sun Oct 17 23:49:36 2004
-@@ -53,6 +53,8 @@
- #include "showtextdialog.h"
- #include "process.h"
+--- mainwindow.cpp.orig	Mon Jul 11 21:55:32 2005
++++ mainwindow.cpp	Sat Aug  6 17:20:39 2005
+@@ -57,6 +57,8 @@
+ #include "settings.h"
+ #include "options.h"
  
 +#include <unistd.h>
 +
  extern TextEditor *textEditor;
  extern Main *mainWindow;
  extern int statusbarTime;
+@@ -2322,7 +2324,9 @@
+ 		docpath="./vym.app/Contents/vym.pdf";
+ 	#else
+ 		// default path in SUSE LINUX
+-		docpath="/usr/share/doc/packages/vym/doc/vym.pdf";
++//		docpath="/usr/share/doc/packages/vym/doc/vym.pdf";
++		// default path in FreeBSD
++		docpath="/usr/local/share/doc/vym/vym.pdf";
+ 	#endif
+ 
+ 	if (!QFile (docpath).exists() )
diff --git a/deskutils/vym/files/patch-mapeditor.cpp b/deskutils/vym/files/patch-mapeditor.cpp
index f2f59f90b5db..7b3f32defa9c 100644
--- a/deskutils/vym/files/patch-mapeditor.cpp
+++ b/deskutils/vym/files/patch-mapeditor.cpp
@@ -1,6 +1,6 @@
---- mapeditor.cpp.orig	Sun Sep 26 22:45:57 2004
-+++ mapeditor.cpp	Sun Oct 17 23:49:21 2004
-@@ -53,6 +53,8 @@
+--- mapeditor.cpp.orig	Wed Jul 13 13:36:14 2005
++++ mapeditor.cpp	Sat Aug  6 17:19:14 2005
+@@ -58,6 +58,8 @@
  #include "icons/flag-flash.xpm"
  #include "icons/flag-lifebelt.xpm"
  
diff --git a/deskutils/vym/files/patch-misc.cpp b/deskutils/vym/files/patch-misc.cpp
index f6718134dfd2..c47e04a47ce2 100644
--- a/deskutils/vym/files/patch-misc.cpp
+++ b/deskutils/vym/files/patch-misc.cpp
@@ -1,18 +1,11 @@
---- misc.cpp.orig	Sun Sep 26 22:45:57 2004
-+++ misc.cpp	Sat Jan 15 12:30:23 2005
-@@ -223,13 +223,13 @@
- 		if (pix.width()>max_w)
- 		{
- 			r=max_w / pix.width();
--			pix.resize(lrint(pix.width()*r), lrint(pix.height()*r));
-+			pix.resize((long)rint(pix.width()*r), (long)rint(pix.height()*r));
- 			// TODO not a resize, but a shrink/enlarge is needed here...
- 		}
- 		if (pix.height()>max_h)
- 		{
- 			r=max_h / pix.height();
--			pix.resize(lrint(pix.width()*r), lrint(pix.height()*r));
-+			pix.resize((long)rint(pix.width()*r), (long)rint(pix.height()*r));
- 			// TODO not a resize, but a shrink/enlarge is needed here...
- 		}
-         setPixmap( pix );
+--- misc.cpp.orig	Fri Jul  8 09:24:43 2005
++++ misc.cpp	Sat Aug  6 17:14:20 2005
+@@ -1,6 +1,8 @@
+ #include <qregexp.h>
+ #include <qpoint.h>
+ 
++#include <math.h>
++
+ #include "misc.h"
+ 
+ 
diff --git a/deskutils/vym/files/patch-xml.cpp b/deskutils/vym/files/patch-xml.cpp
index 503e5f424b8e..2bf3e4ac9a23 100644
--- a/deskutils/vym/files/patch-xml.cpp
+++ b/deskutils/vym/files/patch-xml.cpp
@@ -1,5 +1,5 @@
---- xml.cpp.orig	Mon Jan 17 12:50:32 2005
-+++ xml.cpp	Mon Jan 17 12:50:42 2005
+--- xml.cpp.orig	Fri Jul  8 09:24:43 2005
++++ xml.cpp	Sat Aug  6 17:19:33 2005
 @@ -4,6 +4,7 @@
  #include <qcolor.h>
  #include <qstylesheet.h>