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)

4 files changed, 19 insertions, 15 deletions

diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index de2b9516a57..e7bb59136d7 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2014/11/20 16:04:14 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2014/12/02 12:16:29 mef Exp $
 
-DISTNAME=	texmaker-4.3
-PKGREVISION=	1
+DISTNAME=	texmaker-4.4.1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.xm1math.net/texmaker/
 EXTRACT_SUFX=	.tar.bz2
@@ -18,9 +17,8 @@ USE_LIBTOOL=	yes
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
 
 do-configure:
-	cd ${WRKSRC} && ${PKGSRC_ENV} ${CONFIGURE_ENV} \
-	${QTDIR}/bin/qmake PREFIX=${PREFIX} texmaker.pro \
-	DESKTOPDIR=${PREFIX}/share/applications ICONDIR=${PREFIX}/share/pixmaps
+	cd ${WRKSRC} && env ${CONFIGURE_ENV} \
+	${QTDIR}/bin/qmake PREFIX=${PREFIX} texmaker.pro DESKTOPDIR=${PREFIX}/share/applications ICONDIR=${PREFIX}/share/pixmaps
 
 .include "options.mk"
 
diff --git a/editors/texmaker/PLIST b/editors/texmaker/PLIST
index 77e313159d8..3eeda68cf92 100644
--- a/editors/texmaker/PLIST
+++ b/editors/texmaker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2014/11/18 13:20:35 mef Exp $
+@comment $NetBSD: PLIST,v 1.10 2014/12/02 12:16:29 mef Exp $
 bin/texmaker
 share/applications/texmaker.desktop
 share/pixmaps/texmaker.png
@@ -73,6 +73,7 @@ share/texmaker/es_ES.aff
 share/texmaker/es_ES.dic
 share/texmaker/fr_FR.aff
 share/texmaker/fr_FR.dic
+share/texmaker/hardwordwrap_selection_80col.tms
 share/texmaker/hu_HU.aff
 share/texmaker/hu_HU.dic
 share/texmaker/it_IT.aff
@@ -123,9 +124,10 @@ share/texmaker/texmaker_ru.qm
 share/texmaker/texmaker_se.qm
 share/texmaker/texmaker_sr.qm
 share/texmaker/texmaker_uk.qm
+share/texmaker/texmaker_vi_VN.qm
 share/texmaker/texmaker_zh_CN.qm
 share/texmaker/texmaker_zh_TW.qm
-share/texmaker/titlecase.tms
+share/texmaker/titlecase_selection.tms
 share/texmaker/usermanual_en.html
 share/texmaker/usermanual_fr.html
 share/texmaker/usermanual_hu.html
diff --git a/editors/texmaker/distinfo b/editors/texmaker/distinfo
index efbd5a7c5d6..badfa0fdfaa 100644
--- a/editors/texmaker/distinfo
+++ b/editors/texmaker/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2014/11/18 13:20:35 mef Exp $
+$NetBSD: distinfo,v 1.11 2014/12/02 12:16:29 mef Exp $
 
-SHA1 (texmaker-4.3.tar.bz2) = 1ab421a0f3176e33922e0bde054b6b2c130a35c9
-RMD160 (texmaker-4.3.tar.bz2) = 65a473585e2e3e3aef9a173a4d69256c6dbf7f3a
-Size (texmaker-4.3.tar.bz2) = 11334013 bytes
+SHA1 (texmaker-4.4.1.tar.bz2) = cfdf924d2d5a64b415420ad8d389750b11cdda66
+RMD160 (texmaker-4.4.1.tar.bz2) = 0e7b0f74e408eaa48d0c983083df45dfac1b0759
+Size (texmaker-4.4.1.tar.bz2) = 11274997 bytes
diff --git a/editors/texmaker/options.mk b/editors/texmaker/options.mk
index 2e25c396081..0e757985c21 100644
--- a/editors/texmaker/options.mk
+++ b/editors/texmaker/options.mk
@@ -1,15 +1,19 @@
-# $NetBSD: options.mk,v 1.1 2014/11/18 13:20:35 mef Exp $
+# $NetBSD: options.mk,v 1.2 2014/12/02 12:16:29 mef Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.texmaker
-PKG_SUPPORTED_OPTIONS=	qt5
+PKG_OPTIONS_REQUIRED_GROUPS= qt
+PKG_OPTIONS_GROUP.qt = qt4 qt5
+PKG_SUGGESTED_OPTIONS=	qt4
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mqt5)
 .include "../../x11/qt5-qtscript/buildlink3.mk"
 .include "../../x11/qt5-qtwebkit/buildlink3.mk"
 .include "../../print/poppler-qt5/buildlink3.mk"
-.else
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt4)
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../print/poppler-qt4/buildlink3.mk"