Date: Sat, 6 Aug 2005 15:53:44 GMT From: Gerrit Beine <tux@pinguru.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/84618: Update port: deskutils/vym Message-ID: <200508061553.j76Fri3K010310@www.freebsd.org> Resent-Message-ID: <200508061600.j76G0YlC052316@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84618
>Category: ports
>Synopsis: Update port: deskutils/vym
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 06 16:00:33 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Gerrit Beine
>Release: FreeBSD 5.4-RELEASE-p1
>Organization:
pitcom GmbH
>Environment:
FreeBSD asus 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #0: Sun May 15 16:37:58 CEST 2005 root@asus:/usr/src/sys/i386/compile/ASUS i386
>Description:
* Update to version 1.7.0.
* Correct path to dokumentation in help menu (and dependency on Acrobat Reader)
Note to committer: files/patch-floatimageobj.cpp seems to be no longer needed
>How-To-Repeat:
>Fix:
diff -Nur /usr/ports/deskutils/vym/Makefile vym/Makefile
--- /usr/ports/deskutils/vym/Makefile Wed Jul 20 14:22:38 2005
+++ vym/Makefile Sat Aug 6 17:48:56 2005
@@ -2,11 +2,11 @@
# Date created: 17 Oct 2004
# Whom: Gerrit Beine <tux@pinguru.net>
#
-# $FreeBSD: ports/deskutils/vym/Makefile,v 1.3 2005/07/14 14:43:53 pav Exp $
+# $FreeBSD: ports/deskutils/vym/Makefile,v 1.2 2005/01/29 15:28:51 vs Exp $
#
PORTNAME= vym
-PORTVERSION= 1.6.0
+PORTVERSION= 1.7.0
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,6 +14,9 @@
MAINTAINER= tux@pinguru.net
COMMENT= VYM (View Your Mind) is a tool to generate and manipulate maps
+.if !defined(NOPORTDOCS)
+RUN_DEPENDS= acroread:${PORTSDIR}/print/acroread
+.endif
BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
USE_QT_VER= 3
diff -Nur /usr/ports/deskutils/vym/distinfo vym/distinfo
--- /usr/ports/deskutils/vym/distinfo Sat Jan 29 16:28:51 2005
+++ vym/distinfo Fri Jul 22 10:17:44 2005
@@ -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 -Nur /usr/ports/deskutils/vym/files/patch-floatimageobj.cpp vym/files/patch-floatimageobj.cpp
--- /usr/ports/deskutils/vym/files/patch-floatimageobj.cpp Sat Jan 29 16:28:51 2005
+++ vym/files/patch-floatimageobj.cpp Thu Jan 1 01:00:00 1970
@@ -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 -Nur /usr/ports/deskutils/vym/files/patch-linkablemapobj.cpp vym/files/patch-linkablemapobj.cpp
--- /usr/ports/deskutils/vym/files/patch-linkablemapobj.cpp Sat Jan 29 16:28:51 2005
+++ vym/files/patch-linkablemapobj.cpp Sat Aug 6 17:22:49 2005
@@ -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 -Nur /usr/ports/deskutils/vym/files/patch-mainwindow.cpp vym/files/patch-mainwindow.cpp
--- /usr/ports/deskutils/vym/files/patch-mainwindow.cpp Fri Oct 22 17:20:32 2004
+++ vym/files/patch-mainwindow.cpp Sat Aug 6 17:23:07 2005
@@ -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 -Nur /usr/ports/deskutils/vym/files/patch-mapeditor.cpp vym/files/patch-mapeditor.cpp
--- /usr/ports/deskutils/vym/files/patch-mapeditor.cpp Fri Oct 22 17:20:32 2004
+++ vym/files/patch-mapeditor.cpp Sat Aug 6 17:23:53 2005
@@ -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 -Nur /usr/ports/deskutils/vym/files/patch-misc.cpp vym/files/patch-misc.cpp
--- /usr/ports/deskutils/vym/files/patch-misc.cpp Sat Jan 29 16:28:51 2005
+++ vym/files/patch-misc.cpp Sat Aug 6 17:24:13 2005
@@ -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 -Nur /usr/ports/deskutils/vym/files/patch-xml.cpp vym/files/patch-xml.cpp
--- /usr/ports/deskutils/vym/files/patch-xml.cpp Sat Jan 29 16:28:51 2005
+++ vym/files/patch-xml.cpp Sat Aug 6 17:24:27 2005
@@ -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>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508061553.j76Fri3K010310>