ports/182748: [maintainer-update] [patch] mail/trojita: Update to 0.3.96. Add stage support.

[Marco Bröder]

>Number:         182748
>Category:       ports
>Synopsis:       [maintainer-update] [patch] mail/trojita: Update to 0.3.96. Add stage support.
>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:   Sun Oct 06 14:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Marco Bröder
>Release:        
>Organization:
>Environment:
>Description:
Update to 0.3.96 release.

Support staging.

Use cmake. Tell cmake to use '/usr/bin/make' instead of an problably installed
gmake (because of errors).

Add desktop-file-utils dependency.

Add c++11 support check. We need either clang >= 3.3 and libc++ (from base), or
gcc >= 4.8.1 (from ports). The 'devel/libc++' port does not work. So it is not
useful to check for clang from ports.

Include <bsd.port.pre.mk> and <bsd.port.post.mk> instead of <bsd.port.mk>. This
is necessary, because ${MAKE} would complain about a malformed conditional in
the ${OSVERSION} check (syntax is correct). If using options (and so using
<bsd.port.options.mk> and <bsd.port.mk>) this error does not occur.

Tested (amd64) on head, stable/9, releng/9.2, releng/8.4.

Thanks!

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile
index 1706456..3b58626 100644
--- a/mail/trojita/Makefile
+++ b/mail/trojita/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: head/mail/trojita/Makefile 327742 2013-09-20 19:59:12Z bapt $
 
 PORTNAME=	trojita
-PORTVERSION=	0.3.93
+PORTVERSION=	0.3.96
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/src/
 
@@ -12,19 +12,33 @@ COMMENT=	Fast cross-platform Qt IMAP e-mail client
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-
 USE_BZIP2=	yes
+USE_LDCONFIG=	yes
+
+USES=		cmake 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
+USE_QT4=	linguist_build moc_build qmake_build rcc_build uic_build \
+		sql-sqlite3 webkit
 
 HAS_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-NO_INSTALL_MANPAGES=	yes
 
-NO_STAGE=	yes
-do-configure:
-	cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} \
-		CONFIG+="release disable_tests" ${PORTNAME}.pro
+.include <bsd.port.pre.mk>
+
+# We need full c++11 support. So use either clang >= 3.3 and libc++ from base,
+# or use gcc >= 4.8.1 from ports. The devel/libc++ port does not work.
+.if (${OSVERSION} > 901505 && exists(/usr/bin/clang) && \
+exists(/usr/include/c++/v1/__config))
+CC=		/usr/bin/clang
+CPP=		/usr/bin/clang-cpp
+CXX=		/usr/bin/clang++
+CXXFLAGS+=	-stdlib=libc++
+.else
+USE_GCC=	4.8+
+.endif
+
+post-install:
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/trojita/distinfo b/mail/trojita/distinfo
index 40ab09d..1450e68 100644
--- a/mail/trojita/distinfo
+++ b/mail/trojita/distinfo
@@ -1,2 +1,2 @@
-SHA256 (trojita-0.3.93.tar.bz2) = 625bf7fded3f00a45f6f4eafe504fa3e20e237632072f7e47949d0a1339274e4
-SIZE (trojita-0.3.93.tar.bz2) = 966396
+SHA256 (trojita-0.3.96.tar.bz2) = f085dba2a33eed61282bdde05b0151138fbc820a7bfe4655758e1d63f31af7f1
+SIZE (trojita-0.3.96.tar.bz2) = 1068542
diff --git a/mail/trojita/pkg-plist b/mail/trojita/pkg-plist
index f372a99..45939f1 100644
--- a/mail/trojita/pkg-plist
+++ b/mail/trojita/pkg-plist
@@ -1,4 +1,6 @@
+bin/be.contacts
 bin/trojita
+lib/libtrojita_plugins.so
 share/applications/trojita.desktop
 share/icons/hicolor/32x32/apps/trojita.png
 share/icons/hicolor/scalable/apps/trojita.svg
@@ -20,12 +22,15 @@ share/icons/hicolor/scalable/apps/trojita.svg
 %%DATADIR%%/locale/trojita_common_pl.qm
 %%DATADIR%%/locale/trojita_common_pt.qm
 %%DATADIR%%/locale/trojita_common_pt_BR.qm
+%%DATADIR%%/locale/trojita_common_ro.qm
 %%DATADIR%%/locale/trojita_common_sk.qm
 %%DATADIR%%/locale/trojita_common_sv.qm
 %%DATADIR%%/locale/trojita_common_tr.qm
+%%DATADIR%%/locale/trojita_common_ug.qm
 %%DATADIR%%/locale/trojita_common_uk.qm
-%%DATADIR%%/locale/trojita_common_x-test.qm
+%%DATADIR%%/locale/trojita_common_x_test.qm
 %%DATADIR%%/locale/trojita_common_zh_CN.qm
 %%DATADIR%%/locale/trojita_common_zh_TW.qm
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%
+ at dirrmtry share/applications


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