Hi, Ports! This update package texmaker to the latest release 2.3. Tested on i386 and amd64.
Comments ? OK ? -- Alexandr Shadchin Index: Makefile =================================================================== RCS file: /cvs/ports/editors/texmaker/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile 2 Mar 2011 14:04:21 -0000 1.10 +++ Makefile 16 Mar 2011 17:30:36 -0000 @@ -2,7 +2,7 @@ # $FreeBSD: ports/editors/texmaker/Makefile,v 1.2 2004/01/09 09:16:33 krion Exp $ COMMENT= LaTeX development environment -DISTNAME= texmaker-2.2.2 +DISTNAME= texmaker-2.3 CATEGORIES= editors HOMEPAGE= http://www.xm1math.net/texmaker/ @@ -35,8 +35,7 @@ FAKE_FLAGS= INSTALL_ROOT=${WRKINST} do-configure: @cd ${WRKSRC} && \ - qmake4 -unix \ - -spec ${MODQT_LIBDIR}/mkspecs/openbsd-g++ \ + qmake4 -spec ${MODQT_LIBDIR}/mkspecs/openbsd-g++ \ PREFIX=${LOCALBASE} \ DESKTOPDIR=${LOCALBASE}/share/applications \ ICONDIR=${LOCALBASE}/share/pixmaps \ Index: distinfo =================================================================== RCS file: /cvs/ports/editors/texmaker/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 2 Mar 2011 14:04:21 -0000 1.5 +++ distinfo 16 Mar 2011 17:30:36 -0000 @@ -1,5 +1,5 @@ -MD5 (texmaker-2.2.2.tar.bz2) = S1NQ8dEqCH7/6+2svD06qg== -RMD160 (texmaker-2.2.2.tar.bz2) = anbmXafI1Uw3ywF630IklCMFcTg= -SHA1 (texmaker-2.2.2.tar.bz2) = /S7UlefYCA1XjA4SHOd7md7GgAQ= -SHA256 (texmaker-2.2.2.tar.bz2) = fmN451Dhq0o9CHQV7a9K4Ae/tUk1aH27D6ZkaNNHUnc= -SIZE (texmaker-2.2.2.tar.bz2) = 4061747 +MD5 (texmaker-2.3.tar.bz2) = qctHJSQzM67a6SVO90OakQ== +RMD160 (texmaker-2.3.tar.bz2) = pNsEy2E105NnGpFu2zwnJCCpjKM= +SHA1 (texmaker-2.3.tar.bz2) = vNIaOhbtCkw4rE3uzinwPQlkQx4= +SHA256 (texmaker-2.3.tar.bz2) = dZNK0v0D8ADmUwbjNtiOUWYoSpIiMS+IeApJJVXMj9g= +SIZE (texmaker-2.3.tar.bz2) = 4364743 Index: patches/patch-latexeditor_h =================================================================== RCS file: /cvs/ports/editors/texmaker/patches/patch-latexeditor_h,v retrieving revision 1.2 diff -u -p -r1.2 patch-latexeditor_h --- patches/patch-latexeditor_h 2 Mar 2011 14:04:21 -0000 1.2 +++ patches/patch-latexeditor_h 16 Mar 2011 17:30:36 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-latexeditor_h,v 1.2 2011/03/02 14:04:21 shadchin Exp $ ---- latexeditor.h.orig Sun Feb 13 03:23:26 2011 -+++ latexeditor.h Tue Feb 15 02:03:58 2011 -@@ -23,7 +23,7 @@ - #include <QCompleter> +--- latexeditor.h.orig Sat Mar 12 11:37:08 2011 ++++ latexeditor.h Wed Mar 16 22:12:04 2011 +@@ -26,7 +26,7 @@ + #include <QTimer> #include "latexhighlighter.h" -#include "hunspell/hunspell.hxx" +#include <hunspell.hxx> - //class QCompleter; - //class ParenMatcher; + typedef int UserBookmarkList[3]; + Index: patches/patch-latexhighlighter_h =================================================================== RCS file: /cvs/ports/editors/texmaker/patches/patch-latexhighlighter_h,v retrieving revision 1.1 diff -u -p -r1.1 patch-latexhighlighter_h --- patches/patch-latexhighlighter_h 27 Oct 2010 08:52:47 -0000 1.1 +++ patches/patch-latexhighlighter_h 16 Mar 2011 17:30:36 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-latexhighlighter_h,v 1.1 2010/10/27 08:52:47 sthen Exp $ ---- latexhighlighter.h.orig Sat Feb 6 17:20:42 2010 -+++ latexhighlighter.h Sat Feb 6 17:20:57 2010 -@@ -19,7 +19,7 @@ - #include <QTextCharFormat> +--- latexhighlighter.h.orig Sat Mar 5 13:19:04 2011 ++++ latexhighlighter.h Wed Mar 16 22:14:39 2011 +@@ -20,7 +20,7 @@ #include <QColor> #include <QTextBlockUserData> + //#include "latexeditor.h" -#include "hunspell/hunspell.hxx" +#include <hunspell.hxx> class QTextDocument; - + class LatexEditor; Index: patches/patch-texmaker_cpp =================================================================== RCS file: /cvs/ports/editors/texmaker/patches/patch-texmaker_cpp,v retrieving revision 1.2 diff -u -p -r1.2 patch-texmaker_cpp --- patches/patch-texmaker_cpp 2 Mar 2011 14:04:21 -0000 1.2 +++ patches/patch-texmaker_cpp 16 Mar 2011 17:30:36 -0000 @@ -1,16 +1,16 @@ $OpenBSD: patch-texmaker_cpp,v 1.2 2011/03/02 14:04:21 shadchin Exp $ ---- texmaker.cpp.orig Mon Feb 14 14:14:00 2011 -+++ texmaker.cpp Tue Feb 15 02:00:44 2011 -@@ -2836,7 +2836,7 @@ makeidx_package=config->value( "Quick/MakeIndex",false - author=config->value("Quick/Author","").toString(); - - #if defined( Q_WS_X11 ) +--- texmaker.cpp.orig Sun Mar 13 23:35:01 2011 ++++ texmaker.cpp Wed Mar 16 22:14:15 2011 +@@ -3195,7 +3195,7 @@ author=config->value("Quick/Author","").toString(); + #ifdef USB_VERSION + QString dicDir=QCoreApplication::applicationDirPath() + "/"; + #else -QString dicDir=PREFIX"/share/texmaker/"; +QString dicDir=PREFIX"/share/hunspell/"; #endif - #if defined( Q_WS_MACX ) - QString dicDir=QCoreApplication::applicationDirPath() + "/../Resources/"; -@@ -2846,7 +2846,7 @@ QString dicDir=QCoreApplication::applicationDirPath() + + #endif +@@ -3207,7 +3207,7 @@ QString dicDir=QCoreApplication::applicationDirPath() #endif QString defaultDic=dicDir+QString(QLocale::system().name())+".dic"; QFileInfo fi(defaultDic); Index: patches/patch-texmaker_h =================================================================== RCS file: /cvs/ports/editors/texmaker/patches/patch-texmaker_h,v retrieving revision 1.1 diff -u -p -r1.1 patch-texmaker_h --- patches/patch-texmaker_h 27 Oct 2010 08:52:47 -0000 1.1 +++ patches/patch-texmaker_h 16 Mar 2011 17:30:36 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-texmaker_h,v 1.1 2010/10/27 08:52:47 sthen Exp $ ---- texmaker.h.orig Thu Jul 22 23:18:06 2010 -+++ texmaker.h Fri Jul 30 21:09:54 2010 -@@ -43,7 +43,7 @@ +--- texmaker.h.orig Sat Mar 12 16:18:43 2011 ++++ texmaker.h Wed Mar 16 22:12:04 2011 +@@ -44,7 +44,7 @@ #include "logeditor.h" #include "gotolinedialog.h" #include "replacedialog.h" @@ -9,4 +9,4 @@ $OpenBSD: patch-texmaker_h,v 1.1 2010/10 +#include <hunspell.hxx> #include "browser.h" #include "pdfviewer.h" - + #include "encodingprober/qencodingprober.h" Index: patches/patch-texmaker_pro =================================================================== RCS file: /cvs/ports/editors/texmaker/patches/patch-texmaker_pro,v retrieving revision 1.2 diff -u -p -r1.2 patch-texmaker_pro --- patches/patch-texmaker_pro 2 Mar 2011 14:04:21 -0000 1.2 +++ patches/patch-texmaker_pro 16 Mar 2011 17:30:36 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-texmaker_pro,v 1.2 2011/03/02 14:04:21 shadchin Exp $ ---- texmaker.pro.orig Mon Feb 14 03:32:41 2011 -+++ texmaker.pro Tue Feb 15 02:01:52 2011 +--- texmaker.pro.orig Sun Mar 13 13:30:30 2011 ++++ texmaker.pro Wed Mar 16 22:13:09 2011 @@ -4,7 +4,8 @@ TARGET = texmaker QT += network \ xml \ @@ -8,11 +8,11 @@ $OpenBSD: patch-texmaker_pro,v 1.2 2011/ -CONFIG += qt warn_off release +CONFIG += qt warn_off release link_pkgconfig +PKGCONFIG = hunspell poppler-qt4 - TEXMAKERVERSION=2.2.2 + TEXMAKERVERSION=2.3 DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\" DEFINES += HAVE_SPLASH @@ -53,25 +54,6 @@ HEADERS += texmaker.h \ - userquickdialog.h \ + encodingdialog.h \ synctex_parser.h \ synctex_parser_utils.h \ - hunspell/affentry.hxx \ @@ -37,8 +37,8 @@ $OpenBSD: patch-texmaker_pro,v 1.2 2011/ singleapp/qtlocalpeer.h \ singleapp/qtlockedfile.h \ singleapp/qtsingleapplication.h \ -@@ -120,18 +102,6 @@ SOURCES += main.cpp \ - userquickdialog.cpp \ +@@ -144,18 +126,6 @@ SOURCES += main.cpp \ + encodingdialog.cpp \ synctex_parser.c \ synctex_parser_utils.c \ - hunspell/affentry.cxx \ @@ -56,7 +56,7 @@ $OpenBSD: patch-texmaker_pro,v 1.2 2011/ singleapp/qtlocalpeer.cpp \ singleapp/qtlockedfile.cpp \ singleapp/qtsingleapplication.cpp \ -@@ -261,23 +231,7 @@ utilities.files = doc/doc1.png \ +@@ -320,23 +290,7 @@ utilities.files = doc/doc1.png \ locale/texmaker_zh_CN.qm \ locale/texmaker_zh_TW.qm \ locale/texmaker_cs.qm \ @@ -79,5 +79,5 @@ $OpenBSD: patch-texmaker_pro,v 1.2 2011/ - dictionaries/README_es_ES.txt + locale/texmaker_nl.qm INSTALLS += utilities + desktop.path = $${DESKTOPDIR} - desktop.files = utilities/texmaker.desktop
