Tue Dec 2 12:16:29 2014 UTC ()
This commit is based on wip/texmaker by Niclas Rosenvik, thanks.
(pkgsrc)
Now option qt5 or qt4 is at PKG_OPTIONS_REQUIRED_GROUPS= qt so that
one of those two should be selected.

(upstream)
update 4.3. to 4.4.1
( Release note at http://www.xm1math.net/texmaker/log.html )

version 4.4 -> 4.4.1 :
Bugs fixed :
- a crash if the "% !TEX encoding=" meta tag is not valid has been fixed
- a bug related to some shorctuts (ctrl+shift+?) has been fixed

Note :
The macosx Lion/Mountain/Maverick package is again compiled with Qt
5.2.1 (two much issues with Qt 5.3.2 webkit and macdeployqt on MacOsX
>=10.10)

version 4.3 -> 4.4 :
Features :
- a new wizard for a standard XeLaTeX document has been added
- a script ("User" menu to execute it) to apply a hard word wrap at 80
  columns to the selected text has been added (will work like the php
  wordwrap() function - just change the textwidth value in the script
  if you need another value)
- the list of furnished scripts is displayed in the "Run Script"
  sub-menu of the "User" menu (if a script is located at the same
  place than the furnished scripts, it will appear automtically in
  this menu)
- support for the meta tags "% !TEX encoding=" and "% !TEX spellcheck"
  has been added (the meta tag "% !TEX root" is already supported)
- .vrb,.listing and .spx extensions have been added to the "Clean"
  command (users requests)
- cs, de, el, hu, pl, ru, se and vi translations have been updated
  (thanks to all the translators)

Bugs fixed :
- the xelatex command is now included in the "Tools" menu
- a bad behavior when spelling the document while a text is selected
  has been fixed (issue 1393)

Note :
- The windows versions are now compiled with poppler 0.26.
- The macosx Lion/Mountain/Maverick package is now compiled with Qt
  5.3.2 and poppler 0.26
- The obsolete macosx 32 bits version is no more furnished (the 4.3
  version will stay available on the download page)


(mef)
diff -r1.46 -r1.47 pkgsrc/editors/texmaker/Makefile
diff -r1.9 -r1.10 pkgsrc/editors/texmaker/PLIST
diff -r1.10 -r1.11 pkgsrc/editors/texmaker/distinfo
diff -r1.1 -r1.2 pkgsrc/editors/texmaker/options.mk

cvs diff -r1.46 -r1.47 pkgsrc/editors/texmaker/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/texmaker/Makefile 2014/11/20 16:04:14 1.46
+++ pkgsrc/editors/texmaker/Makefile 2014/12/02 12:16:29 1.47
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1# $NetBSD: Makefile,v 1.46 2014/11/20 16:04:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.47 2014/12/02 12:16:29 mef Exp $
2 2
3DISTNAME= texmaker-4.3 3DISTNAME= texmaker-4.4.1
4PKGREVISION= 1 
5CATEGORIES= editors 4CATEGORIES= editors
6MASTER_SITES= http://www.xm1math.net/texmaker/ 5MASTER_SITES= http://www.xm1math.net/texmaker/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.xm1math.net/texmaker/ 9HOMEPAGE= http://www.xm1math.net/texmaker/
11COMMENT= LaTeX editor and front end 10COMMENT= LaTeX editor and front end
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14USE_TOOLS+= pkg-config 13USE_TOOLS+= pkg-config
15USE_LANGUAGES= c++ c 14USE_LANGUAGES= c++ c
16USE_LIBTOOL= yes 15USE_LIBTOOL= yes
17 16
18INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} 17INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
19 18
20do-configure: 19do-configure:
21 cd ${WRKSRC} && ${PKGSRC_ENV} ${CONFIGURE_ENV} \ 20 cd ${WRKSRC} && env ${CONFIGURE_ENV} \
22 ${QTDIR}/bin/qmake PREFIX=${PREFIX} texmaker.pro \ 21 ${QTDIR}/bin/qmake PREFIX=${PREFIX} texmaker.pro DESKTOPDIR=${PREFIX}/share/applications ICONDIR=${PREFIX}/share/pixmaps
23 DESKTOPDIR=${PREFIX}/share/applications ICONDIR=${PREFIX}/share/pixmaps 
24 22
25.include "options.mk" 23.include "options.mk"
26 24
27.include "../../print/poppler-includes/buildlink3.mk" 25.include "../../print/poppler-includes/buildlink3.mk"
28.include "../../sysutils/desktop-file-utils/desktopdb.mk" 26.include "../../sysutils/desktop-file-utils/desktopdb.mk"
29.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"

