From rea@codelabs.ru  Tue Jul 12 21:37:06 2011
Return-Path: <rea@codelabs.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0509D106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 12 Jul 2011 21:37:06 +0000 (UTC)
	(envelope-from rea@codelabs.ru)
Received: from 0.mx.codelabs.ru (0.mx.codelabs.ru [144.206.177.45])
	by mx1.freebsd.org (Postfix) with ESMTP id E5B9F8FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 12 Jul 2011 21:37:04 +0000 (UTC)
Received: from void.codelabs.ru (void.codelabs.ru [144.206.177.25])
	by 0.mx.codelabs.ru with esmtps (TLSv1:CAMELLIA256-SHA:256)
	id 1QgkSY-000FrQ-7o for FreeBSD-gnats-submit@freebsd.org; Wed, 13 Jul 2011 01:25:39 +0400
Message-Id: <20110712212537.ABADFDA84F@void.codelabs.ru>
Date: Wed, 13 Jul 2011 01:25:37 +0400 (MSD)
From: Eygene Ryabinkin <rea@freebsd.org>
Reply-To: Eygene Ryabinkin <rea@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] mail/offlineimap: update to 6.3.3
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         158845
>Category:       ports
>Synopsis:       [patch] mail/offlineimap: update to 6.3.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sergei
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 12 21:40:06 UTC 2011
>Closed-Date:    Wed Jul 13 06:48:42 UTC 2011
>Last-Modified:  Wed Jul 13 07:00:38 UTC 2011
>Originator:     Eygene Ryabinkin
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
Code Labs
>Environment:

FreeBSD 9.0-CURRENT amd64

>Description:

OfflineIMAP 6.3.3 is out:
  https://github.com/nicolas33/offlineimap

>How-To-Repeat:

Look at the URL cited above.

>Fix:

The following patch updates the port.  I had dropped GitHub download
URL, since they are using Nodeload that has no trailing filename
in the master URL [1] and the intermediate URL [2] that [1] will
redirect us to is non-permanent, but constructed on-the-fly.

[1] https://nodeload.github.com/nicolas33/offlineimap/tarball/v6.3.3
[2] https://download.github.com/nicolas33-offlineimap-v6.3.3-0-g3b09695.tar.gz

--- port-update-to-6.3.3.diff begins here ---
From f61d1534036cf9a5e333e8327a238fdd0a226414 Mon Sep 17 00:00:00 2001
From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
Date: Thu, 30 Jun 2011 13:04:33 +0400

Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
---
 mail/offlineimap/Makefile             |   54 +++++++++++++++++++++++++++-----
 mail/offlineimap/distinfo             |    5 +--
 mail/offlineimap/files/pkg-message.in |   10 +++---
 mail/offlineimap/pkg-plist            |   17 ++--------
 4 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 482242c..44da547 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -6,34 +6,70 @@
 #
 
 PORTNAME=	offlineimap
-DISTVERSION=	6.2.0.2
-DISTVERSIONSUFFIX=-0-g6b1cb5e
+DISTVERSION=	6.3.3
+DISTVERSIONSUFFIX=-0-g3b09695
 CATEGORIES=	mail python
-MASTER_SITES=	http://download.github.com/ \
+MASTER_SITES=	http://dist.codelabs.ru/fbsd/offlineimap/ \
 		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	sergei
