- update vym to 1.10.0

(switch to qt4 and lots of bug fixes)

ok ajacoutot@
This commit is contained in:
jasper 2008-01-04 16:27:30 +00:00
parent 69770758ef
commit 0ed30ee837
6 changed files with 102 additions and 48 deletions

View File

@ -1,40 +1,44 @@
# $OpenBSD: Makefile,v 1.1.1.1 2007/07/07 17:59:05 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.2 2008/01/04 16:27:30 jasper Exp $
COMMENT= generate and manipulate maps of your thoughts
DISTNAME= vym-1.8.1
DISTNAME= vym-1.10.0
CATEGORIES= productivity x11
HOMEPAGE= http://www.insilmaril.de/vym/
# modified GPL
# modified GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vym/}
EXTRACT_SUFX= .tar.bz2
WANTLIB= X11 Xext c m pthread stdc++
WANTLIB= ICE SM Qt3Support QtGui QtNetwork QtSql QtXml X11 Xcursor Xext \
Xfixes Xi Xinerama Xrandr Xrender c crypto fontconfig freetype \
glib-2.0 gthread-2.0 m png pthread ssl stdc++ z
MODULES= x11/qt3
MODULES= devel/gettext \
x11/qt4
USE_X11= Yes
PORTHOME= ${WRKDIR}
NO_REGRESS= Yes
SHARE_DIRS= flags icons scripts styles
SHARE_DIRS= flags icons scripts styles
pre-configure:
@perl -pi -e 's,!!PREFIX!!,${PREFIX},g' \
${WRKSRC}/mainwindow.cpp \
${WRKSRC}/exportxhtmldialog.ui.h
${WRKSRC}/exportxhtmldialog.cpp
do-configure:
@echo "QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}" \
>> ${WRKSRC}/vym.pro
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
${LOCALBASE}/bin/qmake vym.pro
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
${LOCALBASE}/bin/qmake4 vym.pro
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/vym ${PREFIX}/bin

View File

@ -1,5 +1,5 @@
MD5 (vym-1.8.1.tar.gz) = 3kYa7wY6OjpShmlxVhElfg==
RMD160 (vym-1.8.1.tar.gz) = Y+6aMWJbRO89KKFDF0+Yu/lhtTE=
SHA1 (vym-1.8.1.tar.gz) = OeVlIDvuKlW5fBm2fcOdw6gIXXE=
SHA256 (vym-1.8.1.tar.gz) = KlotJ6T5NF9P66TWorOlqdJ75xlpxUHhnCA3a3msAnk=
SIZE (vym-1.8.1.tar.gz) = 1377030
MD5 (vym-1.10.0.tar.bz2) = GI8I8uCvXhIuJhM1HzuS2Q==
RMD160 (vym-1.10.0.tar.bz2) = LpEs0lQrr+mNx/CuM6dA9XqjwaQ=
SHA1 (vym-1.10.0.tar.bz2) = Gb/bc7obwmM1/F8Ja9Ny2OSrbX8=
SHA256 (vym-1.10.0.tar.bz2) = 6P5aubKnpSz+ac5T9fyLcR7khWiPYSh+My25Jak35w8=
SIZE (vym-1.10.0.tar.bz2) = 2801600

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-exportxhtmldialog_cpp,v 1.1 2008/01/04 16:27:30 jasper Exp $
--- exportxhtmldialog.cpp.orig Wed Jun 20 12:51:44 2007
+++ exportxhtmldialog.cpp Wed Jan 2 10:18:43 2008
@@ -92,9 +92,9 @@ void ExportXHTMLDialog::readSettings()
} else
{
xsl=settings.readLocalEntry
- (filepath,"/export/xhtml/xsl","/usr/share/vym/styles/vym2xhtml.xsl");
+ (filepath,"/export/xhtml/xsl","!!PREFIX!!/share/vym/styles/vym2xhtml.xsl");
css=settings.readLocalEntry
- (filepath,"/export/xhtml/css","/usr/share/vym/styles/vym.css");
+ (filepath,"/export/xhtml/css","!!PREFIX!!/share/vym/styles/vym.css");
}
ui.lineEditXSL->setText(xsl);
ui.lineEditCSS->setText(css);

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-exportxhtmldialog_ui_h,v 1.1.1.1 2007/07/07 17:59:05 ajacoutot Exp $
--- exportxhtmldialog.ui.h.orig Fri Jul 6 23:18:30 2007
+++ exportxhtmldialog.ui.h Fri Jul 6 23:19:17 2007
@@ -71,9 +71,9 @@ void ExportXHTMLDialog::readSettings()
} else
{
xsl=settings.readLocalEntry
- (filepath,"/vym/export/xhtml/xsl","/usr/share/vym/styles/vym2xhtml.xsl");
+ (filepath,"/vym/export/xhtml/xsl","!!PREFIX!!/share/vym/styles/vym2xhtml.xsl");
css=settings.readLocalEntry
- (filepath,"/vym/export/xhtml/css","/usr/share/vym/styles/vym.css");
+ (filepath,"/vym/export/xhtml/css","!!PREFIX!!/share/vym/styles/vym.css");
}
lineEditXSL->setText(xsl);
lineEditCSS->setText(css);

View File

