svn commit: r373411 - in head/editors/texmaker: . files

[Max Brazhnikov]

Author: makc
Date: Tue Nov 25 15:01:58 2014
New Revision: 373411
URL: https://svnweb.freebsd.org/changeset/ports/373411
QAT: https://qat.redports.org/buildarchive/r373411/

Log:
  editors/texmaker:
  - Update to 4.3
  - Add options for Qt toolkit selection (Qt 4 or 5). Follow upstream and
    enable Qt 5 by default.

Modified:
  head/editors/texmaker/Makefile
  head/editors/texmaker/distinfo
  head/editors/texmaker/files/patch-texmaker.pro
  head/editors/texmaker/pkg-plist

Modified: head/editors/texmaker/Makefile
==============================================================================
--- head/editors/texmaker/Makefile	Tue Nov 25 14:38:04 2014	(r373410)
+++ head/editors/texmaker/Makefile	Tue Nov 25 15:01:58 2014	(r373411)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	texmaker
-PORTVERSION=	4.1.1
-PORTREVISION=	2
+PORTVERSION=	4.3
 PORTEPOCH=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://www.xm1math.net/texmaker/
@@ -11,18 +10,28 @@ MASTER_SITES=	http://www.xm1math.net/tex
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	LaTeX Development Environment
 
-LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler \
-		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
+LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler
 
 USES=		desktop-file-utils pkgconfig qmake tar:bzip2
 USE_GHOSTSCRIPT_RUN=	yes
-USE_QT4=	gui network xml webkit \
+_USE_QT4=	gui network xml webkit \
 		moc_build rcc_build uic_build
+_USE_QT5=	concurrent network printsupport script webkit widgets \
+		xml buildtools_build
 USE_TEX=	latex dvipsk
 QMAKE_ARGS=	ICONDIR=${PREFIX}/share/pixmaps \
 		DESKTOPDIR=${DESKTOPDIR}
 
 OPTIONS_DEFINE=	GV XDVI
+OPTIONS_SINGLE=	TOOLKIT
+OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
+OPTIONS_DEFAULT=	QT5
+
+TOOLKIT_DESC=	Qt toolkit
+QT4_USE=	${_USE_QT4:S/^/QT4=/}
+QT4_LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
+QT5_USE=	${_USE_QT5:S/^/QT5=/}
+QT5_LIB_DEPENDS=	libpoppler-qt5.so:${PORTSDIR}/graphics/poppler-qt5
 
 GV_DESC=	View ps files with gv
 GV_RUN_DEPENDS=	gv:${PORTSDIR}/print/gv

Modified: head/editors/texmaker/distinfo
==============================================================================
--- head/editors/texmaker/distinfo	Tue Nov 25 14:38:04 2014	(r373410)
+++ head/editors/texmaker/distinfo	Tue Nov 25 15:01:58 2014	(r373411)
@@ -1,2 +1,2 @@
-SHA256 (texmaker-4.1.1.tar.bz2) = 9ff0a72d62021e1110319ed7d0d939938495797726716ae998bc006770ebb9c0
-SIZE (texmaker-4.1.1.tar.bz2) = 11258665
+SHA256 (texmaker-4.3.tar.bz2) = 670eef7c51630342c87f1c2a77da0b36798fdb971c7893841e13c9342b18da51
+SIZE (texmaker-4.3.tar.bz2) = 11334013

Modified: head/editors/texmaker/files/patch-texmaker.pro
==============================================================================
--- head/editors/texmaker/files/patch-texmaker.pro	Tue Nov 25 14:38:04 2014	(r373410)
+++ head/editors/texmaker/files/patch-texmaker.pro	Tue Nov 25 15:01:58 2014	(r373411)
@@ -1,5 +1,5 @@
---- ./texmaker.pro.orig	2013-10-28 13:47:24.000000000 +0000
-+++ ./texmaker.pro	2013-11-16 20:58:16.201993027 +0000
+--- texmaker.pro.orig	2014-07-29 04:02:06 UTC
++++ texmaker.pro
 @@ -390,13 +390,6 @@
  	utilities/AUTHORS \
  	utilities/COPYING \
@@ -11,10 +11,10 @@
 -	utilities/texmaker64x64.png \
 -	utilities/texmaker128x128.png \
 -	utilities/texmaker.svg \
+ 	scripts/titlecase.tms \
  	locale/qt_cs.qm \
  	locale/qt_de.qm \
- 	locale/qt_es.qm \
-@@ -464,4 +457,20 @@
+@@ -470,4 +463,20 @@
  
  icon.files = utilities/texmaker.png
  INSTALLS += icon

Modified: head/editors/texmaker/pkg-plist
==============================================================================
--- head/editors/texmaker/pkg-plist	Tue Nov 25 14:38:04 2014	(r373410)
+++ head/editors/texmaker/pkg-plist	Tue Nov 25 15:01:58 2014	(r373411)
@@ -124,6 +124,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