cvs diff -r1.9 -r1.10 pkgsrc/editors/texmaker/PLIST (expand / switch to unified diff)

--- pkgsrc/editors/texmaker/PLIST 2014/11/18 13:20:35 1.9
+++ pkgsrc/editors/texmaker/PLIST 2014/12/02 12:16:29 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.9 2014/11/18 13:20:35 mef Exp $ 1@comment $NetBSD: PLIST,v 1.10 2014/12/02 12:16:29 mef Exp $
2bin/texmaker 2bin/texmaker
3share/applications/texmaker.desktop 3share/applications/texmaker.desktop
4share/pixmaps/texmaker.png 4share/pixmaps/texmaker.png
5share/texmaker/AUTHORS 5share/texmaker/AUTHORS
6share/texmaker/CHANGELOG.txt 6share/texmaker/CHANGELOG.txt
7share/texmaker/COPYING 7share/texmaker/COPYING
8share/texmaker/README_DIC_fr_FR.txt 8share/texmaker/README_DIC_fr_FR.txt
9share/texmaker/README_cs_CZ.txt 9share/texmaker/README_cs_CZ.txt
10share/texmaker/README_de_DE_frami.txt 10share/texmaker/README_de_DE_frami.txt
11share/texmaker/README_en_US.txt 11share/texmaker/README_en_US.txt
12share/texmaker/README_es_ES.txt 12share/texmaker/README_es_ES.txt
13share/texmaker/README_hu_HU.txt 13share/texmaker/README_hu_HU.txt
14share/texmaker/README_pl.txt 14share/texmaker/README_pl.txt
@@ -63,26 +63,27 @@ share/texmaker/doc7.png @@ -63,26 +63,27 @@ share/texmaker/doc7.png
63share/texmaker/doc7hu.png 63share/texmaker/doc7hu.png
64share/texmaker/doc8.png 64share/texmaker/doc8.png
65share/texmaker/doc8hu.png 65share/texmaker/doc8hu.png
66share/texmaker/doc9.png 66share/texmaker/doc9.png
67share/texmaker/doc9hu.png 67share/texmaker/doc9hu.png
68share/texmaker/en_GB.aff 68share/texmaker/en_GB.aff
69share/texmaker/en_GB.dic 69share/texmaker/en_GB.dic
70share/texmaker/en_US.aff 70share/texmaker/en_US.aff
71share/texmaker/en_US.dic 71share/texmaker/en_US.dic
72share/texmaker/es_ES.aff 72share/texmaker/es_ES.aff
73share/texmaker/es_ES.dic 73share/texmaker/es_ES.dic
74share/texmaker/fr_FR.aff 74share/texmaker/fr_FR.aff
75share/texmaker/fr_FR.dic 75share/texmaker/fr_FR.dic
 76share/texmaker/hardwordwrap_selection_80col.tms
76share/texmaker/hu_HU.aff 77share/texmaker/hu_HU.aff
77share/texmaker/hu_HU.dic 78share/texmaker/hu_HU.dic
78share/texmaker/it_IT.aff 79share/texmaker/it_IT.aff
79share/texmaker/it_IT.dic 80share/texmaker/it_IT.dic
80share/texmaker/it_IT_README.txt 81share/texmaker/it_IT_README.txt
81share/texmaker/jquery.atd.textarea.js 82share/texmaker/jquery.atd.textarea.js
82share/texmaker/latexhelp.html 83share/texmaker/latexhelp.html
83share/texmaker/nl_NL.aff 84share/texmaker/nl_NL.aff
84share/texmaker/nl_NL.dic 85share/texmaker/nl_NL.dic
85share/texmaker/pl_PL.aff 86share/texmaker/pl_PL.aff
86share/texmaker/pl_PL.dic 87share/texmaker/pl_PL.dic
87share/texmaker/pt_PT.aff 88share/texmaker/pt_PT.aff
88share/texmaker/pt_PT.dic 89share/texmaker/pt_PT.dic
@@ -113,20 +114,21 @@ share/texmaker/texmaker_fa.qm @@ -113,20 +114,21 @@ share/texmaker/texmaker_fa.qm
113share/texmaker/texmaker_fr.qm 114share/texmaker/texmaker_fr.qm
114share/texmaker/texmaker_gl.qm 115share/texmaker/texmaker_gl.qm
115share/texmaker/texmaker_hu.qm 116share/texmaker/texmaker_hu.qm
116share/texmaker/texmaker_it.qm 117share/texmaker/texmaker_it.qm
117share/texmaker/texmaker_lv.qm 118share/texmaker/texmaker_lv.qm
118share/texmaker/texmaker_nl.qm 119share/texmaker/texmaker_nl.qm
119share/texmaker/texmaker_pl.qm 120share/texmaker/texmaker_pl.qm
120share/texmaker/texmaker_pt.qm 121share/texmaker/texmaker_pt.qm
121share/texmaker/texmaker_pt_BR.qm 122share/texmaker/texmaker_pt_BR.qm
122share/texmaker/texmaker_ru.qm 123share/texmaker/texmaker_ru.qm
123share/texmaker/texmaker_se.qm 124share/texmaker/texmaker_se.qm
124share/texmaker/texmaker_sr.qm 125share/texmaker/texmaker_sr.qm
125share/texmaker/texmaker_uk.qm 126share/texmaker/texmaker_uk.qm
 127share/texmaker/texmaker_vi_VN.qm