@ -1,12 +1,28 @@
$OpenBSD: patch-mainwindow_cpp,v 1.1.1.1 2007/07/07 17:59:05 ajacoutot Exp $
--- mainwindow.cpp.orig Fri Jul 6 12:33:26 2007
+++ mainwindow.cpp Fri Jul 6 12:34:19 2007
@@ -2764,7 +2764,7 @@ void Main::helpDoc()
docpath="./vym.app/Contents/vym.pdf";
#else
// default path in SUSE LINUX
- docpath="/usr/share/doc/packages/vym/doc/vym.pdf";
+ docpath="!!PREFIX!!/share/doc/vym/vym.pdf";
#endif
$OpenBSD: patch-mainwindow_cpp,v 1.2 2008/01/04 16:27:30 jasper Exp $
--- mainwindow.cpp.orig Tue Sep 4 15:53:33 2007
+++ mainwindow.cpp Wed Jan 2 10:33:45 2008
@@ -3,6 +3,7 @@
#include <QtGui>
if (!QFile (docpath).exists() )
#include <iostream>
+#include <unistd.h>
#include "aboutdialog.h"
#include "branchpropwindow.h"
@@ -140,7 +141,7 @@ Main::Main(QWidget* parent, const char* name, Qt::WFla
#if defined(Q_OS_MACX)
s=settings.value (p,"/usr/bin/open").toString();
#else
- s=settings.value (p,"mozilla");
+ s=settings.value (p,"mozilla").toString();
#endif
#endif
settings.setValue( p,s);
@@ -3637,6 +3638,7 @@ void Main::helpDoc()
searchList << "doc/tex"; // Easy testing working on vym.tex
searchList << "/usr/share/doc/vym"; // Debian
searchList << "/usr/share/doc/packages";// Knoppix
+ searchList << "!!PREFIX!!/share/doc/vym"; // OpenBSD
bool found=false;
QFile docfile;

View File

@ -1,14 +1,21 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/07/07 17:59:05 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.2 2008/01/04 16:27:30 jasper Exp $
bin/vym
share/doc/vym/
share/doc/vym/vym.pdf
share/doc/vym/vym_es.pdf
share/examples/vym/
share/examples/vym/liveform.vym
share/examples/vym/lifeforms.vym
share/examples/vym/math.vym
share/examples/vym/time-management.vym
share/examples/vym/todo.vym
share/examples/vym/vym-projectplan.vym
share/vym/
share/vym/flags/
share/vym/flags/attach.png
share/vym/flags/back.png
share/vym/flags/bell.png
share/vym/flags/bookmark.png
share/vym/flags/clanbomber.png
share/vym/flags/desktopnew.png
share/vym/flags/flag-arrow-2down.png
share/vym/flags/flag-arrow-2up.png
share/vym/flags/flag-arrow-down.png
@ -39,14 +46,40 @@ share/vym/flags/flag-tmpUnscrolled-right.png
share/vym/flags/flag-url-16x16.png
share/vym/flags/flag-url.png
share/vym/flags/flag-vymlink.png
share/vym/flags/flag.png
share/vym/flags/flags.xcf
share/vym/flags/forward.png
share/vym/flags/gohome.png
share/vym/flags/help.png
share/vym/flags/idea.png
share/vym/flags/kaddressbook.png
share/vym/flags/knotify.png
share/vym/flags/korn.png
share/vym/flags/licq.png
share/vym/flags/mail.png
share/vym/flags/password.png
share/vym/flags/pencil.png
share/vym/flags/penguin.png
share/vym/flags/priority-1.png
share/vym/flags/priority-2.png
share/vym/flags/priority-3.png
share/vym/flags/priority-4.png
share/vym/flags/priority-5.png
share/vym/flags/priority-6.png
share/vym/flags/priority-7.png
share/vym/flags/stop.png
share/vym/flags/warning.png
share/vym/flags/wizard.png
share/vym/flags/xmag.png
share/vym/icons/
share/vym/icons/cursor.xcf
share/vym/icons/cursor16.xcf
share/vym/icons/cursorcolorpicker.png
share/vym/icons/cursorcolorpicker16.png
share/vym/icons/cursorcopy.png
share/vym/icons/cursorhandopen.png
share/vym/icons/cursorhandopen16.png
share/vym/icons/cursorxlink.png
share/vym/icons/down.png
share/vym/icons/editcopy.png
share/vym/icons/editcut.png
@ -55,20 +88,20 @@ share/vym/icons/edittrash.png
share/vym/icons/exit.png
share/vym/icons/fileclose.png
share/vym/icons/filenew.png
share/vym/icons/filenewcopy.png
share/vym/icons/fileopen.png
share/vym/icons/fileprint.png
share/vym/icons/filesave.png
share/vym/icons/filesaveas.png
share/vym/icons/find.png
share/vym/icons/flag-hideexport.png
share/vym/icons/flag-url-16x16.png
share/vym/icons/formatcolorbranch.png
share/vym/icons/formatcoloritem.png
share/vym/icons/formatcoloritem.xpm
share/vym/icons/formatcolorpicker.png
share/vym/icons/formatcolorpicker.xpm
share/vym/icons/formatcolorsubtree.png
share/vym/icons/formatfixedfont.png
share/vym/icons/formatvarfont.png
share/vym/icons/history.png
share/vym/icons/icons.xcf
share/vym/icons/modecolor.png
share/vym/icons/modecopy.png
@ -89,18 +122,19 @@ share/vym/icons/up.png
share/vym/icons/viewmag+.png
share/vym/icons/viewmag-.png
share/vym/icons/viewmag-reset.png
share/vym/icons/viewshowsel.png
share/vym/icons/vym-128x128.png
share/vym/icons/vym-16x16.png
share/vym/icons/vym-editor.png
share/vym/icons/vym.icns
share/vym/icons/vym.png
share/vym/icons/vym.xcf
share/vym/icons/vym.xpm
share/vym/scripts/
share/vym/scripts/exportvym
share/vym/scripts/niceXML
share/vym/scripts/release-mac
share/vym/scripts/update-bookmarks
share/vym/scripts/vym2html.sh
share/vym/scripts/vym2txt.sh
share/vym/styles/
share/vym/styles/cm.xsl
share/vym/styles/kdebookmarks2vym.xsl