(pkgsrc)

  Add options.mk to make qt5 as an option, since qt5 in pkgsrc seems broken.
(upstream) Update Texmaker 4.1 to 4.3.
= Those changes are based on wip/texmaker by Niclas Rosenvik, thanks.

version 4.2 -> 4.3 :
- a visual diff view has been added to the "source viewer" (differences between
  the current files loaded in the editor and in the "source viewer") based on
  jsdifflib from Chas Emerick (BSD license)
- when a command fails, the command is now displayed with the error message
  "Could not start the command"
- an "reload all documents from file" option has been added to the "File" menu
  (users request)
- if a "completion.txt" file is found in the same directory than texmaker.exe on
  windows, in the "/usr/share/texmaker/" folder on linux and in the "Resources"
  subdirectory of the .app package on macosx, all items from this file will be
  added automatically for the autocompletion (the syntax must be the same than
  for the ."Customize completion" option of the "User" menu.
- an option to launch the "Clean" tool when exiting the program has been added
  (users request)
- a texmaker man page and a texmaker.menu file have been added in the
  "utilities" directory of the source (thanks to Bernd Warken for the man-page)
- the cs, el, es, hu and se translations have been updated (thanks to all
  the translators)

version 4.1.1 -> 4.2 :
Features :
- script support has been added (only for the text editor part - "User" menu)
- with the new option "-n" for the command line, a new instance of
  Texmaker can be launched (will break the synchronization with the pdf
  viewers and others feautures)
- hu and nl translations have been updated
- the windows and macosx lion/maverick versions are now compiled with Qt 5.2.1

Bugs fixed :
- while loading the last session, the bug about the focus has been fixed
- a bug about the "commands" combo box in the main toolbar has been fixed
- a typo in the russian translation has been fixed
- a bad trigger detection for the snippets has been fixed

4 files changed, 35 insertions, 14 deletions

diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 8c7799aacef..911101f1748 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2014/04/29 07:57:14 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2014/11/18 13:20:35 mef Exp $
 
-DISTNAME=	texmaker-4.1
-PKGREVISION=	3
+DISTNAME=	texmaker-4.3
 CATEGORIES=	editors
 MASTER_SITES=	http://www.xm1math.net/texmaker/
 EXTRACT_SUFX=	.tar.bz2
@@ -18,12 +17,12 @@ USE_LIBTOOL=	yes
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
 
 do-configure:
-	cd ${WRKSRC} && env ${CONFIGURE_ENV} \
-	${QTDIR}/bin/qmake PREFIX=${PREFIX} texmaker.pro DESKTOPDIR=${PREFIX}/share/applications ICONDIR=${PREFIX}/share/pixmaps
+	cd ${WRKSRC} && ${PKGSRC_ENV} ${CONFIGURE_ENV} \
+	${QTDIR}/bin/qmake PREFIX=${PREFIX} texmaker.pro \
+	DESKTOPDIR=${PREFIX}/share/applications ICONDIR=${PREFIX}/share/pixmaps
+
+.include "options.mk"
 
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
-.include "../../print/poppler-qt4/buildlink3.mk"
 .include "../../print/poppler-includes/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/texmaker/PLIST b/editors/texmaker/PLIST
index d83172090cb..77e313159d8 100644
--- a/editors/texmaker/PLIST
+++ b/editors/texmaker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2013/10/14 04:45:28 mef Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/11/18 13:20:35 mef Exp $
 bin/texmaker
 share/applications/texmaker.desktop
 share/pixmaps/texmaker.png
@@ -12,7 +12,10 @@ share/texmaker/README_en_US.txt
 share/texmaker/README_es_ES.txt
 share/texmaker/README_hu_HU.txt
 share/texmaker/README_pl.txt
+share/texmaker/README_pt_PT.txt
 share/texmaker/atd.css
+share/texmaker/ca_CA.aff
+share/texmaker/ca_CA.dic
 share/texmaker/cs_CZ.aff
 share/texmaker/cs_CZ.dic
 share/texmaker/csshttprequest.js
@@ -81,6 +84,8 @@ share/texmaker/nl_NL.aff
 share/texmaker/nl_NL.dic
 share/texmaker/pl_PL.aff
 share/texmaker/pl_PL.dic
+share/texmaker/pt_PT.aff
+share/texmaker/pt_PT.dic
 share/texmaker/qt_cs.qm
 share/texmaker/qt_de.qm
 share/texmaker/qt_es.qm
@@ -120,6 +125,7 @@ share/texmaker/texmaker_sr.qm
 share/texmaker/texmaker_uk.qm
 share/texmaker/texmaker_zh_CN.qm
 share/texmaker/texmaker_zh_TW.qm
+share/texmaker/titlecase.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 f9893c78985..efbd5a7c5d6 100644
--- a/editors/texmaker/distinfo
+++ b/editors/texmaker/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2013/12/02 13:34:02 mef Exp $
+$NetBSD: distinfo,v 1.10 2014/11/18 13:20:35 mef Exp $
 
-SHA1 (texmaker-4.1.tar.bz2) = 91c9cfead9d9d7c7696721b8c5c754ca60a0cc13
-RMD160 (texmaker-4.1.tar.bz2) = a798b83c50268ba5a8846e5dce3acda74852d63f
-Size (texmaker-4.1.tar.bz2) = 10524563 bytes
+SHA1 (texmaker-4.3.tar.bz2) = 1ab421a0f3176e33922e0bde054b6b2c130a35c9
+RMD160 (texmaker-4.3.tar.bz2) = 65a473585e2e3e3aef9a173a4d69256c6dbf7f3a
+Size (texmaker-4.3.tar.bz2) = 11334013 bytes
diff --git a/editors/texmaker/options.mk b/editors/texmaker/options.mk
new file mode 100644
index 00000000000..2e25c396081
--- /dev/null
+++ b/editors/texmaker/options.mk
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2014/11/18 13:20:35 mef Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.texmaker
+PKG_SUPPORTED_OPTIONS=	qt5
+.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
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../print/poppler-qt4/buildlink3.mk"
+.endif