From nobody@FreeBSD.org  Sat Mar  8 12:01:50 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id E641EC6D
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  8 Mar 2014 12:01:50 +0000 (UTC)
Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id D3567AE0
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  8 Mar 2014 12:01:50 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s28C1oVn034911
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 8 Mar 2014 12:01:50 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s28C1nxB034909;
	Sat, 8 Mar 2014 12:01:49 GMT
	(envelope-from nobody)
Message-Id: <201403081201.s28C1nxB034909@cgiserv.freebsd.org>
Date: Sat, 8 Mar 2014 12:01:49 GMT
From: Marco Brder <marco.broeder@posteo.eu>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer-update] [patch] mail/trojita: Update to 0.4, create new slave port
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>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:    mandree
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 08 12:10:00 UTC 2014
>Closed-Date:    Sun Mar 23 17:15:10 UTC 2014
>Last-Modified:  Mon Mar 24 17:20:00 UTC 2014
>Originator:     Marco Brder
>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@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/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@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:

From: Marco =?UTF-8?B?QnLDtmRlcg==?= <marco.broeder@posteo.eu>
To: bug-followup@FreeBSD.org
Cc: marco.broeder@posteo.eu
Subject: Re: ports/187370: [maintainer-update] [patch] mail/trojita: Update
 to 0.4, create new slave port
Date: Sun, 23 Mar 2014 16:22:05 +0100

 --Sig_/jtyutcThV2UvRqA.o87n6f+
 Content-Type: multipart/mixed; boundary="MP_/kiwY8dfyKzUZKBVc_Nkcl.4"
 
 --MP_/kiwY8dfyKzUZKBVc_Nkcl.4
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline
 
 Please use this new patch, because of a new security release.
 Please consider a MFH and a vuxml entry. Thanks!
 
 
 Update to 0.4.1 release.
 
 Important: This release contains a security fix for an information leak
 with STARTTLS and PREAUTH. All users are encouraged to update as soon as
 possible!
 
 Add Qt 5 toolkit support.
 
 Convert to bzip2 USES.
 
 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=3Dyes stage check-orphans package install deinstall
 clean
 # poudriere testport ... on amd64 for head, stable/10, releng/9.2,
 releng/8.4
 
 Runtime tests:
 on recent stable/10 amd64 (after clang 3.4 import)
 
 
 Thanks!
 
 --=20
 Kind regards
 
 --MP_/kiwY8dfyKzUZKBVc_Nkcl.4
 Content-Type: text/x-patch
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename=trojita.patch
 
 ZGlmZiAtLWdpdCBhL21haWwvdHJvaml0YS1xdDQvTWFrZWZpbGUgYi9tYWlsL3Ryb2ppdGEtcXQ0
 L01ha2VmaWxlDQpuZXcgZmlsZSBtb2RlIDEwMDY0NA0KaW5kZXggMDAwMDAwMC4uMTBmNzk4Mg0K
 LS0tIC9kZXYvbnVsbA0KKysrIGIvbWFpbC90cm9qaXRhLXF0NC9NYWtlZmlsZQ0KQEAgLTAsMCAr
 MSwxNiBAQA0KKyMgQ3JlYXRlZCBieTogTWFyY28gQnJvZWRlciA8bWFyY28uYnJvZWRlckBwb3N0
 ZW8uZXU+DQorIyAkRnJlZUJTRCQNCisNCitQS0dOQU1FU1VGRklYPQktcXQ0DQorDQorTUFJTlRB
 SU5FUj0JbWFyY28uYnJvZWRlckBwb3N0ZW8uZXUNCitDT01NRU5UPQlGYXN0IGNyb3NzLXBsYXRm
 b3JtIElNQVAgZS1tYWlsIGNsaWVudCB1c2luZyBRdCA0IHRvb2xraXQNCisNCitMSUNFTlNFPQlH
 UEx2MiBHUEx2Mw0KK0xJQ0VOU0VfQ09NQj0JZHVhbA0KKw0KK0NPTkZMSUNUU19JTlNUQUxMPQl0
 cm9qaXRhLVswLTldKg0KKw0KK01BU1RFUkRJUj0JJHsuQ1VSRElSfS8uLi90cm9qaXRhDQorDQor
 LmluY2x1ZGUgIiR7TUFTVEVSRElSfS9NYWtlZmlsZSINCmRpZmYgLS1naXQgYS9tYWlsL01ha2Vm
 aWxlIGIvbWFpbC9NYWtlZmlsZQ0KaW5kZXggOWRhNmMyNS4uYWU3NDVlMCAxMDA2NDQNCi0tLSBh
 L21haWwvTWFrZWZpbGUNCisrKyBiL21haWwvTWFrZWZpbGUNCkBAIC03MjMsNiArNzIzLDcgQEAN
 CiAgICAgU1VCRElSICs9IHRtZGENCiAgICAgU1VCRElSICs9IHRwb3AzZA0KICAgICBTVUJESVIg
 Kz0gdHJvaml0YQ0KKyAgICBTVUJESVIgKz0gdHJvaml0YS1xdDQNCiAgICAgU1VCRElSICs9IHR1
 bWdyZXlzcGYNCiAgICAgU1VCRElSICs9IHVlYmltaWF1DQogICAgIFNVQkRJUiArPSB1cC1pbWFw
 cHJveHkNCmRpZmYgLS1naXQgYS9tYWlsL3Ryb2ppdGEvTWFrZWZpbGUgYi9tYWlsL3Ryb2ppdGEv
 TWFrZWZpbGUNCmluZGV4IDMxOGUzMGYuLmU2NjQ0YjIgMTAwNjQ0DQotLS0gYS9tYWlsL3Ryb2pp
 dGEvTWFrZWZpbGUNCisrKyBiL21haWwvdHJvaml0YS9NYWtlZmlsZQ0KQEAgLTIsMzAgKzIsNDQg
 QEANCiAjICRGcmVlQlNEOiBoZWFkL21haWwvdHJvaml0YS9NYWtlZmlsZSAzNDY5NjcgMjAxNC0w
 My0wMyAyMToxMzo1OVogcGF3ZWwgJA0KIA0KIFBPUlROQU1FPQl0cm9qaXRhDQotUE9SVFZFUlNJ
 T049CTAuMy45Ng0KLVBPUlRSRVZJU0lPTj0JMQ0KK1BPUlRWRVJTSU9OPQkwLjQuMQ0KIENBVEVH
 T1JJRVM9CW1haWwNCiBNQVNURVJfU0lURVM9CVNGLyR7UE9SVE5BTUV9L3NyYy8NCiANCiBNQUlO
 VEFJTkVSPQltYXJjby5icm9lZGVyQHBvc3Rlby5ldQ0KLUNPTU1FTlQ9CUZhc3QgY3Jvc3MtcGxh
 dGZvcm0gUXQgSU1BUCBlLW1haWwgY2xpZW50DQorQ09NTUVOVD0JRmFzdCBjcm9zcy1wbGF0Zm9y
 bSBJTUFQIGUtbWFpbCBjbGllbnQgdXNpbmcgUXQgNSB0b29sa2l0DQogDQogTElDRU5TRT0JR1BM
 djIgR1BMdjMNCiBMSUNFTlNFX0NPTUI9CWR1YWwNCiANCi1VU0VfQlpJUDI9CXllcw0KIFVTRV9M
 RENPTkZJRz0JeWVzDQogDQotVVNFUz0JCWNtYWtlIGNvbXBpbGVyOmMrKzExLWxpYiBkZXNrdG9w
 LWZpbGUtdXRpbHMNCitVU0VTPQkJY21ha2UgY29tcGlsZXI6YysrMTEtbGliIGRlc2t0b3AtZmls
 ZS11dGlscyB0YXI6YnppcDINCiBDTUFLRV9BUkdTKz0JLURDTUFLRV9NQUtFX1BST0dSQU06RklM
 RVBBVEg9L3Vzci9iaW4vbWFrZSBcDQotCQktRFdJVEhfUVQ1OlNUUklORz1PRkYgLURXSVRIX1RF
 U1RTOlNUUklORz1PRkYNCi0NCi1VU0VfUVQ0PQlsaW5ndWlzdF9idWlsZCBtb2NfYnVpbGQgcW1h
 a2VfYnVpbGQgcmNjX2J1aWxkIHVpY19idWlsZCBcDQotCQlzcWwtc3FsaXRlMyB3ZWJraXQNCisJ
 CS1EV0lUSF9ERVNLVE9QOlNUUklORz1PTiAtRFdJVEhfSEFSTUFUVEFOOlNUUklORz1PRkYgXA0K
 KwkJLURXSVRIX1JBR0VMOlNUUklORz1PRkYgLURXSVRIX1NIQVJFRF9QTFVHSU5TOlNUUklORz1P
 TiBcDQorCQktRFdJVEhfVEVTVFM6U1RSSU5HPU9GRiAtRFdJVEhfWkxJQjpTVFJJTkc9T04NCiAN
 CiBIQVNfQ09ORklHVVJFPQl5ZXMNCiBJTlNUQUxMU19JQ09OUz0JeWVzDQogDQorLmlmIGRlZmlu
 ZWQoUEtHTkFNRVNVRkZJWCkgJiYgJHtQS0dOQU1FU1VGRklYfSA9PSAiLXF0NCINCitDTUFLRV9B
 UkdTKz0JLURXSVRIX1FUNTpTVFJJTkc9T0ZGDQorVVNFX1FUND0JbGluZ3Vpc3RfYnVpbGQgbW9j
 X2J1aWxkIHFtYWtlX2J1aWxkIHJjY19idWlsZCB1aWNfYnVpbGQgXA0KKwkJY29yZWxpYiBkYnVz
 IGd1aSBuZXR3b3JrIG9wZW5nbCBzcWwgc3FsLXNxbGl0ZTMgd2Via2l0DQorLmVsc2UNCitDT05G
 TElDVFNfSU5TVEFMTD0JdHJvaml0YS1xdDQtWzAtOV0qDQorDQorQ01BS0VfQVJHUys9CS1EV0lU
 SF9RVDU6U1RSSU5HPU9ODQorVVNFX1FUNT0JYnVpbGR0b29sc19idWlsZCBsaW5ndWlzdHRvb2xz
 X2J1aWxkIHFtYWtlX2J1aWxkIFwNCisJCXFtbGRldnRvb2xzX2J1aWxkIGNvcmUgZGJ1cyBndWkg
 bmV0d29yayBvcGVuZ2wgcHJpbnRzdXBwb3J0IFwNCisJCXFtbCBxdWljayBzcWwgc3FsLXNxbGl0
 ZTMgd2Via2l0IHdpZGdldHMNCisuZW5kaWYNCisNCitwb3N0LXBhdGNoOg0KKwkke1JFSU5QTEFD
 RV9DTUR9IC1lICdzfCQke0xJTkdVSVNUX1BBVEh9L2Jpbnwke1FUX0JJTkRJUn18ZycgXA0KKwkJ
 JHtXUktTUkN9L2NtYWtlL0ZpbmRRdDVMaW5ndWlzdEZvclRyb2ppdGEuY21ha2UNCisNCiBwb3N0
 LWluc3RhbGw6DQogDQogLmluY2x1ZGUgPGJzZC5wb3J0Lm1rPg0KZGlmZiAtLWdpdCBhL21haWwv
 dHJvaml0YS9kaXN0aW5mbyBiL21haWwvdHJvaml0YS9kaXN0aW5mbw0KaW5kZXggMTQ1MGU2OC4u
 NzA4MTk2NiAxMDA2NDQNCi0tLSBhL21haWwvdHJvaml0YS9kaXN0aW5mbw0KKysrIGIvbWFpbC90
 cm9qaXRhL2Rpc3RpbmZvDQpAQCAtMSwyICsxLDIgQEANCi1TSEEyNTYgKHRyb2ppdGEtMC4zLjk2
 LnRhci5iejIpID0gZjA4NWRiYTJhMzNlZWQ2MTI4MmJkZGUwNWIwMTUxMTM4ZmJjODIwYTdiZmU0
 NjU1NzU4ZTFkNjNmMzFhZjdmMQ0KLVNJWkUgKHRyb2ppdGEtMC4zLjk2LnRhci5iejIpID0gMTA2
 ODU0Mg0KK1NIQTI1NiAodHJvaml0YS0wLjQuMS50YXIuYnoyKSA9IDY4YTE3NDk4ZTcwZmQ2Njk2
 NjkxN2ZlNGVjYjkwZTZmZTZmMzZmNDM5YzcxNDU1MmI4YTk3YzAwNGZlNjg3ZGUNCitTSVpFICh0
 cm9qaXRhLTAuNC4xLnRhci5iejIpID0gMTIxOTQ2MA0KZGlmZiAtLWdpdCBhL21haWwvdHJvaml0
 YS9wa2ctcGxpc3QgYi9tYWlsL3Ryb2ppdGEvcGtnLXBsaXN0DQppbmRleCBlMzdiYmU1Li41NTFl
 ZjY0IDEwMDY0NA0KLS0tIGEvbWFpbC90cm9qaXRhL3BrZy1wbGlzdA0KKysrIGIvbWFpbC90cm9q
 aXRhL3BrZy1wbGlzdA0KQEAgLTE2LDggKzE2LDEwIEBAIHNoYXJlL2ljb25zL2hpY29sb3Ivc2Nh
 bGFibGUvYXBwcy90cm9qaXRhLnN2Zw0KICUlREFUQURJUiUlL2xvY2FsZS90cm9qaXRhX2NvbW1v
 bl9nbC5xbQ0KICUlREFUQURJUiUlL2xvY2FsZS90cm9qaXRhX2NvbW1vbl9odS5xbQ0KICUlREFU
 QURJUiUlL2xvY2FsZS90cm9qaXRhX2NvbW1vbl9pYS5xbQ0KKyUlREFUQURJUiUlL2xvY2FsZS90
 cm9qaXRhX2NvbW1vbl9pdC5xbQ0KICUlREFUQURJUiUlL2xvY2FsZS90cm9qaXRhX2NvbW1vbl9s
 dC5xbQ0KICUlREFUQURJUiUlL2xvY2FsZS90cm9qaXRhX2NvbW1vbl9tci5xbQ0KKyUlREFUQURJ
 UiUlL2xvY2FsZS90cm9qaXRhX2NvbW1vbl9uYi5xbQ0KICUlREFUQURJUiUlL2xvY2FsZS90cm9q
 aXRhX2NvbW1vbl9ubC5xbQ0KICUlREFUQURJUiUlL2xvY2FsZS90cm9qaXRhX2NvbW1vbl9wbC5x
 bQ0KICUlREFUQURJUiUlL2xvY2FsZS90cm9qaXRhX2NvbW1vbl9wdC5xbQ0K
 
 --MP_/kiwY8dfyKzUZKBVc_Nkcl.4--
 
 --Sig_/jtyutcThV2UvRqA.o87n6f+
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAEBCgAGBQJTLvwdAAoJEEjQ6Txo1AoUQqUQAINQTHHIcmTVk46W4n2gUYNf
 CaigaBb7CoCZsYQWAUwDxNc3FawuodcJHWgO6JnwnmTxQF5AmUPZ8uqStgzy0ZQG
 QnrAwKipMcexxjNHWNDs8AwALoyTHzqH8lXXg2HxtM7B+wfdlNZoCZAyGXBn9e/R
 IpNupw//nsUW20qR0muz7GLKYMnSx6IdK/YaAhnMEdm7ikGSuohElxNudYytkr4W
 2GcSvSvUgt6bwItPQVfLhQ8nhQmmGLUd6Lev9LU8ZHzhLFLe4rVFayI4wgFiQZJ4
 3P5zGQKtOatYYf0HPDTNZ/g3t6mQ6fnnqeCT+I1xEZj4uPSqajixp+xd0ugkwQds
 Mib4fUkDT6SNKpKQnSDDHA1SCRtfMJSaSIkpRhMxQ1kPiAkPbCGNuMcO+wMnYAYQ
 OAAyJsTIvrqZDNXsutMaBYUxc1UwLLP0tUY4AQUYltyaE4UvtglvjHYattNPiwiR
 FIWm1BJAFCPO6t+btqajfNqKvyUZb0R3yIIn6GihFHwD97XN0Uwxbk4EDp2zc/ry
 lDd9PlGOTq0VvxK8QCApBIdU7YXx/BqpnzSkpBsUj/BXqvRHD3AhVPgAGDOvff59
 Qx1cDMou8yWDhRItBS0bjYFzoJp4gEMRQRpgNU4rmaxGel2mYx+qw/45CDsEK9HG
 n7r+DTW4IwBLfudwIVUw
 =jg62
 -----END PGP SIGNATURE-----
 
 --Sig_/jtyutcThV2UvRqA.o87n6f+--
Responsible-Changed-From-To: freebsd-ports-bugs->mandree 
Responsible-Changed-By: mandree 
Responsible-Changed-When: Sun Mar 23 16:49:54 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187370 
State-Changed-From-To: open->closed 
State-Changed-By: mandree 
State-Changed-When: Sun Mar 23 17:15:09 UTC 2014 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187370 

From: Matthias Andree <mandree@FreeBSD.org>
To: bug-followup@FreeBSD.org, marco.broeder@posteo.eu
Cc:  
Subject: Re: ports/187370: [maintainer-update] [patch] mail/trojita: Update
 to 0.4, create new slave port
Date: Sun, 23 Mar 2014 18:16:38 +0100

 Note that I converted line endings from CRLF ("dos" or "Windows"-style)
 to Unix style in all files.
 
 Please make sure to submit future patches with Unix (LF-only) line ends.

From: Marco =?UTF-8?B?QnLDtmRlcg==?= <marco.broeder@posteo.eu>
To: Matthias Andree <mandree@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/187370: [maintainer-update] [patch] mail/trojita: Update
 to 0.4, create new slave port
Date: Sun, 23 Mar 2014 19:06:31 +0100

 --Sig_/jdJ6ultvxtRSC1AXjzNyu4z
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 
 On Sun, 23 Mar 2014 18:16:38 +0100
 Matthias Andree <mandree@FreeBSD.org> wrote:
 
 > Note that I converted line endings from CRLF ("dos" or "Windows"-style)
 > to Unix style in all files.
 >=20
 > Please make sure to submit future patches with Unix (LF-only) line ends.
 
 Sorry for this trouble! But I have actually no idea where those CRLFs come
 from. I do not use Windows, just FreeBSD exclusively.
 
 Emacs and Git both use and show (of course) LF line endings. I configured
 them to highlight non-Unix line endings and whitespace issues.
 
 First I thought Gnats stored it wrong, but I verified my submitted patch.
 The local stored file (directly from Git) and the downloaded patch from
 Gnats web interface both use Unix LF line endings.
 
 I really do not know where this comes from. But from my side everything
 looks alright like always. I never had any complain about something like
 this.
 
 I am sorry!
 
 And thank you for your very quick commit!
 
 --=20
 Kind regards
 
 --Sig_/jdJ6ultvxtRSC1AXjzNyu4z
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAEBCgAGBQJTLyKnAAoJEEjQ6Txo1AoUx3IP/204xePYWG9gbEyEBw7BJsxw
 RuCJIS7KVyf7XoYGSstfNnv5Py+bwY4q2yDVB7SCauzLm6UW7sOofbUS+LDcxIeP
 AdTn+hsCL0n6xZD+mVk3A3/FiPmxEgyjy8JUl7qMcT0LHYiHB+MvUAYR9ln35f8Y
 jjZwZ8qkLNskdOm8ALz9OQWdNz/rvuHl0jjJcz5lnByO+2zFgs3TqIt0XbPrmHIX
 t04URnEwmiHWid1oWtglyeUVdif5kEih0wljoOx/PEh4li1nVzcTUjhuIpPY9xUn
 as47duFz3LnyX83rssDCWKCVnBEXPcah9HfTqH4R5eguT5PI7uHh89KLx0ID38iT
 1+2U/OfecIcpHb8BbZ+3jRB5aTrnhcA90P11dZ/F0pYokqCQboMBJOgPjIIzKGCp
 rt0sQ/c/ncCwPQUQGZVYAAtCTMQ7GNQYQjUpwdvMqItn5IyLlMvybnNnaXfMPUQo
 PtchJB4md52Ovjcs4y6PVbHeWf4YUiEnffJ+xg3C4R9G0ods2eqst+yU9kjeFveF
 p18lql3S6cRJn64VATg7cgUWC+kps72hxqix1jByrlOoQeyhMx5GH3iabsDRJJFn
 Bc1C9FJzXXRpgKwEtZbX/Jb1Up+T43oeU1XaNRJSmN1PJrtKgL1UfUjSod5GsL2t
 g2qXj73NSzQssUzr6QeG
 =lBod
 -----END PGP SIGNATURE-----
 
 --Sig_/jdJ6ultvxtRSC1AXjzNyu4z--

From: Matthias Andree <mandree@FreeBSD.org>
To: marco.broeder@posteo.eu
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/187370: [maintainer-update] [patch] mail/trojita: Update
 to 0.4, create new slave port
Date: Sun, 23 Mar 2014 19:42:55 +0100

 Am 23.03.2014 19:06, schrieb Marco Brder:
 > On Sun, 23 Mar 2014 18:16:38 +0100
 > Matthias Andree <mandree@FreeBSD.org> wrote:
 > 
 >> Note that I converted line endings from CRLF ("dos" or "Windows"-style)
 >> to Unix style in all files.
 >>
 >> Please make sure to submit future patches with Unix (LF-only) line ends.
 > 
 > Sorry for this trouble! But I have actually no idea where those CRLFs come
 > from. I do not use Windows, just FreeBSD exclusively.
 > 
 > Emacs and Git both use and show (of course) LF line endings. I configured
 > them to highlight non-Unix line endings and whitespace issues.
 > 
 > First I thought Gnats stored it wrong, but I verified my submitted patch.
 > The local stored file (directly from Git) and the downloaded patch from
 > Gnats web interface both use Unix LF line endings.
 
 Interesting.
 
 I used wget on FreeBSD 9.2 to fetch the patch from the GNATS web
 interface, and the patch appears to have double line spacing there, too.

From: Marco =?UTF-8?B?QnLDtmRlcg==?= <marco.broeder@posteo.eu>
To: Matthias Andree <mandree@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/187370: [maintainer-update] [patch] mail/trojita: Update
 to 0.4, create new slave port
Date: Mon, 24 Mar 2014 18:17:51 +0100

 --Sig_/1sS10hIxo80akPBvt4HAPgS
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 
 On Sun, 23 Mar 2014 19:42:55 +0100
 Matthias Andree <mandree@FreeBSD.org> wrote:
 
 > Interesting.
 >=20
 > I used wget on FreeBSD 9.2 to fetch the patch from the GNATS web
 > interface, and the patch appears to have double line spacing there,
 > too.
 
 I verified everything locally stored on my side is in Unix EoL. It
 would be a big surprise if not. So that is not the problem.
 
 I have something new learned.
 
 Firefox behaves strangely. Yesterday I downloaded the Gnats stored
 patch via `Save Link As' and verified it with Emacs, Vi, Diffuse and
 Kate. All of them showed Unix LF EoL. Today I did the same, but via
 `Save Page As' from opened site
 
 https://www.freebsd.org/cgi/query-pr.cgi?pr=3D187370&getpatch=3D2
 
 and now, that file actually has CR/LF EoL. I do not know why it was
 different yesterday.
 
 So the Gnats stored patch is indeed not the same as my locally stored.
 
 Either Gnats or my MUA modified the patch. It was sent with base64
 encoding. And looking at the MIME specification it specifies that any
 extra-alphabetic characters must be ignored by a compliant decoder,
 although most implementations use a CR/LF newline pair to delimit
 encoded lines.
 
 There it is! My MUA (Claws Mail) seems to use LF not CR/LF (the
 extracted file from email has LF EoL). It looks like Gnats is the
 culprit, because it uses CR/LF.
 
 So base64 encoded email attachments are _not_ usable with Gnats.
 
 Lesson learned.
 
 --=20
 Kind regards
 
 --Sig_/1sS10hIxo80akPBvt4HAPgS
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAEBCgAGBQJTMGi/AAoJEEjQ6Txo1AoUf1cP/iR79DxPi//pke3lPHzEwEg4
 WM1ItSA8XpeuSziZPLL0XYa59v/mBdwWiNw1UjvmILsg75x1pMGjUzIq0rTqGI4G
 Rut5I78osJamZgdimgyo3zo5ILQFOUAp8FLj/FuMpRgk9WxWupa8U20orbCO44i+
 d3bJHJRBmCF5cIXtD8j75PBAJ15Y1N++zavRuKGHD2b5w9SSvkc7oJcJSKqqGe8N
 f6L9EM3OxgwmunAi3uKMoMJK8XaOea7YGuXraENHrVJH6zJ4TyxyrybHCL0GrCyT
 VmarI70jvJye+xvk/Gu0018dO+VDCRceXjROFD4wryEiXUu8RHXH+JIPrOmx9Ggg
 iaqqYfEtpeHHwMD5CQPEbk3dsBIqZbm9992xe8fY+Yp+W4SLE4988ERB+Lx8Ygrc
 QkDOUHtokxO+rZfCUXe0TX1/z4fezZhvRRw8v2aJAfGBkwd5mSTppWaf/BkRgQlM
 A1wEKdCi8dWqiVawh3MEaHFoAMFgVTI45KzBDN4LQ2RXGdX8VFx30LOnCQ/2wzR5
 bmUGojvSttVhYq9vrI+nzqAmALMt0fcgXMe1ZrUk2JVJCY528JLrl3VzOY3xuLVp
 q+JOuyYNlMtOkS0YfUZYwQVMpkZ2PeY2wC1VvL4zzp1VnZRS6+JV2KfTh2cl6il5
 AVi+wG52Ktd45qqRu2jp
 =D2Gp
 -----END PGP SIGNATURE-----
 
 --Sig_/1sS10hIxo80akPBvt4HAPgS--
>Unformatted:
