svn commit: r374151 - in head: . editors editors/texmakerx editors/texstudio editors/texstudio/files

Max Brazhnikov makc at FreeBSD.org
Sat Dec 6 20:45:58 UTC 2014 

Author: makc
Date: Sat Dec  6 20:45:55 2014
New Revision: 374151
URL: https://svnweb.freebsd.org/changeset/ports/374151
QAT: https://qat.redports.org/buildarchive/r374151/

Log:
  - Rename editors/texmakerx to editors/texstudio and update it to 2.8.6
  - Pass maintainership to submitter
  - Adjust Qt 4 components
  - Add desktop-file-utils, execinfo, and pkgconfig to USES
  - Drop MAKE_JOBS_UNSAFE
  - Remove stale patches
  - Update port description and comment
  - Remove optional dependencies on print/gv and now non-existent print/xdvik.
    TeXstudio, similar to its ancestor Texmaker, can use Okular or Evince
    or any other viewer defined by user, therefore I see no reason for keeping
    options for particular viewers.
  
  PR:		195346 (based on)
  Submitted by:	Abilio Marques

Added:
  head/editors/texstudio/
     - copied from r374147, head/editors/texmakerx/
  head/editors/texstudio/files/patch-debughelper.cpp   (contents, props changed)
  head/editors/texstudio/files/patch-texstudio.pro   (contents, props changed)
Deleted:
  head/editors/texmakerx/
  head/editors/texstudio/files/patch-qtsingleapplication_qtlocalpeer.cpp
  head/editors/texstudio/files/patch-texmaker.qrc
Modified:
  head/MOVED
  head/editors/Makefile
  head/editors/texstudio/Makefile
  head/editors/texstudio/distinfo
  head/editors/texstudio/pkg-descr
  head/editors/texstudio/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Dec  6 20:44:42 2014	(r374150)
+++ head/MOVED	Sat Dec  6 20:45:55 2014	(r374151)
@@ -7315,3 +7315,4 @@ textproc/sw-hunspell|textproc/sv-hunspel
 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

Modified: head/editors/Makefile
==============================================================================
--- head/editors/Makefile	Sat Dec  6 20:44:42 2014	(r374150)
+++ head/editors/Makefile	Sat Dec  6 20:45:55 2014	(r374151)
@@ -239,7 +239,7 @@
     SUBDIR += tetradraw
     SUBDIR += texmacs
     SUBDIR += texmaker
-    SUBDIR += texmakerx
+    SUBDIR += texstudio
     SUBDIR += textroom
     SUBDIR += texworks
     SUBDIR += thoteditor

Modified: head/editors/texstudio/Makefile
==============================================================================
--- head/editors/texmakerx/Makefile	Sat Dec  6 20:36:01 2014	(r374147)
+++ head/editors/texstudio/Makefile	Sat Dec  6 20:45:55 2014	(r374151)
@@ -1,39 +1,31 @@
-# Created by: lx
 # $FreeBSD$
 
-PORTNAME=	texmakerx
-PORTVERSION=	2.1
-PORTREVISION=	6
+PORTNAME=	texstudio
+PORTVERSION=	2.8.6
 CATEGORIES=	editors
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TexMakerX%20${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S:.0::}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}
 
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	LaTeX IDE derived from Texmaker
+MAINTAINER=	abiliojr at gmail.com
+COMMENT=	Integrated writing environment for creating LaTeX documents
 
 LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler \
 		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
 
-WRKSRC=	${WRKDIR}/${PORTNAME}${PORTVERSION}
-
-USES=		dos2unix qmake
+USES=		desktop-file-utils dos2unix execinfo pkgconfig qmake
+DOS2UNIX_FILES=	${PORTNAME}.pro
 USE_GHOSTSCRIPT_RUN=	yes
-USE_QT4=	gui network xml moc_build rcc_build \
-		uic_build qtestlib script
+USE_QT4=	gui network script svg xml \
+		designer_build moc_build rcc_build uic_build
 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
+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>

Modified: head/editors/texstudio/distinfo
==============================================================================
--- head/editors/texmakerx/distinfo	Sat Dec  6 20:36:01 2014	(r374147)
+++ head/editors/texstudio/distinfo	Sat Dec  6 20:45:55 2014	(r374151)
@@ -1,2 +1,2 @@
-SHA256 (texmakerx-2.1.tar.gz) = 49e6bf7ffb5c2754861dbe9824255de4e6e5374e2f71e54e517cd57c3e31ba66
-SIZE (texmakerx-2.1.tar.gz) = 11824680
+SHA256 (texstudio-2.8.6.tar.gz) = b665040c34ad6cd98d8f6e041393028f115da4dfb5bb8829b49dfa5a96fa755f
+SIZE (texstudio-2.8.6.tar.gz) = 25183578

Added: head/editors/texstudio/files/patch-debughelper.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/texstudio/files/patch-debughelper.cpp	Sat Dec  6 20:45:55 2014	(r374151)
@@ -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]

Added: head/editors/texstudio/files/patch-texstudio.pro
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/texstudio/files/patch-texstudio.pro	Sat Dec  6 20:45:55 2014	(r374151)
@@ -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
+ }
+ 
+ # ################################

Modified: head/editors/texstudio/pkg-descr
==============================================================================
--- head/editors/texmakerx/pkg-descr	Sat Dec  6 20:36:01 2014	(r374147)
+++ head/editors/texstudio/pkg-descr	Sat Dec  6 20:45:55 2014	(r374151)
@@ -1,7 +1,8 @@
-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.
+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://texmakerx.sourceforge.net/
+WWW: http://texstudio.sourceforge.net/

Modified: head/editors/texstudio/pkg-plist
==============================================================================
--- head/editors/texmakerx/pkg-plist	Sat Dec  6 20:36:01 2014	(r374147)
+++ head/editors/texstudio/pkg-plist	Sat Dec  6 20:45:55 2014	(r374151)
@@ -1,4 +1,25 @@
-bin/texmakerx
+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
@@ -12,6 +33,7 @@ bin/texmakerx
 %%DATADIR%%/doc19.png
 %%DATADIR%%/doc2.png
 %%DATADIR%%/doc20.png
+%%DATADIR%%/doc21.png
 %%DATADIR%%/doc3.png
 %%DATADIR%%/doc4.png
 %%DATADIR%%/doc5.png
@@ -19,58 +41,98 @@ bin/texmakerx
 %%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.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%%/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%%/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.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%%/de_DE.aff
-%%DATADIR%%/de_DE.dic
+%%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%%/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
+%%DATADIR%%/usermanual.css
+%%DATADIR%%/usermanual_en.html
+%%DATADIR%%/usermanual_fr.html
+%%DATADIR%%/wizard_figure.png

More information about the svn-ports-head mailing list