aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrakuco <rakuco@FreeBSD.org>2016-11-13 18:03:39 +0800
committerrakuco <rakuco@FreeBSD.org>2016-11-13 18:03:39 +0800
commit6667571b47ce65d26d0cb9344ec468318c71e9b7 (patch)
treecb281bcac46241ae0b3127edef7013f03af23e95
parentadfcd95221c6797be825acbbbd6b75f8fac3201e (diff)
downloadfreebsd-ports-gnome-6667571b47ce65d26d0cb9344ec468318c71e9b7.tar.gz
freebsd-ports-gnome-6667571b47ce65d26d0cb9344ec468318c71e9b7.tar.zst
freebsd-ports-gnome-6667571b47ce65d26d0cb9344ec468318c71e9b7.zip
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@posteo.eu, 84 days)
-rw-r--r--MOVED1
-rw-r--r--mail/Makefile1
-rw-r--r--mail/trojita-qt4/Makefile16
-rw-r--r--mail/trojita/Makefile30
-rw-r--r--mail/trojita/distinfo5
5 files changed, 14 insertions, 39 deletions
diff --git a/MOVED b/MOVED
index acc074496312..c150c521c799 100644
--- a/MOVED
+++ b/MOVED
@@ -8804,3 +8804,4 @@ textproc/erlang-p1xml|textproc/erlang-fast_xml|2016-11-08|Project was renamed
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
diff --git a/mail/Makefile b/mail/Makefile
index a3e36fe1752d..28b532594587 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -723,7 +723,6 @@
SUBDIR += tmda
SUBDIR += tpop3d
SUBDIR += trojita
- SUBDIR += trojita-qt4
SUBDIR += tumgreyspf
SUBDIR += up-imapproxy
SUBDIR += usendmail
diff --git a/mail/trojita-qt4/Makefile b/mail/trojita-qt4/Makefile
deleted file mode 100644
index 10f79822b934..000000000000
--- a/mail/trojita-qt4/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Created by: Marco Broeder <marco.broeder@posteo.eu>
-# $FreeBSD$
-
-PKGNAMESUFFIX= -qt4
-
-MAINTAINER= marco.broeder@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/trojita/Makefile b/mail/trojita/Makefile
index 3f8bc0bcf432..7ec4b33cf003 100644
--- a/mail/trojita/Makefile
+++ b/mail/trojita/Makefile
@@ -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@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>
diff --git a/mail/trojita/distinfo b/mail/trojita/distinfo
index c2f8321e47ef..578a1b2498cb 100644
--- a/mail/trojita/distinfo
+++ b/mail/trojita/distinfo
@@ -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