ports/187370: [maintainer-update] [patch] mail/trojita: Update to 0.4, create new slave port

[Marco Bröder]

>Number:         187370
>Category:       ports
>Synopsis:       [maintainer-update] [patch] mail/trojita: Update to 0.4, create new slave port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 08 12:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Marco Bröder
>Release:        stable/10 amd64
>Organization:
>Environment:
>Description:
Update to 0.4 release.

Add Qt 5 toolkit support.

Patch search path for linguisttools binaries.

Create a new slave port mail/trojita-qt4 for Qt 4 toolkit support and connect
it in mail/Makefile.


Build tests:
# portlint -C
# make DEVELOPER=yes stage check-orphans package install deinstall clean
# poudriere testport ... on amd64 for head, stable/10, releng/9.2, releng/8.4

Runtime tests:
on stable/10 amd64


Thanks!

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/mail/trojita-qt4/Makefile b/mail/trojita-qt4/Makefile
new file mode 100644
index 0000000..10f7982
--- /dev/null
+++ b/mail/trojita-qt4/Makefile
@@ -0,0 +1,16 @@
+# Created by: Marco Broeder <marco.broeder at posteo.eu>
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-qt4
+
+MAINTAINER=	marco.broeder at posteo.eu
+COMMENT=	Fast cross-platform IMAP e-mail client using Qt 4 toolkit
+
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
+
+CONFLICTS_INSTALL=	trojita-[0-9]*
+
+MASTERDIR=	${.CURDIR}/../trojita
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/Makefile b/mail/Makefile
index 9da6c25..ae745e0 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -723,6 +723,7 @@
     SUBDIR += tmda
     SUBDIR += tpop3d
     SUBDIR += trojita
+    SUBDIR += trojita-qt4
     SUBDIR += tumgreyspf
     SUBDIR += uebimiau
     SUBDIR += up-imapproxy
diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile
index 318e30f..8db58fc 100644
--- a/mail/trojita/Makefile
+++ b/mail/trojita/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD: head/mail/trojita/Makefile 346967 2014-03-03 21:13:59Z pawel $
 
 PORTNAME=	trojita
-PORTVERSION=	0.3.96
-PORTREVISION=	1
+PORTVERSION=	0.4
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/src/
 
 MAINTAINER=	marco.broeder at posteo.eu
-COMMENT=	Fast cross-platform Qt IMAP e-mail client
+COMMENT=	Fast cross-platform IMAP e-mail client using Qt 5 toolkit
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
@@ -18,14 +17,30 @@ USE_LDCONFIG=	yes
 
 USES=		cmake compiler:c++11-lib desktop-file-utils
 CMAKE_ARGS+=	-DCMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make \
-		-DWITH_QT5:STRING=OFF -DWITH_TESTS:STRING=OFF
-
-USE_QT4=	linguist_build moc_build qmake_build rcc_build uic_build \
-		sql-sqlite3 webkit
+		-DWITH_DESKTOP:STRING=ON -DWITH_HARMATTAN:STRING=OFF \
+		-DWITH_RAGEL:STRING=OFF -DWITH_SHARED_PLUGINS:STRING=ON \
+		-DWITH_TESTS:STRING=OFF -DWITH_ZLIB:STRING=ON
 
 HAS_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
+.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4"
+CMAKE_ARGS+=	-DWITH_QT5:STRING=OFF
+USE_QT4=	linguist_build moc_build qmake_build rcc_build uic_build \
+		corelib dbus gui network opengl sql sql-sqlite3 webkit
+.else
+CONFLICTS_INSTALL=	trojita-qt4-[0-9]*
+
+CMAKE_ARGS+=	-DWITH_QT5:STRING=ON
+USE_QT5=	buildtools_build linguisttools_build qmake_build \
+		qmldevtools_build core dbus gui network opengl printsupport \
+		qml quick sql sql-sqlite3 webkit widgets
+.endif
+
+post-patch:
+	${REINPLACE_CMD} -e 's|$${LINGUIST_PATH}/bin|${QT_BINDIR}|g' \
+		${WRKSRC}/cmake/FindQt5LinguistForTrojita.cmake
+
 post-install:
 
 .include <bsd.port.mk>
diff --git a/mail/trojita/distinfo b/mail/trojita/distinfo
index 1450e68..038d40c 100644
--- a/mail/trojita/distinfo
+++ b/mail/trojita/distinfo
@@ -1,2 +1,2 @@
-SHA256 (trojita-0.3.96.tar.bz2) = f085dba2a33eed61282bdde05b0151138fbc820a7bfe4655758e1d63f31af7f1
-SIZE (trojita-0.3.96.tar.bz2) = 1068542
+SHA256 (trojita-0.4.tar.bz2) = 742a72b5dbd43163e06fd54c936d642609629f96a4ed51563f18e56b07d760fd
+SIZE (trojita-0.4.tar.bz2) = 1220078
diff --git a/mail/trojita/pkg-plist b/mail/trojita/pkg-plist
index e37bbe5..551ef64 100644
--- a/mail/trojita/pkg-plist
+++ b/mail/trojita/pkg-plist
@@ -16,8 +16,10 @@ share/icons/hicolor/scalable/apps/trojita.svg
 %%DATADIR%%/locale/trojita_common_gl.qm
 %%DATADIR%%/locale/trojita_common_hu.qm
 %%DATADIR%%/locale/trojita_common_ia.qm
+%%DATADIR%%/locale/trojita_common_it.qm
 %%DATADIR%%/locale/trojita_common_lt.qm
 %%DATADIR%%/locale/trojita_common_mr.qm
+%%DATADIR%%/locale/trojita_common_nb.qm
 %%DATADIR%%/locale/trojita_common_nl.qm
 %%DATADIR%%/locale/trojita_common_pl.qm
 %%DATADIR%%/locale/trojita_common_pt.qm


>Release-Note:
>Audit-Trail:
>Unformatted: