Hi, Ports!
This update package Texmaker to the latest release 1.9.9.
Tested on i386.
Comments ? OK ?
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/texmaker/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 10 Aug 2009 06:31:09 -0000 1.5
+++ Makefile 20 Mar 2010 22:07:10 -0000
@@ -2,44 +2,52 @@
# $FreeBSD: ports/editors/texmaker/Makefile,v 1.2 2004/01/09 09:16:33 krion
Exp $
COMMENT= LaTeX development environment
-DISTNAME= texmaker-1.11
-PKGNAME= ${DISTNAME}p0
-CATEGORIES= editors
+DISTNAME= texmaker-1.9.9
+CATEGORIES= editors
HOMEPAGE= http://www.xm1math.net/texmaker/
-MAINTAINER= Thomas Delaet <[email protected]>
+MAINTAINER= Thomas Delaet <[email protected]>
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
+PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 Xext c m pthread pthread-stubs stdc++ xcb
+PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES= ${HOMEPAGE}
EXTRACT_SUFX= .tar.bz2
-MODULES= x11/qt3
-MODQT_MT= Yes
+WANTLIB= ICE SM X11 Xext Xi Xinerama Xrender c expat fontconfig \
+ freetype glib-2.0 gobject-2.0 gthread-2.0 m png pthread
\
+ stdc++ z
+
+MODULES= x11/qt4 devel/gettext
+
+RUN_DEPENDS= ::print/texlive/base \
+ ::devel/desktop-file-utils
+
+LIB_DEPENDS= QtCore,QtGui,QtNetwork,QtXml::x11/qt4 \
+ hunspell-1.2::textproc/hunspell
+
NO_REGRESS= Yes
+FAKE_FLAGS= INSTALL_ROOT=${WRKINST}
+
do-configure:
@cd ${WRKSRC} && \
- qmake-mt -makefile \
+ qmake4 -unix \
-spec ${MODQT_LIBDIR}/mkspecs/openbsd-g++ \
- -unix \
- "LIBS+=-L/usr/local/lib -lm -lqt-mt" \
- "PREFIX=${LOCALBASE}" \
- "INCLUDEPATH+=${MODQT_INCDIR}" \
- "UIC=${MODQT_UIC}" \
- "MOC=${MODQT_MOC}" \
- texmaker.pro && \
- perl -i -pe 's/ -lqt / -lpthread /' Makefile
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/texmaker ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/texmaker
- ${INSTALL_DATA} ${WRKSRC}/utilities/[a-z]* ${PREFIX}/share/texmaker
+ PREFIX=${LOCALBASE} \
+ DESKTOPDIR=${LOCALBASE}/share/applications \
+ ICONDIR=${LOCALBASE}/share/pixmaps \
+ texmaker.pro
+
+post-install:
+ @chown ${BINOWN}:${BINGRP} ${PREFIX}/bin/texmaker
+ @chmod ${BINMODE} ${PREFIX}/bin/texmaker
+ @chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share
+ @find ${PREFIX}/share -type f | \
+ xargs chmod ${SHAREMODE}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/texmaker/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 5 Apr 2007 15:38:08 -0000 1.3
+++ distinfo 20 Mar 2010 22:07:10 -0000
@@ -1,5 +1,5 @@
-MD5 (texmaker-1.11.tar.bz2) = PduRCqVpPzM2NYQuAiPtYg==
-RMD160 (texmaker-1.11.tar.bz2) = FjpkCXHFxfCU3fnOoSGo2etClUc=
-SHA1 (texmaker-1.11.tar.bz2) = 8XjD/b4c4jKTCLfTBfeCVVk5NrE=
-SHA256 (texmaker-1.11.tar.bz2) = 0wt9Z4kl3YTldVlY8Dmf2n2yrsYdltuMo5cXfx81Ers=
-SIZE (texmaker-1.11.tar.bz2) = 697937
+MD5 (texmaker-1.9.9.tar.bz2) = alaveKrIEew6gufTddOIrg==
+RMD160 (texmaker-1.9.9.tar.bz2) = Szuui5G2W3saFqfjFskB1HRFHN8=
+SHA1 (texmaker-1.9.9.tar.bz2) = lHgR/3umOFwk9RGIxlSSlJ73ZzE=
+SHA256 (texmaker-1.9.9.tar.bz2) = SJbvkzsG0FGOKBu0ZlSgKP0qHbFOe8FpZLnmo7xH6k0=
+SIZE (texmaker-1.9.9.tar.bz2) = 3171903
Index: patches/patch-latexeditor_h
===================================================================
RCS file: patches/patch-latexeditor_h
diff -N patches/patch-latexeditor_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-latexeditor_h 20 Mar 2010 22:07:10 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- latexeditor.h.orig Sat Feb 6 17:19:40 2010
++++ latexeditor.h Sat Feb 6 17:19:59 2010
+@@ -22,7 +22,7 @@
+
+ #include "latexhighlighter.h"
+ #include "parenmatcher.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+
+ //class QCompleter;
+ //class ParenMatcher;
Index: patches/patch-latexeditorview_h
===================================================================
RCS file: patches/patch-latexeditorview_h
diff -N patches/patch-latexeditorview_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-latexeditorview_h 20 Mar 2010 22:07:10 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- latexeditorview.h.orig Sat Feb 6 17:20:18 2010
++++ latexeditorview.h Sat Feb 6 17:20:30 2010
+@@ -18,7 +18,7 @@
+ #include "latexeditor.h"
+ #include "linenumberwidget.h"
+ #include "findwidget.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+
+ class LatexEditorView : public QWidget {
+ Q_OBJECT
Index: patches/patch-latexhighlighter_h
===================================================================
RCS file: patches/patch-latexhighlighter_h
diff -N patches/patch-latexhighlighter_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-latexhighlighter_h 20 Mar 2010 22:07:10 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- 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>
+ #include <QColor>
+ #include <QTextBlockUserData>
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+
+ class QTextDocument;
+
Index: patches/patch-spellerdialog_h
===================================================================
RCS file: patches/patch-spellerdialog_h
diff -N patches/patch-spellerdialog_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-spellerdialog_h 20 Mar 2010 22:07:10 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- spellerdialog.h.orig Sat Jan 30 11:45:07 2010
++++ spellerdialog.h Sat Jan 30 11:17:14 2010
+@@ -13,7 +13,7 @@
+
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+
+ #include <QTextCursor>
+
Index: patches/patch-texmaker_cpp
===================================================================
RCS file: patches/patch-texmaker_cpp
diff -N patches/patch-texmaker_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-texmaker_cpp 20 Mar 2010 22:07:10 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- texmaker.cpp.orig Sun Jan 31 01:12:46 2010
++++ texmaker.cpp Sat Feb 6 18:03:18 2010
+@@ -2549,7 +2549,7 @@ makeidx_package=config->value( "Quick/MakeIndex",false
+ author=config->value("Quick/Author","").toString();
+
+ #if defined( Q_WS_X11 )
+-QString dicDir=PREFIX"/share/texmaker/";
++QString dicDir=PREFIX"/share/hunspell/";
+ #endif
+ #if defined( Q_WS_MACX )
+ QString dicDir=QCoreApplication::applicationDirPath() + "/../Resources/";
+@@ -2559,7 +2559,7 @@ QString dicDir=QCoreApplication::applicationDirPath()
+ #endif
+ QString defaultDic=dicDir+QString(QLocale::system().name())+".dic";
+ QFileInfo fi(defaultDic);
+-if (!fi.exists() || !fi.isReadable()) defaultDic=dicDir+"en_GB.dic";
++if (!fi.exists() || !fi.isReadable()) defaultDic=dicDir+"default.dic";
+ spell_dic=config->value("Spell/Dic",defaultDic).toString();
+
+ spell_ignored_words=config->value("Spell/Words","").toString();
Index: patches/patch-texmaker_h
===================================================================
RCS file: patches/patch-texmaker_h
diff -N patches/patch-texmaker_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-texmaker_h 20 Mar 2010 22:07:10 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- texmaker.h.orig Sat Feb 6 17:21:45 2010
++++ texmaker.h Sat Feb 6 17:21:59 2010
+@@ -43,7 +43,7 @@
+ #include "logeditor.h"
+ #include "gotolinedialog.h"
+ #include "replacedialog.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+
+
+
Index: patches/patch-texmaker_pro
===================================================================
RCS file: patches/patch-texmaker_pro
diff -N patches/patch-texmaker_pro
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-texmaker_pro 20 Mar 2010 22:07:10 -0000
@@ -0,0 +1,81 @@
+$OpenBSD$
+--- texmaker.pro.orig Sun Jan 31 17:34:40 2010
++++ texmaker.pro Sat Feb 6 18:05:59 2010
+@@ -3,7 +3,8 @@ LANGUAGE = C++
+ TARGET = texmaker
+ QT += network \
+ xml
+-CONFIG += qt warn_off release
++CONFIG += qt warn_off release link_pkgconfig
++PKGCONFIG = hunspell
+ TEXMAKERVERSION=1.9.9
+ DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
+ ###############################
+@@ -42,25 +43,6 @@ HEADERS += texmaker.h \
+ stylehelper.h \
+ styleanimator.h \
+ keysequencedialog.h \
+- hunspell/affentry.hxx \
+- hunspell/affixmgr.hxx \
+- hunspell/atypes.hxx \
+- hunspell/baseaffix.hxx \
+- hunspell/csutil.hxx \
+- hunspell/dictmgr.hxx \
+- hunspell/hashmgr.hxx \
+- hunspell/htypes.hxx \
+- hunspell/hunspell.hxx \
+- hunspell/hunspell.h \
+- hunspell/langnum.hxx \
+- hunspell/license.hunspell \
+- hunspell/phonet.hxx \
+- hunspell/suggestmgr.hxx \
+- hunspell/license.myspell \
+- hunspell/filemgr.hxx \
+- hunspell/hunzip.hxx \
+- hunspell/replist.hxx \
+- hunspell/w_char.hxx \
+ singleapp/qtlocalpeer.h \
+ singleapp/qtlockedfile.h \
+ singleapp/qtsingleapplication.h \
+@@ -100,18 +82,6 @@ SOURCES += main.cpp \
+ stylehelper.cpp \
+ styleanimator.cpp \
+ keysequencedialog.cpp \
+- hunspell/affentry.cxx \
+- hunspell/affixmgr.cxx \
+- hunspell/csutil.cxx \
+- hunspell/dictmgr.cxx \
+- hunspell/hashmgr.cxx \
+- hunspell/hunspell.cxx \
+- hunspell/phonet.cxx \
+- hunspell/suggestmgr.cxx \
+- hunspell/utf_info.cxx \
+- hunspell/filemgr.cxx \
+- hunspell/replist.cxx \
+- hunspell/hunzip.cxx \
+ singleapp/qtlocalpeer.cpp \
+ singleapp/qtlockedfile.cpp \
+ singleapp/qtsingleapplication.cpp \
+@@ -232,21 +202,7 @@ utilities.files = doc/doc1.png \
+ locale/texmaker_ru.qm \
+ locale/texmaker_zh_CN.qm \
+ locale/texmaker_zh_TW.qm \
+- locale/texmaker_cs.qm \
+- dictionaries/de_DE.aff \
+- dictionaries/de_DE.dic \
+- dictionaries/en_GB.aff \
+- dictionaries/en_GB.dic \
+- dictionaries/es_ES.aff \
+- dictionaries/es_ES.dic \
+- dictionaries/fr_FR.aff \
+- dictionaries/fr_FR.dic \
+- dictionaries/it_IT.aff \
+- dictionaries/it_IT.dic \
+- dictionaries/it_IT_README.txt \
+- dictionaries/README_de_DE_frami.txt \
+- dictionaries/README_DIC_fr_FR.txt \
+- dictionaries/README_es_ES.txt
++ locale/texmaker_cs.qm
+ INSTALLS += utilities
+ desktop.path = $${DESKTOPDIR}
+ desktop.files = utilities/texmaker.desktop
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/texmaker/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 9 Oct 2004 14:43:03 -0000 1.1.1.1
+++ pkg/PLIST 20 Mar 2010 22:07:10 -0000
@@ -1,8 +1,15 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2004/10/09 14:43:03 naddy Exp $
-bin/texmaker
+...@bin bin/texmaker
+share/applications/texmaker.desktop
+share/pixmaps/
+share/pixmaps/texmaker.png
share/texmaker/
-share/texmaker/blank.gif
+share/texmaker/AUTHORS
+share/texmaker/CHANGELOG.txt
+share/texmaker/COPYING
+share/texmaker/blank.png
share/texmaker/doc1.png
+share/texmaker/doc10.png
share/texmaker/doc11.png
share/texmaker/doc12.png
share/texmaker/doc13.png
@@ -10,23 +17,56 @@ share/texmaker/doc14.png
share/texmaker/doc15.png
share/texmaker/doc16.png
share/texmaker/doc17.png
+share/texmaker/doc18.png
+share/texmaker/doc19.png
share/texmaker/doc2.png
+share/texmaker/doc20.png
+share/texmaker/doc21.png
+share/texmaker/doc22.png
share/texmaker/doc3.png
share/texmaker/doc4.png
share/texmaker/doc5.png
share/texmaker/doc6.png
+share/texmaker/doc6bis.png
share/texmaker/doc7.png
share/texmaker/doc8.png
+share/texmaker/doc9.png
share/texmaker/latexhelp.html
share/texmaker/next.gif
share/texmaker/next_d.gif
share/texmaker/prev.gif
share/texmaker/prev_d.gif
share/texmaker/psheader.txt
+share/texmaker/qt_de.qm
+share/texmaker/qt_es.qm
+share/texmaker/qt_fr.qm
+share/texmaker/qt_pt.qm
+share/texmaker/qt_ru.qm
+share/texmaker/qt_zh_CN.qm
+share/texmaker/qt_zh_TW.qm
share/texmaker/style.css
+share/texmaker/texmaker.svg
+share/texmaker/texmaker128x128.png
share/texmaker/texmaker16x16.png
+share/texmaker/texmaker22x22.png
share/texmaker/texmaker32x32.png
share/texmaker/texmaker48x48.png
+share/texmaker/texmaker64x64.png
+share/texmaker/texmaker_ca.qm
+share/texmaker/texmaker_cs.qm
+share/texmaker/texmaker_de.qm
+share/texmaker/texmaker_es.qm
+share/texmaker/texmaker_fa.qm
+share/texmaker/texmaker_fr.qm
+share/texmaker/texmaker_gl.qm
+share/texmaker/texmaker_it.qm
+share/texmaker/texmaker_pt_BR.qm
+share/texmaker/texmaker_ru.qm
+share/texmaker/texmaker_zh_CN.qm
+share/texmaker/texmaker_zh_TW.qm
share/texmaker/up.gif
share/texmaker/up_d.gif
-share/texmaker/usermanual.html
+share/texmaker/usermanual_en.html
+share/texmaker/usermanual_fr.html
+...@exec %D/bin/update-desktop-database
+...@unexec-delete %D/bin/update-desktop-database
