Bump 1.8 to 4.0.4, based on PR pkg/48297

(by  Niclas Rosenvik: nicro465 at student.liu.se,
also with PR pkg/45521 to 3.1 by kamelderouiche at yahoo.com)

Release Note since 4.0 from:
  http://freecode.com/projects/qtexmaker/releases/357375
--------------------
4.0.4     30 Aug 2013 16:55
      Support for the 0.24 poppler version has been
added, and a compilation problem on ARM architecture has been
fixed. Dragging and dropping image files in the editor is now
supported.

4.0.3     30 Jul 2013 12:46
      The Windows and Mac OS X Lion versions are now
compiled with Qt 5.1 and poppler 0.22. Find-and-replace
actions can now be applied to a selection only. A tool that
converts source files to Unicode has been added. Users can now
check if a new version is available via a new option in the
"Help" menu (less)

4.0.2     09 May 2013 11:33
      Mac OS X high DPI support has been added to the
PDF viewer, the symbols, and almost all of the icons. The
part/chapter/section tags are now bold in the editor. On
Linux, the session file is now stored in the standard ./cache
directory instead of the /tmp folder. New translations have
been added (less)

4.0.1     16 Mar 2013 13:47
      A potential crash when synctex sent a bad page
number has been fixed. The -Pdownload35 option has been added
to the default dvips command for MiKTeX users on Windows.

4.0     08 Mar 2013 22:07
      The code has been ported to Qt5 (but this
version can also be compiled with Qt4). From this version,
Texmaker will be principally developed under Qt5. A keyboard
shortcut has been added to toggle between the master and the
current document. A specific "quick build" command has been
padded for the .asy files: the asymptote figures can now be
compiled and displayed with the F1 shortcut.

4 files changed, 107 insertions, 35 deletions

diff --git a/editors/texmaker/DESCR b/editors/texmaker/DESCR
index acd3a250d93..5ae8326bdbb 100644
--- a/editors/texmaker/DESCR
+++ b/editors/texmaker/DESCR
@@ -1,26 +1,24 @@
 Texmaker is a free LaTeX editor, that integrates many tools needed to develop
 documents with LaTeX, in just one application.  Texmaker runs on UNIX, MacOS X
 and Windows systems and is released under the GPL license.
-
-Features:
-* an unicode editor to write your LaTeX source files (syntax highlighting,
+  -- Features --
+* An unicode editor to write your LaTeX source files (syntax highlighting,
   undo-redo, search-replace, spell checker...)
-* the principal LaTex tags can be inserted directly with the "LaTeX" and "Math"
-  menus
+* The LaTeX tags can be inserted directly with the "LaTeX" and "Math"  menus
 * 370 mathematical symbols can be inserted in just one click
-* wizards to generate code ('Quick document', 'Quick letter', tabular, tabbing
+* Wizards to generate code ('Quick document', 'Quick letter', tabular, tabbing
   and array environments)
 * LaTeX-related programs can be launched via the "Tools" menu
-* the standard Bibtex entry types can be inserted in the ".bib" file with the
+* The standard Bibtex entry types can be inserted in the ".bib" file with the
   "Bibliography" menu
-* a "structure view" of the document for easier navigation of a document (by
+* A "structure view" of the document for easier navigation of a document (by
   clicking on an item in the "Structure" frame, you can jump directly to the
   corresponding part of your document
-* extensive LaTeX documentation
-* in the "Messages / Log File" frame, you can see information about processes
+* Extensive LaTeX documentation
+* In the "Messages / Log File" frame, you can see information about processes
   and the logfile after a LaTeX compilation
-* the "Next Latex Error" and "Previous Latex Error" commands let you reach the
+* The "Next Latex Error" and "Previous Latex Error" commands let you reach the
   LaTeX errors detected in the log file
-* by clicking on the number of a line in the log file, the cursor jumps to the
+* By clicking on the number of a line in the log file, the cursor jumps to the
   corresponding line in the editor
-* an integrated LaTeX to html conversion tool
+* An integrated LaTeX to html conversion tool
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 246d28e6434..8abb1c8a66f 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2013/06/06 12:54:17 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2013/10/14 04:45:28 mef Exp $
 
-DISTNAME=	texmaker-1.8
-PKGREVISION=	21
+DISTNAME=	texmaker-4.0.4
 CATEGORIES=	editors
 MASTER_SITES=	http://www.xm1math.net/texmaker/
 EXTRACT_SUFX=	.tar.bz2
@@ -9,16 +8,20 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.xm1math.net/texmaker/
 COMMENT=	LaTeX editor and front end
+LICENSE=	gnu-gpl-v2
 
-USE_LANGUAGES=	c++
+USE_LANGUAGES=	c++ c
 USE_LIBTOOL=	yes
 
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
 
 do-configure:
 	cd ${WRKSRC} && env ${CONFIGURE_ENV} \
-	${QTDIR}/bin/qmake -unix PREFIX=${PREFIX} texmaker.pro
+	${QTDIR}/bin/qmake PREFIX=${PREFIX} texmaker.pro DESKTOPDIR=${PREFIX}/share/applications ICONDIR=${PREFIX}/share/pixmaps
 
+.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 "../../mk/bsd.pkg.mk"
diff --git a/editors/texmaker/PLIST b/editors/texmaker/PLIST
index 009c7ffd2fa..d83172090cb 100644
--- a/editors/texmaker/PLIST
+++ b/editors/texmaker/PLIST
@@ -1,44 +1,97 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:50:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/10/14 04:45:28 mef Exp $
 bin/texmaker
+share/applications/texmaker.desktop
+share/pixmaps/texmaker.png
 share/texmaker/AUTHORS
 share/texmaker/CHANGELOG.txt
 share/texmaker/COPYING
-share/texmaker/blank.png
+share/texmaker/README_DIC_fr_FR.txt
+share/texmaker/README_cs_CZ.txt
+share/texmaker/README_de_DE_frami.txt
+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/atd.css
+share/texmaker/cs_CZ.aff
+share/texmaker/cs_CZ.dic
+share/texmaker/csshttprequest.js
+share/texmaker/de_DE.aff
+share/texmaker/de_DE.dic
 share/texmaker/doc1.png
 share/texmaker/doc10.png
+share/texmaker/doc10hu.png
 share/texmaker/doc11.png
+share/texmaker/doc11hu.png
 share/texmaker/doc12.png
+share/texmaker/doc12hu.png
 share/texmaker/doc13.png
+share/texmaker/doc13hu.png
 share/texmaker/doc14.png
+share/texmaker/doc14hu.png
 share/texmaker/doc15.png
+share/texmaker/doc15hu.png
 share/texmaker/doc16.png
+share/texmaker/doc16hu.png
 share/texmaker/doc17.png
+share/texmaker/doc17hu.png
 share/texmaker/doc18.png
 share/texmaker/doc19.png
+share/texmaker/doc1hu.png
 share/texmaker/doc2.png
 share/texmaker/doc20.png
+share/texmaker/doc20hu.png
+share/texmaker/doc21.png
+share/texmaker/doc21hu.png
+share/texmaker/doc22.png
+share/texmaker/doc22hu.png
+share/texmaker/doc2hu.png
 share/texmaker/doc3.png
+share/texmaker/doc3hu.png
 share/texmaker/doc4.png
+share/texmaker/doc4hu.png
 share/texmaker/doc5.png
+share/texmaker/doc5hu.png
 share/texmaker/doc6.png
+share/texmaker/doc6ahu.png
+share/texmaker/doc6bis.png
+share/texmaker/doc6hu.png
 share/texmaker/doc7.png
+share/texmaker/doc7hu.png
 share/texmaker/doc8.png
+share/texmaker/doc8hu.png
 share/texmaker/doc9.png
+share/texmaker/doc9hu.png
 share/texmaker/en_GB.aff
 share/texmaker/en_GB.dic
+share/texmaker/en_US.aff
+share/texmaker/en_US.dic
+share/texmaker/es_ES.aff
+share/texmaker/es_ES.dic
 share/texmaker/fr_FR.aff
 share/texmaker/fr_FR.dic
+share/texmaker/hu_HU.aff
+share/texmaker/hu_HU.dic
+share/texmaker/it_IT.aff
+share/texmaker/it_IT.dic
+share/texmaker/it_IT_README.txt
+share/texmaker/jquery.atd.textarea.js
 share/texmaker/latexhelp.html
-share/texmaker/next.gif
-share/texmaker/next_d.gif
-share/texmaker/prev.gif
-share/texmaker/prev_d.gif
-share/texmaker/psheader.txt
+share/texmaker/nl_NL.aff
+share/texmaker/nl_NL.dic
+share/texmaker/pl_PL.aff
+share/texmaker/pl_PL.dic
+share/texmaker/qt_cs.qm
 share/texmaker/qt_de.qm
+share/texmaker/qt_es.qm
+share/texmaker/qt_fa.qm
 share/texmaker/qt_fr.qm
-share/texmaker/qt_zh.qm
-share/texmaker/style.css
-share/texmaker/texmaker.desktop
+share/texmaker/qt_nl.qm
+share/texmaker/qt_pl.qm
+share/texmaker/qt_pt.qm
+share/texmaker/qt_ru.qm
+share/texmaker/qt_zh_CN.qm
+share/texmaker/qt_zh_TW.qm
 share/texmaker/texmaker.svg
 share/texmaker/texmaker128x128.png
 share/texmaker/texmaker16x16.png
@@ -46,10 +99,28 @@ share/texmaker/texmaker22x22.png
 share/texmaker/texmaker32x32.png
 share/texmaker/texmaker48x48.png
 share/texmaker/texmaker64x64.png
+share/texmaker/texmaker_ar.qm
+share/texmaker/texmaker_cs.qm
 share/texmaker/texmaker_de.qm
+share/texmaker/texmaker_el.qm
+share/texmaker/texmaker_es.qm
+share/texmaker/texmaker_fa.qm
 share/texmaker/texmaker_fr.qm
-share/texmaker/texmaker_zh.qm
-share/texmaker/up.gif
-share/texmaker/up_d.gif
+share/texmaker/texmaker_gl.qm
+share/texmaker/texmaker_hu.qm
+share/texmaker/texmaker_it.qm
+share/texmaker/texmaker_lv.qm
+share/texmaker/texmaker_nl.qm
+share/texmaker/texmaker_pl.qm
+share/texmaker/texmaker_pt.qm
+share/texmaker/texmaker_pt_BR.qm
+share/texmaker/texmaker_ru.qm
+share/texmaker/texmaker_se.qm
+share/texmaker/texmaker_sr.qm
+share/texmaker/texmaker_uk.qm
+share/texmaker/texmaker_zh_CN.qm
+share/texmaker/texmaker_zh_TW.qm
 share/texmaker/usermanual_en.html
 share/texmaker/usermanual_fr.html
+share/texmaker/usermanual_hu.html
+share/texmaker/usermanual_ru.html
diff --git a/editors/texmaker/distinfo b/editors/texmaker/distinfo
index c2b2551df9a..5543d5d5366 100644
--- a/editors/texmaker/distinfo
+++ b/editors/texmaker/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2008/12/03 08:26:15 ghen Exp $
+$NetBSD: distinfo,v 1.8 2013/10/14 04:45:28 mef Exp $
 
-SHA1 (texmaker-1.8.tar.bz2) = d5f188c0d207c637a445cec984d79ee017de6e1a
-RMD160 (texmaker-1.8.tar.bz2) = b3bdfa7838f486f0969da472ff08c2d30825421e
-Size (texmaker-1.8.tar.bz2) = 1767680 bytes
+SHA1 (texmaker-4.0.4.tar.bz2) = 4f95078133cfda58f64d6a211512a59edf998783
+RMD160 (texmaker-4.0.4.tar.bz2) = 2621e0d3f1f7f37e25ffed60cad783317d5fde1d
+Size (texmaker-4.0.4.tar.bz2) = 9688431 bytes