126share/texmaker/texmaker_zh_CN.qm 128share/texmaker/texmaker_zh_CN.qm
127share/texmaker/texmaker_zh_TW.qm 129share/texmaker/texmaker_zh_TW.qm
128share/texmaker/titlecase.tms 130share/texmaker/titlecase_selection.tms
129share/texmaker/usermanual_en.html 131share/texmaker/usermanual_en.html
130share/texmaker/usermanual_fr.html 132share/texmaker/usermanual_fr.html
131share/texmaker/usermanual_hu.html 133share/texmaker/usermanual_hu.html
132share/texmaker/usermanual_ru.html 134share/texmaker/usermanual_ru.html

cvs diff -r1.10 -r1.11 pkgsrc/editors/texmaker/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/texmaker/distinfo 2014/11/18 13:20:35 1.10
+++ pkgsrc/editors/texmaker/distinfo 2014/12/02 12:16:29 1.11
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.10 2014/11/18 13:20:35 mef Exp $ 1$NetBSD: distinfo,v 1.11 2014/12/02 12:16:29 mef Exp $
2 2
3SHA1 (texmaker-4.3.tar.bz2) = 1ab421a0f3176e33922e0bde054b6b2c130a35c9 3SHA1 (texmaker-4.4.1.tar.bz2) = cfdf924d2d5a64b415420ad8d389750b11cdda66
4RMD160 (texmaker-4.3.tar.bz2) = 65a473585e2e3e3aef9a173a4d69256c6dbf7f3a 4RMD160 (texmaker-4.4.1.tar.bz2) = 0e7b0f74e408eaa48d0c983083df45dfac1b0759
5Size (texmaker-4.3.tar.bz2) = 11334013 bytes 5Size (texmaker-4.4.1.tar.bz2) = 11274997 bytes

cvs diff -r1.1 -r1.2 pkgsrc/editors/texmaker/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/editors/texmaker/Attic/options.mk 2014/11/18 13:20:35 1.1
+++ pkgsrc/editors/texmaker/Attic/options.mk 2014/12/02 12:16:29 1.2
@@ -1,16 +1,20 @@ @@ -1,16 +1,20 @@
1# $NetBSD: options.mk,v 1.1 2014/11/18 13:20:35 mef Exp $ 1# $NetBSD: options.mk,v 1.2 2014/12/02 12:16:29 mef Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.texmaker 4PKG_OPTIONS_VAR= PKG_OPTIONS.texmaker
5PKG_SUPPORTED_OPTIONS= qt5 5PKG_OPTIONS_REQUIRED_GROUPS= qt
 6PKG_OPTIONS_GROUP.qt = qt4 qt5
 7PKG_SUGGESTED_OPTIONS= qt4
6.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
7 9
8.if !empty(PKG_OPTIONS:Mqt5) 10.if !empty(PKG_OPTIONS:Mqt5)
9.include "../../x11/qt5-qtscript/buildlink3.mk" 11.include "../../x11/qt5-qtscript/buildlink3.mk"
10.include "../../x11/qt5-qtwebkit/buildlink3.mk" 12.include "../../x11/qt5-qtwebkit/buildlink3.mk"
11.include "../../print/poppler-qt5/buildlink3.mk" 13.include "../../print/poppler-qt5/buildlink3.mk"
12.else 14.endif
 15
 16.if !empty(PKG_OPTIONS:Mqt4)
13.include "../../x11/qt4-libs/buildlink3.mk" 17.include "../../x11/qt4-libs/buildlink3.mk"
14.include "../../x11/qt4-tools/buildlink3.mk" 18.include "../../x11/qt4-tools/buildlink3.mk"
15.include "../../print/poppler-qt4/buildlink3.mk" 19.include "../../print/poppler-qt4/buildlink3.mk"
16.endif 20.endif