-DISTNAME=	jgoerzen-${PORTNAME}-debian-${DISTVERSION}${DISTVERSIONSUFFIX}
+MASTER_SITE_SUBDIR=	rea/dist/offlineimap
+DISTNAME=	${GITHUB_USER}-${PORTNAME}-v${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Powerful IMAP/Maildir synchronization and reader support
 
-WRKSRC=		${WRKDIR}/jgoerzen-${PORTNAME}-0f1a667
+WRKSRC=		${WRKDIR}/${GITHUB_USER}-${PORTNAME}-cf325d5
 SUB_FILES=	pkg-message
 
+GITHUB_USER=	nicolas33
+
+.if defined(NOPORTEXAMPLES)
+SUB_LIST+=	PORTEXAMPLES="@comment "
+.else
+SUB_LIST+=	PORTEXAMPLES=""
+.endif
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGVERSION=${PORTVERSION:R}
+PYDISTUTILS_PKGVERSION=${PORTVERSION}
 
-DOCS=		COPYING COPYRIGHT FAQ.html UPGRADING
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+=	rst2html:${PORTSDIR}/textproc/py-docutils
+.endif
+
+RSTDOCS=	Changelog.rst README.rst SubmittingPatches.rst \
+		docs/FAQ.rst docs/INSTALL.rst docs/MANUAL.rst docs/UPGRADE.rst
+DOCS=		COPYING COPYRIGHT
 EXAMPLES=	offlineimap.conf offlineimap.conf.minimal
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	${DOCS:T}
+.endif
+.if !defined(NOPORTEXAMPLES)
+PORTEXAMPLES=	${EXAMPLES}
+.endif
+
+.if !defined(NOPORTDOCS)
+.for r in ${RSTDOCS}
+DOCS+=	${r:R}.html
+.endfor
+.endif
+
+post-build:
+.if !defined(NOPORTDOCS)
+.for r in ${RSTDOCS}
+	rst2html ${WRKSRC}/${r} ${WRKSRC}/${r:R}.html
+.endfor
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
-	@${CAT} ${PKGMESSAGE}
+.endif
+	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo
index 5b8cab0..bdacc4e 100644
--- a/mail/offlineimap/distinfo
+++ b/mail/offlineimap/distinfo
@@ -1,3 +1,2 @@
-MD5 (jgoerzen-offlineimap-debian-6.2.0.2-0-g6b1cb5e.tar.gz) = e1a01b6b1c1a70a1afaefb0a20634bc1
-SHA256 (jgoerzen-offlineimap-debian-6.2.0.2-0-g6b1cb5e.tar.gz) = 04b5757db2447164c43424f68b774c1e6ef6883c9b776ce48dd3109815569b85
-SIZE (jgoerzen-offlineimap-debian-6.2.0.2-0-g6b1cb5e.tar.gz) = 103955
+SHA256 (nicolas33-offlineimap-v6.3.3-0-g3b09695.tar.gz) = 762591144f13423da6020ba840e2eb216c4ed45839f1881ac90d9e3dd57f4eca
+SIZE (nicolas33-offlineimap-v6.3.3-0-g3b09695.tar.gz) = 117153
diff --git a/mail/offlineimap/files/pkg-message.in b/mail/offlineimap/files/pkg-message.in
index ee7feab..db2a1fc 100644
--- a/mail/offlineimap/files/pkg-message.in
+++ b/mail/offlineimap/files/pkg-message.in
@@ -1,11 +1,11 @@
 ###########################################################################
-# 
-# Please copy sample configuration file from 
-# %%EXAMPLESDIR%%/offlineimap.conf.minimal 
-# to ~/.offlineimaprc and edit to suit your needs.
 #
+%%PORTEXAMPLES%%# Please copy sample configuration file from 
+%%PORTEXAMPLES%%# %%EXAMPLESDIR%%/offlineimap.conf.minimal 
+%%PORTEXAMPLES%%# to ~/.offlineimaprc and edit to suit your needs.
+%%PORTEXAMPLES%%#
 # WARNING: if you are upgrading from pre-3.99.12 version, please be sure 
 #          to check the manual for changes in configuration file format 
 #          that are incompatible with your existing configuration.
-#
+# 
 ###########################################################################
diff --git a/mail/offlineimap/pkg-plist b/mail/offlineimap/pkg-plist
index 8f432fd..6181761 100644
--- a/mail/offlineimap/pkg-plist
+++ b/mail/offlineimap/pkg-plist
@@ -65,9 +65,6 @@ bin/offlineimap
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.py
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/offlineimap/ui
 %%PYTHON_SITELIBDIR%%/offlineimap/__init__.py
 %%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyc
@@ -81,6 +78,9 @@ bin/offlineimap
 %%PYTHON_SITELIBDIR%%/offlineimap/imaplibutil.py
 %%PYTHON_SITELIBDIR%%/offlineimap/imaplibutil.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/imaplibutil.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/imaplib2.py
+%%PYTHON_SITELIBDIR%%/offlineimap/imaplib2.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/imaplib2.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/imapserver.py
 %%PYTHON_SITELIBDIR%%/offlineimap/imapserver.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/imapserver.pyo
@@ -102,15 +102,4 @@ bin/offlineimap
 %%PYTHON_SITELIBDIR%%/offlineimap/threadutil.py
 %%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/version.py
-%%PYTHON_SITELIBDIR%%/offlineimap/version.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/version.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/offlineimap
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/offlineimap.conf
-%%EXAMPLESDIR%%/offlineimap.conf.minimal
-@dirrm %%EXAMPLESDIR%%
-- 
1.7.5.4
--- port-update-to-6.3.3.diff ends here ---

Here are Tinderbox checks:
 - http://gpf.codelabs.ru/tb-logs/mine-9/offlineimap-6.3.3.log
 - http://gpf.codelabs.ru/tb-logs/mine-8/offlineimap-6.3.3.log
 - http://gpf.codelabs.ru/tb-logs/mine-7/offlineimap-6.3.3.log
builds are OK.

I am using the new version for some time and hadn't encountered
any issues up to date.
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sergei 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jul 12 21:40:16 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: Pan Tsu <inyaoo@gmail.com>
To: Eygene Ryabinkin <rea@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/158845: [patch] mail/offlineimap: update to 6.3.3
Date: Wed, 13 Jul 2011 02:03:07 +0400

 Eygene Ryabinkin <rea@FreeBSD.org> writes:
 
 >>Synopsis:       [patch] mail/offlineimap: update to 6.3.3
 
 You're too late. v6.3.3 is already in ports tree.
 Can you regenerate the diff?
 
 [...]
 > +DOCS=		COPYING COPYRIGHT
 
 COPYING should be installed using license framework.
 COPYRIGHT is obsolete, there are files not assigned to jgoerzen@.
 
 > +.if !defined(NOPORTDOCS)
 > +BUILD_DEPENDS+=	rst2html:${PORTSDIR}/textproc/py-docutils
 > +.endif
 
 As .rst can be easily viewed without post-processing why not use OPTIONS
 for html documentation?
State-Changed-From-To: open->closed 
State-Changed-By: rea 
State-Changed-When: Wed Jul 13 06:48:19 UTC 2011 
State-Changed-Why:  
Superseded by ports/158862. 

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

From: Eygene Ryabinkin <rea@FreeBSD.org>
To: Pan Tsu <inyaoo@gmail.com>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/158845: [patch] mail/offlineimap: update to 6.3.3
Date: Wed, 13 Jul 2011 10:41:00 +0400

 --UHN/qo2QbUvPLonB
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Wed, Jul 13, 2011 at 02:03:07AM +0400, Pan Tsu wrote:
 > Eygene Ryabinkin <rea@FreeBSD.org> writes:
 >=20
 > >>Synopsis:       [patch] mail/offlineimap: update to 6.3.3
 >=20
 > You're too late. v6.3.3 is already in ports tree.
 > Can you regenerate the diff?
 
 Damn, I mocked with GitHub downloads stuff inside my shell
 and hadn't faced the real world for too long :(
 
 > > +.if !defined(NOPORTDOCS)
 > > +BUILD_DEPENDS+=3D	rst2html:${PORTSDIR}/textproc/py-docutils
 > > +.endif
 >=20
 > As .rst can be easily viewed without post-processing why not use
 > OPTIONS for html documentation?
 
 Good catch: I'll open another PR and will close this, since its
 synopsis and contents aren't correct anymore.
 --=20
 Eygene Ryabinkin                                        ,,,^..^,,,
 [ Life's unfair - but root password helps!           | codelabs.ru ]
 [ 82FE 06BC D497 C0DE 49EC  4FF0 16AF 9EAE 8152 ECFB | freebsd.org ]
 
 --UHN/qo2QbUvPLonB
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (Darwin)
 
 iF4EAREIAAYFAk4dPfwACgkQFq+eroFS7PvZjQD/WFlAgLNkH8Lt6T0JSWTBFUFx
 Mjim8sQwxz7IEaMNrc0A/2heO3sxlc8BJqIp7zdJvShbkyDHzMDXV29H4uI/vXdK
 =csDN
 -----END PGP SIGNATURE-----
 
 --UHN/qo2QbUvPLonB--
>Unformatted:
