pkg/45521: Update editors/texmaker: 1.8 to 3.1

[kamelderouiche%yahoo.com@localhost]

>Number:         45521
>Category:       pkg
>Synopsis:       Update editors/texmaker: 1.8 to 3.1
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Oct 25 22:55:00 +0000 2011
>Originator:     Derouiche
>Release:        NetBSD 5.1
>Organization:
Natei
>Environment:
NetBSD Torabora 5.1 NetBSD 5.1 (GENERIC) #0: Sun Nov  7 14:39:56 UTC 2010  
builds%b6.netbsd.org@localhost:/home/builds/ab/netbsd-5-1-RELEASE/i386/201011061943Z-obj/home/builds/ab/netbsd-5-1-RELEASE/src/sys/arch/i386/compile/GENERIC
 i386

>Description:
added new patch.
>How-To-Repeat:
n/a
>Fix:
$ diff -ruN Makefile.orig Makefile
--- Makefile.orig       2011-10-13 10:37:24.000000000 +0100
+++ Makefile    2011-10-13 11:31:50.000000000 +0100
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2011/01/13 13:37:32 wiz Exp $
+# $NetBSD$
+#
 
-DISTNAME=      texmaker-1.8
-PKGREVISION=   7
+DISTNAME=      texmaker-3.1
 CATEGORIES=    editors
 MASTER_SITES=  http://www.xm1math.net/texmaker/
 EXTRACT_SUFX=  .tar.bz2
@@ -9,10 +9,11 @@
 MAINTAINER=    ghen%NetBSD.org@localhost
 HOMEPAGE=      http://www.xm1math.net/texmaker/
 COMMENT=       LaTeX editor and front end
+#LICENSE=      # TODO: (see mk/license.mk)
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-USE_LANGUAGES= c++
+USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
 
 INSTALL_MAKE_FLAGS+=   INSTALL_ROOT=${DESTDIR}
@@ -21,6 +22,8 @@
        cd ${WRKSRC} && env ${CONFIGURE_ENV} \
        ${QTDIR}/bin/qmake -unix PREFIX=${PREFIX} texmaker.pro
 
+.include "../../print/poppler/buildlink3.mk"
+.include "../../print/poppler-qt4/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
$ diff -ruN distinfo.orig distinfo
--- distinfo.orig       2011-10-13 10:37:35.000000000 +0100
+++ distinfo    2011-10-15 19:22:25.000000000 +0100
@@ -1,5 +1,8 @@
 $NetBSD: distinfo,v 1.6 2008/01/08 07:35:26 ghen 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-3.1.tar.bz2) = 3fe9d72ebad63ef68dcf34248f4a46cec388da3c
+RMD160 (texmaker-3.1.tar.bz2) = cf7c457319d6f1ed55ec09fc1d06a9d05f848b9f
+Size (texmaker-3.1.tar.bz2) = 6018840 bytes
+SHA1 (patch-pdfdocumentwidget.h) = 5d296876598cadc60a87d29aed18ff1e0b7d7cb1
+SHA1 (patch-pdfviewer.cpp) = 2cbfea0ce64d0b18b3e232e4d486c1205dc514c8
+SHA1 (patch-pdfviewerwidget.cpp) = 6d8d6da0764c3206961c707a341364714227b9c3

$ diff -ruN PLIST.orig PLIST      
--- PLIST.orig  2011-10-13 10:37:29.000000000 +0100
+++ PLIST       2011-10-15 18:57:29.000000000 +0100
@@ -1,9 +1,14 @@
-@comment $NetBSD: PLIST,v 1.6 2008/12/03 08:26:15 ghen Exp $
+@comment $NetBSD$
 bin/texmaker
 share/texmaker/AUTHORS
 share/texmaker/CHANGELOG.txt
 share/texmaker/COPYING
-share/texmaker/blank.png
+share/texmaker/README_DIC_fr_FR.txt
+share/texmaker/README_de_DE_frami.txt
+share/texmaker/README_es_ES.txt
+share/texmaker/README_hu_HU.txt
+share/texmaker/de_DE.aff
+share/texmaker/de_DE.dic
 share/texmaker/doc1.png
 share/texmaker/doc10.png
 share/texmaker/doc11.png
@@ -17,28 +22,41 @@
 share/texmaker/doc19.png
 share/texmaker/doc2.png
 share/texmaker/doc20.png
+share/texmaker/doc21.png
+share/texmaker/doc22.png
 share/texmaker/doc3.png
 share/texmaker/doc4.png
 share/texmaker/doc5.png
 share/texmaker/doc6.png
+share/texmaker/doc6bis.png
 share/texmaker/doc7.png
 share/texmaker/doc8.png
 share/texmaker/doc9.png
 share/texmaker/en_GB.aff
 share/texmaker/en_GB.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/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/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 +64,20 @@
 share/texmaker/texmaker32x32.png
 share/texmaker/texmaker48x48.png
 share/texmaker/texmaker64x64.png
+share/texmaker/texmaker_ca.qm
+share/texmaker/texmaker_cs.qm
 share/texmaker/texmaker_de.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_nl.qm
+share/texmaker/texmaker_pl.qm
+share/texmaker/texmaker_pt_BR.qm
+share/texmaker/texmaker_ru.qm
+share/texmaker/texmaker_zh_CN.qm
+share/texmaker/texmaker_zh_TW.qm
 share/texmaker/usermanual_en.html
 share/texmaker/usermanual_fr.html

New patches:

$ cat patches/patch-pdfdocumentwidget.h 
$NetBSD$

--- pdfdocumentwidget.h.orig    2011-10-15 18:06:51.000000000 +0100
+++ pdfdocumentwidget.h 2011-10-15 18:10:53.000000000 +0100
@@ -19,7 +19,7 @@
 #include <QRectF>
 #include <QPainterPath>
 #include <QTimer>
-#include "poppler-qt4.h"
+#include <poppler/qt4/poppler-qt4.h>
 
 class PdfDocumentWidget : public QLabel
 {

$ cat patches/patch-pdfviewerwidget.cpp 
$NetBSD$

--- pdfviewerwidget.cpp.orig    2011-10-15 18:46:59.000000000 +0100
+++ pdfviewerwidget.cpp 2011-10-15 18:47:17.000000000 +0100
@@ -24,7 +24,7 @@
 #include <QSettings>
 #include <QTextStream>
 
-#include "poppler-qt4.h"
+#include <poppler/qt4/poppler-qt4.h>
 
 #define SYNCTEX_GZ_EXT ".synctex.gz"
 #define SYNCTEX_EXT ".synctex"

$ cat patches/patch-pdfviewer.cpp       
$NetBSD$

--- pdfviewer.cpp.orig  2011-10-15 18:21:51.000000000 +0100
+++ pdfviewer.cpp       2011-10-15 18:30:57.000000000 +0100
@@ -24,7 +24,7 @@
 #include <QSettings>
 #include <QTextStream>
 
-#include "poppler-qt4.h"
+#include <poppler/qt4/poppler-qt4.h>
 
 #define SYNCTEX_GZ_EXT ".synctex.gz"
 #define SYNCTEX_EXT ".synctex"