svn commit: r426021 - in head: . mail mail/trojita mail/trojita-qt4

[Raphael Kubo da Costa]

Author: rakuco
Date: Sun Nov 13 10:03:39 2016
New Revision: 426021
URL: https://svnweb.freebsd.org/changeset/ports/426021

Log:
  Update mail/trojita to 0.7.
  
  Release notes: http://jkt.flaska.net/blog/Trojita_0_7_with_GPG_encryption_is_available.html
  
  The minimum Qt version required by this release is 5.2, which means the
  trojita-qt4 port is now gone. This also allows us to simplify the Makefile of
  the main port.
  
  PR:		212030
  Submitted by:	rakuco
  Approved by:	maintainer timeout (marco.broeder at posteo.eu, 84 days)

Deleted:
  head/mail/trojita-qt4/
Modified:
  head/MOVED
  head/mail/Makefile
  head/mail/trojita/Makefile
  head/mail/trojita/distinfo

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Nov 13 10:03:04 2016	(r426020)
+++ head/MOVED	Sun Nov 13 10:03:39 2016	(r426021)
@@ -8804,3 +8804,4 @@ textproc/erlang-p1xml|textproc/erlang-fa
 devel/py-pydasm|devel/py-capstone|2016-11-11|Has expired: No more upstream and known bugs, use devel/py-capstone instead
 devel/libdasm|devel/capstone3|2016-11-11|Has expired: No more upstream and known bugs, use devel/capstone3 instead
 security/erlang-p1tls|security/erlang-fast_tls|2016-11-11|Project was renamed
+mail/trojita-qt4|mail/trojita|2016-11-13|Qt4 support was dropped, use mail/trojita instead

Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile	Sun Nov 13 10:03:04 2016	(r426020)
+++ head/mail/Makefile	Sun Nov 13 10:03:39 2016	(r426021)
@@ -723,7 +723,6 @@
     SUBDIR += tmda
     SUBDIR += tpop3d
     SUBDIR += trojita
-    SUBDIR += trojita-qt4
     SUBDIR += tumgreyspf
     SUBDIR += up-imapproxy
     SUBDIR += usendmail

Modified: head/mail/trojita/Makefile
==============================================================================
--- head/mail/trojita/Makefile	Sun Nov 13 10:03:04 2016	(r426020)
+++ head/mail/trojita/Makefile	Sun Nov 13 10:03:39 2016	(r426021)
@@ -2,41 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	trojita
-PORTVERSION=	0.6
-PORTREVISION=	1
+PORTVERSION=	0.7
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/src/
 
 MAINTAINER=	marco.broeder at posteo.eu
-COMMENT?=	Fast cross-platform IMAP e-mail client using Qt 5 toolkit
+COMMENT=	Fast cross-platform IMAP e-mail client using Qt 5 toolkit
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
+LIB_DEPENDS=	libqt5keychain.so:security/qtkeychain-qt5
+
+CONFLICTS_INSTALL=	trojita-qt4-[0-9]*
+INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 
-USES=		cmake compiler:c++11-lib cpe desktop-file-utils tar:bzip2
 CPE_PROJECT=	trojita_project
 CMAKE_ARGS+=	-DWITH_CLEARTEXT_PLUGIN:STRING=ON -DWITH_DBUS:STRING=ON \
 		-DWITH_DESKTOP:STRING=ON \
 		-DWITH_QTKEYCHAIN_PLUGIN:STRING=ON -DWITH_RAGEL:STRING=OFF \
 		-DWITH_SHARED_PLUGINS:STRING=ON -DWITH_TESTS:STRING=OFF \
-		-DWITH_ZLIB:STRING=ON
-
-INSTALLS_ICONS=	yes
-
-.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4"
-CONFLICTS_INSTALL=	trojita-[0-9]*
-LIB_DEPENDS+=	libqtkeychain.so:security/qtkeychain-qt4
-CMAKE_ARGS+=	-DWITH_QT5:STRING=OFF
-USE_QT4=	linguisttools_build moc_build qmake_build rcc_build uic_build \
-		corelib dbus gui network sql sql-sqlite3 webkit
-.else
-CONFLICTS_INSTALL=	trojita-qt4-[0-9]*
-LIB_DEPENDS+=	libqt5keychain.so:security/qtkeychain-qt5
-CMAKE_ARGS+=	-DWITH_QT5:STRING=ON
+		-DWITH_ZLIB:STRING=ON \
+		-DWITH_QT5:STRING=ON
+USES=		cmake compiler:c++11-lib cpe desktop-file-utils tar:xz
 USE_QT5=	buildtools_build linguisttools_build qmake_build \
-		core dbus gui network sql sql-sqlite3 webkit widgets
-.endif
+		core dbus gui network sql sql-sqlite3 svg webkit widgets
 
 .include <bsd.port.mk>

Modified: head/mail/trojita/distinfo
==============================================================================
--- head/mail/trojita/distinfo	Sun Nov 13 10:03:04 2016	(r426020)
+++ head/mail/trojita/distinfo	Sun Nov 13 10:03:39 2016	(r426021)
@@ -1,2 +1,3 @@
-SHA256 (trojita-0.6.tar.bz2) = 4c1083f48b51cc37bb318c5a8ada67b64b38ed95d8ad30b4621755fcf45efa10
-SIZE (trojita-0.6.tar.bz2) = 1409812
+TIMESTAMP = 1471781933
+SHA256 (trojita-0.7.tar.xz) = e08da881721cafa00ecd772eaef6b99fd37d068cb703eeb532de0ed1ea0136d9
+SIZE (trojita-0.7.tar.xz) = 1038212