View | Details | Raw Unified | Return to bug 119234 | Differences between
and this patch

Collapse All | Expand All

(-)vym/Makefile (-25 / +17 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	vym
8
PORTNAME=	vym
9
PORTVERSION=	1.8.1
9
PORTVERSION=	1.10.0
10
PORTREVISION=	1
11
CATEGORIES=	deskutils
10
CATEGORIES=	deskutils
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 15-52 Link Here
15
MAINTAINER=	gerrit.beine@gmx.de
14
MAINTAINER=	gerrit.beine@gmx.de
16
COMMENT=	VYM  (View Your Mind) is a tool to generate and manipulate maps
15
COMMENT=	VYM  (View Your Mind) is a tool to generate and manipulate maps
17
16
18
BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
17
USE_BZIP2=	yes
18
USE_QT_VER=	4
19
QT_COMPONENTS=	qmake_build
19
20
20
USE_QT_VER=	3
21
#.include <bsd.port.pre.mk>
21
MAKE_ENV=	QTDIR="${QT_PREFIX}"
22
23
.include <bsd.port.pre.mk>
24
25
# Add this condititonal while people might still have old versions
26
# of qmake, living in X11BASE, installed. This should go away eventually.
27
28
.if exists(${X11BASE}/share/qt/mkspecs/freebsd-g++)
29
QMAKESPEC=	${X11BASE}/share/qt/mkspecs/freebsd-g++
30
.else
31
QMAKESPEC=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
32
.endif
33
22
34
do-configure:
23
do-configure:
35
	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
24
	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake-qt4 \
36
		-spec ${QMAKESPEC} vym.pro
25
		-spec ${QMAKESPEC} vym.pro
37
26
38
do-install:
27
do-install:
39
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
28
	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
40
	@${MKDIR} ${DATADIR}
29
	@${MKDIR} ${DATADIR}
41
	@${CP} -R ${WRKSRC}/flags ${DATADIR}
30
.for dir in exports flags icons lang macros scripts styles
42
	@${CP} -R ${WRKSRC}/icons ${DATADIR}
31
	@cd ${WRKSRC} && \
43
	@${CP} -R ${WRKSRC}/scripts ${DATADIR}
32
	    ${FIND} ${dir} -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \
44
	@${CP} -R ${WRKSRC}/styles ${DATADIR}
33
	    ${FIND} ${dir} -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
34
.endfor
45
.if !defined(NOPORTDOCS)
35
.if !defined(NOPORTDOCS)
46
	@${MKDIR} ${DOCSDIR}
36
	@${MKDIR} ${DOCSDIR}
37
	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
47
	@${MKDIR} ${EXAMPLESDIR}
38
	@${MKDIR} ${EXAMPLESDIR}
48
	@${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
39
	@${INSTALL_DATA} ${WRKSRC}/demos/* ${EXAMPLESDIR}
49
	@${CP} -R ${WRKSRC}/demos/* ${EXAMPLESDIR}
50
.endif
40
.endif
51
41
52
.include <bsd.port.post.mk>
42
#.include <bsd.port.post.mk>
43
44
.include <bsd.port.mk>
(-)vym/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (vym-1.8.1.tar.gz) = de461aef063a3a3a528669715611257e
1
MD5 (vym-1.10.0.tar.bz2) = 188f08f2e0af5e122e2613351f3b92d9
2
SHA256 (vym-1.8.1.tar.gz) = 2a5a2d27a4f9345f4feba4d6a2b3a5a9d27be71969c541e19c20376b79ac0279
2
SHA256 (vym-1.10.0.tar.bz2) = e8fe5ab9b2a7a52cfe69ce53f5fc8b711ee485688f61287e332db925a937e70f
3
SIZE (vym-1.8.1.tar.gz) = 1377030
3
SIZE (vym-1.10.0.tar.bz2) = 2801600
(-)vym/files/patch-edixlinkdialog.ui.h (-11 lines)
Lines 1-11 Link Here
1
--- editxlinkdialog.ui.h.orig	Wed May 18 09:39:51 2005
2
+++ editxlinkdialog.ui.h	Fri Sep 16 22:24:33 2005
3
@@ -6,6 +6,8 @@
4
 ** init() function in place of a constructor, and a destroy() function in
5
 ** place of a destructor.
6
 *****************************************************************************/
7
+#include <typeinfo>
8
+
9
 void EditXLinkDialog::init()
10
 {
11
 	delink=false;
(-)vym/files/patch-file.cpp (-10 lines)
Lines 1-10 Link Here
1
--- file.cpp.orig	Thu Mar 23 13:38:54 2006
2
+++ file.cpp	Mon Sep  4 08:23:18 2006
3
@@ -5,6 +5,7 @@
4
 #include "file.h"
5
 #include "process.h"
6
 
7
+#include <unistd.h>
8
 
9
 QString maskPath(QString p)
10
 {
(-)vym/files/patch-linkablemapobj.cpp (-8 lines)
Lines 1-8 Link Here
1
--- linkablemapobj.cpp.orig	Fri Jul  8 09:24:42 2005
2
+++ linkablemapobj.cpp	Sat Aug  6 17:22:48 2005
3
@@ -1,3 +1,5 @@
4
+#include <math.h>
5
+
6
 #include "linkablemapobj.h"
7
 #include "branchobj.h"
8
 #include "mapeditor.h"
(-)vym/files/patch-mainwindow.cpp (-21 / +18 lines)
Lines 1-22 Link Here
1
--- mainwindow.cpp.orig	Mon Jul 11 21:55:32 2005
1
--- mainwindow.cpp.orig	Tue Sep  4 15:53:33 2007
2
+++ mainwindow.cpp	Sat Aug  6 17:20:39 2005
2
+++ mainwindow.cpp	Tue Jan  1 20:35:11 2008
3
@@ -57,6 +57,8 @@
3
@@ -140,7 +140,7 @@
4
 #include "settings.h"
4
 			#if defined(Q_OS_MACX)
5
 #include "options.h"
5
 				s=settings.value (p,"/usr/bin/open").toString();
6
 			#else
7
-				s=settings.value (p,"mozilla");
8
+				s=settings.value (p,"mozilla").toString();
9
 			#endif
10
 		#endif
11
 		settings.setValue( p,s);
12
@@ -3637,6 +3637,7 @@
13
 	searchList << "doc/tex";	// Easy testing working on vym.tex
14
 	searchList << "/usr/share/doc/vym";	// Debian
15
 	searchList << "/usr/share/doc/packages";// Knoppix
16
+	searchList << "/usr/local/share/doc/vym"; //FreeBSD
6
 
17
 
7
+#include <unistd.h>
18
 	bool found=false;
8
+
19
 	QFile docfile;
9
 extern TextEditor *textEditor;
10
 extern Main *mainWindow;
11
 extern int statusbarTime;
12
@@ -2322,7 +2324,9 @@
13
 		docpath="./vym.app/Contents/vym.pdf";
14
 	#else
15
 		// default path in SUSE LINUX
16
-		docpath="/usr/share/doc/packages/vym/doc/vym.pdf";
17
+//		docpath="/usr/share/doc/packages/vym/doc/vym.pdf";
18
+		// default path in FreeBSD
19
+		docpath="/usr/local/share/doc/vym/vym.pdf";
20
 	#endif
21
 
22
 	if (!QFile (docpath).exists() )
(-)vym/files/patch-mapeditor.cpp (-11 lines)
Lines 1-11 Link Here
1
--- mapeditor.cpp.orig	Wed Jul 13 13:36:14 2005
2
+++ mapeditor.cpp	Sat Aug  6 17:19:14 2005
3
@@ -58,6 +58,8 @@
4
 #include "icons/flag-flash.xpm"
5
 #include "icons/flag-lifebelt.xpm"
6
 
7
+#include <unistd.h>
8
+
9
 extern TextEditor *textEditor;
10
 extern int statusbarTime;
11
 extern Main *mainWindow;
(-)vym/files/patch-misc.cpp (-11 lines)
Lines 1-11 Link Here
1
--- misc.cpp.orig	Fri Jul  8 09:24:43 2005
2
+++ misc.cpp	Sat Aug  6 17:14:20 2005
3
@@ -1,6 +1,8 @@
4
 #include <qregexp.h>
5
 #include <qpoint.h>
6
 
7
+#include <math.h>
8
+
9
 #include "misc.h"
10
 
11
 
(-)vym/files/patch-xml.cpp (-10 lines)
Lines 1-10 Link Here
1
--- xml.cpp.orig	Fri Jul  8 09:24:43 2005
2
+++ xml.cpp	Sat Aug  6 17:19:33 2005
3
@@ -4,6 +4,7 @@
4
 #include <qcolor.h>
5
 #include <qstylesheet.h>
6
 #include <iostream>
7
+#include <typeinfo>
8
 
9
 #include "misc.h"
10
 #include "settings.h"
(-)vym/pkg-plist (-7 / +82 lines)
Lines 1-4 Link Here
1
bin/vym
1
bin/vym
2
%%DATADIR%%/exports/template-orange-blue/META-INF/manifest.xml
3
%%DATADIR%%/exports/template-orange-blue/Pictures/1000000000000040000000400142E835.png
4
%%DATADIR%%/exports/template-orange-blue/Thumbnails/thumbnail.png
5
%%DATADIR%%/exports/template-orange-blue/content-template.xml
6
%%DATADIR%%/exports/template-orange-blue/content.xml
7
%%DATADIR%%/exports/template-orange-blue/meta.xml
8
%%DATADIR%%/exports/template-orange-blue/styles.xml
9
%%DATADIR%%/exports/template-orange-blue/settings.xml
10
%%DATADIR%%/exports/template-orange-blue/page-template.xml
11
%%DATADIR%%/exports/template-orange-blue/mimetype
12
%%DATADIR%%/exports/orange-blue.conf
13
%%DATADIR%%/flags/freemind/attach.png
14
%%DATADIR%%/flags/freemind/back.png
15
%%DATADIR%%/flags/freemind/bell.png
16
%%DATADIR%%/flags/freemind/bookmark.png
17
%%DATADIR%%/flags/freemind/clanbomber.png
18
%%DATADIR%%/flags/freemind/desktopnew.png
19
%%DATADIR%%/flags/freemind/flag.png
20
%%DATADIR%%/flags/freemind/forward.png
21
%%DATADIR%%/flags/freemind/gohome.png
22
%%DATADIR%%/flags/freemind/help.png
23
%%DATADIR%%/flags/freemind/idea.png
24
%%DATADIR%%/flags/freemind/kaddressbook.png
25
%%DATADIR%%/flags/freemind/knotify.png
26
%%DATADIR%%/flags/freemind/korn.png
27
%%DATADIR%%/flags/freemind/mail.png
28
%%DATADIR%%/flags/freemind/licq.png
29
%%DATADIR%%/flags/freemind/password.png
30
%%DATADIR%%/flags/freemind/pencil.png
31
%%DATADIR%%/flags/freemind/penguin.png
32
%%DATADIR%%/flags/freemind/priority-1.png
33
%%DATADIR%%/flags/freemind/priority-2.png
34
%%DATADIR%%/flags/freemind/priority-3.png
35
%%DATADIR%%/flags/freemind/priority-4.png
36
%%DATADIR%%/flags/freemind/priority-5.png
37
%%DATADIR%%/flags/freemind/priority-6.png
38
%%DATADIR%%/flags/freemind/priority-7.png
39
%%DATADIR%%/flags/freemind/stop.png
40
%%DATADIR%%/flags/freemind/warning.png
41
%%DATADIR%%/flags/freemind/wizard.png
42
%%DATADIR%%/flags/freemind/xmag.png
2
%%DATADIR%%/flags/flag-arrow-2down.png
43
%%DATADIR%%/flags/flag-arrow-2down.png
3
%%DATADIR%%/flags/flag-arrow-2up.png
44
%%DATADIR%%/flags/flag-arrow-2up.png
4
%%DATADIR%%/flags/flag-arrow-down.png
45
%%DATADIR%%/flags/flag-arrow-down.png
Lines 34-41 Link Here
34
%%DATADIR%%/icons/cursor16.xcf
75
%%DATADIR%%/icons/cursor16.xcf
35
%%DATADIR%%/icons/cursorcolorpicker.png
76
%%DATADIR%%/icons/cursorcolorpicker.png
36
%%DATADIR%%/icons/cursorcolorpicker16.png
77
%%DATADIR%%/icons/cursorcolorpicker16.png
78
%%DATADIR%%/icons/cursorcopy.png
37
%%DATADIR%%/icons/cursorhandopen.png
79
%%DATADIR%%/icons/cursorhandopen.png
38
%%DATADIR%%/icons/cursorhandopen16.png
80
%%DATADIR%%/icons/cursorhandopen16.png
81
%%DATADIR%%/icons/cursorxlink.png
39
%%DATADIR%%/icons/down.png
82
%%DATADIR%%/icons/down.png
40
%%DATADIR%%/icons/editcopy.png
83
%%DATADIR%%/icons/editcopy.png
41
%%DATADIR%%/icons/editcut.png
84
%%DATADIR%%/icons/editcut.png
Lines 44-63 Link Here
44
%%DATADIR%%/icons/exit.png
87
%%DATADIR%%/icons/exit.png
45
%%DATADIR%%/icons/fileclose.png
88
%%DATADIR%%/icons/fileclose.png
46
%%DATADIR%%/icons/filenew.png
89
%%DATADIR%%/icons/filenew.png
90
%%DATADIR%%/icons/filenewcopy.png
47
%%DATADIR%%/icons/fileopen.png
91
%%DATADIR%%/icons/fileopen.png
48
%%DATADIR%%/icons/fileprint.png
92
%%DATADIR%%/icons/fileprint.png
49
%%DATADIR%%/icons/filesave.png
93
%%DATADIR%%/icons/filesave.png
50
%%DATADIR%%/icons/filesaveas.png
94
%%DATADIR%%/icons/filesaveas.png
51
%%DATADIR%%/icons/find.png
95
%%DATADIR%%/icons/find.png
52
%%DATADIR%%/icons/flag-hideexport.png
53
%%DATADIR%%/icons/flag-url-16x16.png
96
%%DATADIR%%/icons/flag-url-16x16.png
54
%%DATADIR%%/icons/formatcolorbranch.png
97
%%DATADIR%%/icons/formatcolorbranch.png
55
%%DATADIR%%/icons/formatcoloritem.png
56
%%DATADIR%%/icons/formatcoloritem.xpm
57
%%DATADIR%%/icons/formatcolorpicker.png
98
%%DATADIR%%/icons/formatcolorpicker.png
58
%%DATADIR%%/icons/formatcolorpicker.xpm
99
%%DATADIR%%/icons/formatcolorpicker.xpm
100
%%DATADIR%%/icons/formatcolorsubtree.png
59
%%DATADIR%%/icons/formatfixedfont.png
101
%%DATADIR%%/icons/formatfixedfont.png
60
%%DATADIR%%/icons/formatvarfont.png
102
%%DATADIR%%/icons/formatvarfont.png
103
%%DATADIR%%/icons/history.png
61
%%DATADIR%%/icons/icons.xcf
104
%%DATADIR%%/icons/icons.xcf
62
%%DATADIR%%/icons/modecolor.png
105
%%DATADIR%%/icons/modecolor.png
63
%%DATADIR%%/icons/modecopy.png
106
%%DATADIR%%/icons/modecopy.png
Lines 78-94 Link Here
78
%%DATADIR%%/icons/viewmag+.png
121
%%DATADIR%%/icons/viewmag+.png
79
%%DATADIR%%/icons/viewmag-.png
122
%%DATADIR%%/icons/viewmag-.png
80
%%DATADIR%%/icons/viewmag-reset.png
123
%%DATADIR%%/icons/viewmag-reset.png
124
%%DATADIR%%/icons/viewshowsel.png
81
%%DATADIR%%/icons/vym-128x128.png
125
%%DATADIR%%/icons/vym-128x128.png
82
%%DATADIR%%/icons/vym-16x16.png
126
%%DATADIR%%/icons/vym-16x16.png
83
%%DATADIR%%/icons/vym-editor.png
127
%%DATADIR%%/icons/vym-editor.png
128
%%DATADIR%%/icons/vym.icns
84
%%DATADIR%%/icons/vym.png
129
%%DATADIR%%/icons/vym.png
85
%%DATADIR%%/icons/vym.xcf
130
%%DATADIR%%/icons/vym.xcf
86
%%DATADIR%%/icons/vym.xpm
131
%%DATADIR%%/icons/vym.xpm
132
%%DATADIR%%/lang/vym_es.qm
133
%%DATADIR%%/lang/vym_en.qm
134
%%DATADIR%%/lang/vym_en.ts
135
%%DATADIR%%/lang/vym_it.qm
136
%%DATADIR%%/lang/vym_de.qm
137
%%DATADIR%%/lang/vym_it.ts
138
%%DATADIR%%/lang/vym_de.ts
139
%%DATADIR%%/lang/vym_fr.ts
140
%%DATADIR%%/lang/vym_es.ts
141
%%DATADIR%%/macros/macro-3.vys
142
%%DATADIR%%/macros/macro-1.vys
143
%%DATADIR%%/macros/macro-7.vys
144
%%DATADIR%%/macros/macro-12.vys
145
%%DATADIR%%/macros/macro-9.vys
146
%%DATADIR%%/macros/macro-4.vys
147
%%DATADIR%%/macros/macro-2.vys
148
%%DATADIR%%/macros/macro-6.vys
149
%%DATADIR%%/macros/macro-11.vys
150
%%DATADIR%%/macros/macro-8.vys
151
%%DATADIR%%/macros/macro-5.vys
152
%%DATADIR%%/macros/macro-10.vys
87
%%DATADIR%%/scripts/exportvym
153
%%DATADIR%%/scripts/exportvym
88
%%DATADIR%%/scripts/niceXML
154
%%DATADIR%%/scripts/niceXML
155
%%DATADIR%%/scripts/release-mac
89
%%DATADIR%%/scripts/update-bookmarks
156
%%DATADIR%%/scripts/update-bookmarks
90
%%DATADIR%%/scripts/vym2html.sh
91
%%DATADIR%%/scripts/vym2txt.sh
92
%%DATADIR%%/styles/cm.xsl
157
%%DATADIR%%/styles/cm.xsl
93
%%DATADIR%%/styles/kdebookmarks2vym.xsl
158
%%DATADIR%%/styles/kdebookmarks2vym.xsl
94
%%DATADIR%%/styles/mmap2vym.xsl
159
%%DATADIR%%/styles/mmap2vym.xsl
Lines 99-113 Link Here
99
%%DATADIR%%/styles/vym2taskjuggler.xsl
164
%%DATADIR%%/styles/vym2taskjuggler.xsl
100
%%DATADIR%%/styles/vym2txt.xsl
165
%%DATADIR%%/styles/vym2txt.xsl
101
%%DATADIR%%/styles/vym2xhtml.xsl
166
%%DATADIR%%/styles/vym2xhtml.xsl
167
%%PORTDOCS%%%%DOCSDIR%%/vym_es.pdf
102
%%PORTDOCS%%%%DOCSDIR%%/vym.pdf
168
%%PORTDOCS%%%%DOCSDIR%%/vym.pdf
103
%%PORTDOCS%%%%EXAMPLESDIR%%/liveform.vym
169
%%PORTDOCS%%%%EXAMPLESDIR%%/lifeforms.vym
104
%%PORTDOCS%%%%EXAMPLESDIR%%/math.vym
170
%%PORTDOCS%%%%EXAMPLESDIR%%/math.vym
105
%%PORTDOCS%%%%EXAMPLESDIR%%/time-management.vym
171
%%PORTDOCS%%%%EXAMPLESDIR%%/time-management.vym
106
%%PORTDOCS%%%%EXAMPLESDIR%%/todo.vym
172
%%PORTDOCS%%%%EXAMPLESDIR%%/vym-projectplan.vym
107
%%PORTDOCS%%@dirrm %%DOCSDIR%%
173
%%PORTDOCS%%@dirrm %%DOCSDIR%%
108
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
174
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
175
@dirrm %%DATADIR%%/exports/template-orange-blue/Configurations2
176
@dirrm %%DATADIR%%/exports/template-orange-blue/Pictures
177
@dirrm %%DATADIR%%/exports/template-orange-blue/META-INF
178
@dirrm %%DATADIR%%/exports/template-orange-blue/Thumbnails
179
@dirrm %%DATADIR%%/exports/template-orange-blue
180
@dirrm %%DATADIR%%/exports
181
@dirrm %%DATADIR%%/flags/freemind
109
@dirrm %%DATADIR%%/flags
182
@dirrm %%DATADIR%%/flags
110
@dirrm %%DATADIR%%/icons
183
@dirrm %%DATADIR%%/icons
184
@dirrm %%DATADIR%%/lang
185
@dirrm %%DATADIR%%/macros
111
@dirrm %%DATADIR%%/scripts
186
@dirrm %%DATADIR%%/scripts
112
@dirrm %%DATADIR%%/styles/wiki
187
@dirrm %%DATADIR%%/styles/wiki
113
@dirrm %%DATADIR%%/styles
188
@dirrm %%DATADIR%%/styles

Return to bug 119234