aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--editors/Makefile2
-rw-r--r--editors/texmakerx/Makefile39
-rw-r--r--editors/texmakerx/distinfo2
-rw-r--r--editors/texmakerx/files/patch-qtsingleapplication_qtlocalpeer.cpp10
-rw-r--r--editors/texmakerx/files/patch-texmaker.qrc10
-rw-r--r--editors/texmakerx/pkg-descr7
-rw-r--r--editors/texmakerx/pkg-plist76
-rw-r--r--editors/texstudio/Makefile31
-rw-r--r--editors/texstudio/distinfo2
-rw-r--r--editors/texstudio/files/patch-debughelper.cpp32
-rw-r--r--editors/texstudio/files/patch-texstudio.pro12
-rw-r--r--editors/texstudio/pkg-descr8
-rw-r--r--editors/texstudio/pkg-plist138
14 files changed, 225 insertions, 145 deletions
diff --git a/MOVED b/MOVED
index cf8964c4f3ab..cba899e0d93c 100644
--- a/MOVED
+++ b/MOVED
@@ -7315,3 +7315,4 @@ textproc/sw-hunspell|textproc/sv-hunspell|2014-12-02|Swedish is sv not sw
deskutils/gnome-shell-extension-gtile||2014-12-03|Removed, doesn't work properly
devel/rubygem-rb-readline||2014-12-05|Removed, not needed
ports-mgmt/pib||2014-12-06|Has expired: Does not work with tcl/tk 8.4+, does not support pkgng
+editors/texmakerx|editors/texstudio|2014-12-06|The project has been renamed
diff --git a/editors/Makefile b/editors/Makefile
index f7feeeb34ccb..a0884940814b 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -239,7 +239,7 @@
SUBDIR += tetradraw
SUBDIR += texmacs
SUBDIR += texmaker
- SUBDIR += texmakerx
+ SUBDIR += texstudio
SUBDIR += textroom
SUBDIR += texworks
SUBDIR += thoteditor
diff --git a/editors/texmakerx/Makefile b/editors/texmakerx/Makefile
deleted file mode 100644
index 1320f08a6aa5..000000000000
--- a/editors/texmakerx/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by: lx
-# $FreeBSD$
-
-PORTNAME= texmakerx
-PORTVERSION= 2.1
-PORTREVISION= 6
-CATEGORIES= editors
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TexMakerX%20${PORTVERSION}
-DISTNAME= ${PORTNAME}-${PORTVERSION:S:.0::}
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= LaTeX IDE derived from Texmaker
-
-LIB_DEPENDS= libpoppler.so:${PORTSDIR}/graphics/poppler \
- libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
-
-WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}
-
-USES= dos2unix qmake
-USE_GHOSTSCRIPT_RUN= yes
-USE_QT4= gui network xml moc_build rcc_build \
- uic_build qtestlib script
-USE_TEX= latex dvipsk
-INSTALLS_ICONS= yes
-MAKE_JOBS_UNSAFE= yes
-
-OPTIONS_DEFINE= XDVI GV
-GV_DESC= View ps files with gv
-GV_RUN_DEPENDS= xdvi:${PORTSDIR}/print/xdvik
-XDVI_DESC= View dvi files with xdvi
-XDVI_RUN_DEPENDS= gv:${PORTSDIR}/print/gv
-
-post-patch:
- @${REINPLACE_CMD} -e 's,^\(utilities.path =\).*,\1 ${DATADIR},' \
- -e 's,/usr/include,${LOCALBASE}/include,g' \
- -e 's,/usr/lib,${LOCALBASE}/lib,g' \
- ${WRKSRC}/${PORTNAME}.pro
-
-.include <bsd.port.mk>
diff --git a/editors/texmakerx/distinfo b/editors/texmakerx/distinfo
deleted file mode 100644
index ac852fd921d3..000000000000
--- a/editors/texmakerx/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (texmakerx-2.1.tar.gz) = 49e6bf7ffb5c2754861dbe9824255de4e6e5374e2f71e54e517cd57c3e31ba66
-SIZE (texmakerx-2.1.tar.gz) = 11824680
diff --git a/editors/texmakerx/files/patch-qtsingleapplication_qtlocalpeer.cpp b/editors/texmakerx/files/patch-qtsingleapplication_qtlocalpeer.cpp
deleted file mode 100644
index f2680b978522..000000000000
--- a/editors/texmakerx/files/patch-qtsingleapplication_qtlocalpeer.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- qtsingleapplication/qtlocalpeer.cpp.orig 2013-10-02 07:36:54.000000000 +0000
-+++ qtsingleapplication/qtlocalpeer.cpp
-@@ -56,6 +56,7 @@ typedef BOOL(WINAPI*PProcessIdToSessionI
- static PProcessIdToSessionId pProcessIdToSessionId = 0;
- #endif
- #if defined(Q_OS_UNIX)
-+#include <unistd.h>
- #include <time.h>
- #endif
-
diff --git a/editors/texmakerx/files/patch-texmaker.qrc b/editors/texmakerx/files/patch-texmaker.qrc
deleted file mode 100644
index 9f956e22084f..000000000000
--- a/editors/texmakerx/files/patch-texmaker.qrc
+++ /dev/null
@@ -1,10 +0,0 @@
---- texmaker.qrc.orig 2010-12-15 21:30:17.000000000 +0300
-+++ texmaker.qrc 2010-12-15 21:30:32.000000000 +0300
-@@ -1411,7 +1411,6 @@
- <file>symbols/wasysym/img111wasysym.png</file>
- <file>symbols/wasysym/img112wasysym.png</file>
- <file>templates/template_Article.tex</file>
-- <file>templates/template_Article(French).tex</file>
- <file>templates/template_Beamer.tex</file>
- <file>templates/template_Book.tex</file>
- <file>templates/template_HA-prosper.tex</file>
diff --git a/editors/texmakerx/pkg-descr b/editors/texmakerx/pkg-descr
deleted file mode 100644
index c866b2387c38..000000000000
--- a/editors/texmakerx/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-TexmakerX is a plain fork of the Free LaTeX IDE Texmaker. The editor
-itself has been replaced with the more powerful QCodeEdit library,
-giving you a lot of extended ways to write your documents. TexmakerX
-extends the Texmaker editor to add new features like interactive
-spellchecking and code folding.
-
-WWW: http://texmakerx.sourceforge.net/
diff --git a/editors/texmakerx/pkg-plist b/editors/texmakerx/pkg-plist
deleted file mode 100644
index 6cadd3702ef1..000000000000
--- a/editors/texmakerx/pkg-plist
+++ /dev/null
@@ -1,76 +0,0 @@
-bin/texmakerx
-%%DATADIR%%/doc1.png
-%%DATADIR%%/doc10.png
-%%DATADIR%%/doc11.png
-%%DATADIR%%/doc12.png
-%%DATADIR%%/doc13.png
-%%DATADIR%%/doc14.png
-%%DATADIR%%/doc15.png
-%%DATADIR%%/doc16.png
-%%DATADIR%%/doc17.png
-%%DATADIR%%/doc18.png
-%%DATADIR%%/doc19.png
-%%DATADIR%%/doc2.png
-%%DATADIR%%/doc20.png
-%%DATADIR%%/doc3.png
-%%DATADIR%%/doc4.png
-%%DATADIR%%/doc5.png
-%%DATADIR%%/doc6.png
-%%DATADIR%%/doc7.png
-%%DATADIR%%/doc8.png
-%%DATADIR%%/doc9.png
-%%DATADIR%%/latexhelp.html
-%%DATADIR%%/AUTHORS
-%%DATADIR%%/qt_fr.qm
-%%DATADIR%%/qt_de.qm
-%%DATADIR%%/usermanual_en.html
-%%DATADIR%%/usermanual_fr.html
-%%DATADIR%%/en_GB.aff
-%%DATADIR%%/en_GB.dic
-%%DATADIR%%/fr_FR.aff
-%%DATADIR%%/fr_FR.dic
-%%DATADIR%%/COPYING
-%%DATADIR%%/CHANGELOG.txt
-%%DATADIR%%/texmaker16x16.png
-%%DATADIR%%/texmaker22x22.png
-%%DATADIR%%/texmaker32x32.png
-%%DATADIR%%/texmaker48x48.png
-%%DATADIR%%/texmaker64x64.png
-%%DATADIR%%/texmaker128x128.png
-share/applications/texmakerx.desktop
-%%DATADIR%%/texmaker.svg
-%%DATADIR%%/texmakerx_de.qm
-%%DATADIR%%/texmakerx_fr.qm
-%%DATADIR%%/texmakerx_it.qm
-%%DATADIR%%/texmakerx_pt_BR.qm
-%%DATADIR%%/template_Article.tex
-%%DATADIR%%/template_Beamer.tex
-%%DATADIR%%/template_Book.tex
-%%DATADIR%%/template_HA-prosper.tex
-%%DATADIR%%/template_Letter.tex
-%%DATADIR%%/template_Prosper.tex
-%%DATADIR%%/template_Report.tex
-%%DATADIR%%/template_Scrartcl.tex
-%%DATADIR%%/template_Scrbook.tex
-%%DATADIR%%/template_Scrlttr2.tex
-%%DATADIR%%/template_Scrreprt.tex
-%%DATADIR%%/de_DE.aff
-%%DATADIR%%/de_DE.dic
-%%DATADIR%%/th_en_US_v2.dat
-%%DATADIR%%/th_fr_FR_v2.dat
-%%DATADIR%%/th_de_DE_v2.dat
-%%DATADIR%%/configure_completion.png
-%%DATADIR%%/configure_customizeMenu.png
-%%DATADIR%%/configure_customToolbar.png
-%%DATADIR%%/configure_editor.png
-%%DATADIR%%/configure_general.png
-%%DATADIR%%/configure_shortcuts.png
-%%DATADIR%%/configure_svn.png
-%%DATADIR%%/template.png
-%%DATADIR%%/thesaurus.png
-%%DATADIR%%/texmakerx_cs.qm
-%%DATADIR%%/texmakerx_hu.qm
-%%DATADIR%%/qt_hu.qm
-%%DATADIR%%/qt_cs.qm
-%%DATADIR%%/en_US.aff
-%%DATADIR%%/en_US.dic
diff --git a/editors/texstudio/Makefile b/editors/texstudio/Makefile
new file mode 100644
index 000000000000..79f216e53fa7
--- /dev/null
+++ b/editors/texstudio/Makefile
@@ -0,0 +1,31 @@
+# $FreeBSD$
+
+PORTNAME= texstudio
+PORTVERSION= 2.8.6
+CATEGORIES= editors
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}
+
+MAINTAINER= abiliojr@gmail.com
+COMMENT= Integrated writing environment for creating LaTeX documents
+
+LIB_DEPENDS= libpoppler.so:${PORTSDIR}/graphics/poppler \
+ libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
+
+USES= desktop-file-utils dos2unix execinfo pkgconfig qmake
+DOS2UNIX_FILES= ${PORTNAME}.pro
+USE_GHOSTSCRIPT_RUN= yes
+USE_QT4= gui network script svg xml \
+ designer_build moc_build rcc_build uic_build
+USE_TEX= latex dvipsk
+INSTALLS_ICONS= yes
+
+WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}
+
+post-patch:
+ @${REINPLACE_CMD} -e 's,^\(utilities.path =\).*,\1 ${DATADIR},' \
+ -e 's,/usr/include,${LOCALBASE}/include,g' \
+ -e 's,/usr/lib,${LOCALBASE}/lib,g' \
+ -e '/appdata.path/s,\/usr,${PREFIX},' \
+ ${WRKSRC}/${PORTNAME}.pro
+
+.include <bsd.port.mk>
diff --git a/editors/texstudio/distinfo b/editors/texstudio/distinfo
new file mode 100644
index 000000000000..82b3aad67019
--- /dev/null
+++ b/editors/texstudio/distinfo
@@ -0,0 +1,2 @@
+SHA256 (texstudio-2.8.6.tar.gz) = b665040c34ad6cd98d8f6e041393028f115da4dfb5bb8829b49dfa5a96fa755f
+SIZE (texstudio-2.8.6.tar.gz) = 25183578
diff --git a/editors/texstudio/files/patch-debughelper.cpp b/editors/texstudio/files/patch-debughelper.cpp
new file mode 100644
index 000000000000..c3dab298f70c
--- /dev/null
+++ b/editors/texstudio/files/patch-debughelper.cpp
@@ -0,0 +1,32 @@
+--- debughelper.cpp.orig 2014-11-22 19:10:03.000000000 -0430
++++ debughelper.cpp 2014-11-22 19:12:01.000000000 -0430
+@@ -107,6 +107,7 @@
+ //===========================CRASH HANDLER HEADER==============================
+
+ #ifdef OS_IS_UNIX_LIKE
++#include "signal.h"
+ #include "unistd.h"
+ #include "sys/wait.h"
+ #define SAFE_INT volatile sig_atomic_t
+@@ -472,11 +473,19 @@
+ #include "pthread.h"
+
+ #define USE_SIGNAL_HANDLER
+-#ifdef CPU_IS_X86_64
++#if (defined(__FreeBSD__) && defined(CPU_IS_X86_64))
++#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_rip
++#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_rsp
++#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_rbp
++#elif (defined(__FreeBSD__) && defined(CPU_IS_X86_32))
++#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_eip
++#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_esp
++#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_ebp
++#elif (!defined(__FreeBSD__) && defined(CPU_IS_X86_64))
+ #define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_RIP]
+ #define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_RSP]
+ #define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_RBP]
+-#elif defined(CPU_IS_X86_32)
++#elif (!defined(__FreeBSD__) && defined(CPU_IS_X86_32))
+ #define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_EIP]
+ #define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_ESP]
+ #define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_EBP]
diff --git a/editors/texstudio/files/patch-texstudio.pro b/editors/texstudio/files/patch-texstudio.pro
new file mode 100644
index 000000000000..42c27199f396
--- /dev/null
+++ b/editors/texstudio/files/patch-texstudio.pro
@@ -0,0 +1,12 @@
+--- texstudio.pro.orig 2014-11-22 18:10:47.000000000 -0430
++++ texstudio.pro 2014-11-22 18:11:56.000000000 -0430
+@@ -529,7 +529,8 @@
+
+ unix {
+ LIBS += -L/usr/lib \
+- -lz
++ -lz \
++ -lexecinfo
+ }
+
+ # ################################
diff --git a/editors/texstudio/pkg-descr b/editors/texstudio/pkg-descr
new file mode 100644
index 000000000000..bc2e891bc4d0
--- /dev/null
+++ b/editors/texstudio/pkg-descr
@@ -0,0 +1,8 @@
+TeXstudio is a fully featured LaTeX editor, designed to make writing
+LaTeX documents as easy and comfortable as possible. Some of the
+outstanding features of TeXstudio are an integrated pdf viewer with
+(almost) word-level synchronization, live inline preview, advanced
+syntax-highlighting, live checking of references, citations, latex
+commands, spelling and grammar.
+
+WWW: http://texstudio.sourceforge.net/
diff --git a/editors/texstudio/pkg-plist b/editors/texstudio/pkg-plist
new file mode 100644
index 000000000000..eb39dc2684f8
--- /dev/null
+++ b/editors/texstudio/pkg-plist
@@ -0,0 +1,138 @@
+bin/texstudio
+share/appdata/texstudio.appdata.xml
+share/applications/texstudio.desktop
+share/icons/hicolor/scalable/apps/texstudio.svg
+%%DATADIR%%/AUTHORS
+%%DATADIR%%/CHANGELOG.txt
+%%DATADIR%%/COPYING
+%%DATADIR%%/block_selection.png
+%%DATADIR%%/compile_toolbar.png
+%%DATADIR%%/configure_build.png
+%%DATADIR%%/configure_completion.png
+%%DATADIR%%/configure_customToolbar.png
+%%DATADIR%%/configure_customizeMenu.png
+%%DATADIR%%/configure_editor.png
+%%DATADIR%%/configure_general.png
+%%DATADIR%%/configure_shortcuts.png
+%%DATADIR%%/configure_svn.png
+%%DATADIR%%/de.badWords
+%%DATADIR%%/de.stopWords
+%%DATADIR%%/de.stopWords.level2
+%%DATADIR%%/de_DE.aff
+%%DATADIR%%/de_DE.dic
+%%DATADIR%%/doc1.png
+%%DATADIR%%/doc10.png
+%%DATADIR%%/doc11.png
+%%DATADIR%%/doc12.png
+%%DATADIR%%/doc13.png
+%%DATADIR%%/doc14.png
+%%DATADIR%%/doc15.png
+%%DATADIR%%/doc16.png
+%%DATADIR%%/doc17.png
+%%DATADIR%%/doc18.png
+%%DATADIR%%/doc19.png
+%%DATADIR%%/doc2.png
+%%DATADIR%%/doc20.png
+%%DATADIR%%/doc21.png
+%%DATADIR%%/doc3.png
+%%DATADIR%%/doc4.png
+%%DATADIR%%/doc5.png
+%%DATADIR%%/doc6.png
+%%DATADIR%%/doc7.png
+%%DATADIR%%/doc8.png
+%%DATADIR%%/doc9.png
+%%DATADIR%%/en.stopWords
+%%DATADIR%%/en_GB.aff
+%%DATADIR%%/en_GB.dic
+%%DATADIR%%/en_US.aff
+%%DATADIR%%/en_US.dic
+%%DATADIR%%/fr.stopWords
+%%DATADIR%%/fr_FR.aff
+%%DATADIR%%/fr_FR.dic
+%%DATADIR%%/hu_HU.aff
+%%DATADIR%%/hu_HU.dic
+%%DATADIR%%/latex2e.css
+%%DATADIR%%/latex2e.html
+%%DATADIR%%/pt_BR.aff
+%%DATADIR%%/pt_BR.dic
+%%DATADIR%%/qt_cs.qm
+%%DATADIR%%/qt_de.qm
+%%DATADIR%%/qt_fr.qm
+%%DATADIR%%/qt_hu.qm
+%%DATADIR%%/qt_ja.qm
+%%DATADIR%%/qt_pl.qm
+%%DATADIR%%/qt_zh.qm
+%%DATADIR%%/spellcheck_menu.png
+%%DATADIR%%/tabletemplate_fullyframed_firstBold.js
+%%DATADIR%%/tabletemplate_fullyframed_firstBold.png
+%%DATADIR%%/tabletemplate_fullyframed_longtable.js
+%%DATADIR%%/tabletemplate_fullyframed_longtable.png
+%%DATADIR%%/tabletemplate_plain_tabular.js
+%%DATADIR%%/tabletemplate_plain_tabular.png
+%%DATADIR%%/tabletemplate_plain_tabularx.js
+%%DATADIR%%/tabletemplate_plain_tabularx.png
+%%DATADIR%%/tabletemplate_rowcolors_tabular.js
+%%DATADIR%%/tabletemplate_rowcolors_tabular.png
+%%DATADIR%%/template.png
+%%DATADIR%%/template_Article.json
+%%DATADIR%%/template_Article.png
+%%DATADIR%%/template_Article.tex
+%%DATADIR%%/template_Article_French.json
+%%DATADIR%%/template_Article_French.png
+%%DATADIR%%/template_Article_French.tex
+%%DATADIR%%/template_Beamer.json
+%%DATADIR%%/template_Beamer.tex
+%%DATADIR%%/template_Book.json
+%%DATADIR%%/template_Book.png
+%%DATADIR%%/template_Book.zip
+%%DATADIR%%/template_HA-prosper.json
+%%DATADIR%%/template_HA-prosper.tex
+%%DATADIR%%/template_Letter.json
+%%DATADIR%%/template_Letter.png
+%%DATADIR%%/template_Letter.tex
+%%DATADIR%%/template_Moderncv.json
+%%DATADIR%%/template_Moderncv.png
+%%DATADIR%%/template_Moderncv.tex
+%%DATADIR%%/template_Moderncv_French.json
+%%DATADIR%%/template_Moderncv_French.png
+%%DATADIR%%/template_Moderncv_French.tex
+%%DATADIR%%/template_Prosper.json
+%%DATADIR%%/template_Prosper.tex
+%%DATADIR%%/template_Report.json
+%%DATADIR%%/template_Report.png
+%%DATADIR%%/template_Report.tex
+%%DATADIR%%/template_Scrartcl.json
+%%DATADIR%%/template_Scrartcl.png
+%%DATADIR%%/template_Scrartcl.tex
+%%DATADIR%%/template_Scrbook.json
+%%DATADIR%%/template_Scrbook.tex
+%%DATADIR%%/template_Scrlttr2.json
+%%DATADIR%%/template_Scrlttr2.tex
+%%DATADIR%%/template_Scrreprt.json
+%%DATADIR%%/template_Scrreprt.tex
+%%DATADIR%%/texstudio128x128.png
+%%DATADIR%%/texstudio16x16.png
+%%DATADIR%%/texstudio22x22.png
+%%DATADIR%%/texstudio32x32.png
+%%DATADIR%%/texstudio48x48.png
+%%DATADIR%%/texstudio64x64.png
+%%DATADIR%%/texstudio_cs.qm
+%%DATADIR%%/texstudio_de.qm
+%%DATADIR%%/texstudio_es.qm
+%%DATADIR%%/texstudio_fr.qm
+%%DATADIR%%/texstudio_hu.qm
+%%DATADIR%%/texstudio_it.qm
+%%DATADIR%%/texstudio_ja.qm
+%%DATADIR%%/texstudio_pl.qm
+%%DATADIR%%/texstudio_pt_BR.qm
+%%DATADIR%%/texstudio_ru.qm
+%%DATADIR%%/texstudio_uk.qm
+%%DATADIR%%/texstudio_zh_CN.qm
+%%DATADIR%%/th_de_DE_v2.dat
+%%DATADIR%%/th_en_US_v2.dat
+%%DATADIR%%/th_fr_FR_v2.dat
+%%DATADIR%%/thesaurus.png
+%%DATADIR%%/usermanual.css
+%%DATADIR%%/usermanual_en.html
+%%DATADIR%%/usermanual_fr.html
+%%DATADIR%%/wizard_figure.png