On Thu, Nov 20, 2014 at 09:42:23AM +0100, Peter Hessler wrote:
> I ended up creating basically the same patch, this is OK from me.
>
> I like sthen's comment to move the GH_COMMIT next to the
> MODPY_EGG_VERSION, as well.
>
> (also adding the MAINTAINER to the email list)
>
>
Looks good to me. ok pea but please remove me as maintainer.
Regards,
> On 2014 Oct 30 (Thu) at 22:08:13 +0000 (+0000), Edd Barrett wrote:
> :Hey,
> :
> :Update to offlineimap. I have been running this for a while now. No
> :issues. First time I have used GH_*, so please check carefully.
> :
> :OK?
> :
> :Index: Makefile
> :===================================================================
> :RCS file: /home/edd/cvsync/ports/mail/offlineimap/Makefile,v
> :retrieving revision 1.26
> :diff -u -p -r1.26 Makefile
> :--- Makefile 11 Mar 2013 11:23:52 -0000 1.26
> :+++ Makefile 30 Oct 2014 21:58:30 -0000
> :@@ -2,7 +2,7 @@
> :
> : COMMENT= powerful IMAP/Maildir synchronization and reader support
> :
> :-MODPY_EGG_VERSION= 6.5.4
> :+MODPY_EGG_VERSION= 6.5.6
> : DISTNAME= offlineimap-${MODPY_EGG_VERSION}
> : CATEGORIES= mail
> :
> :@@ -13,15 +13,17 @@ MAINTAINER= Pierre-Emmanuel Andre <pea@o
> : # GPLv2+
> : PERMIT_PACKAGE_CDROM= Yes
> :
> :-MASTER_SITES=
> https://github.com/spaetz/offlineimap/tarball/v${MODPY_EGG_VERSION}/
> :+GH_ACCOUNT = OfflineIMAP
> :+GH_PROJECT = offlineimap
> :+GH_TAGNAME = v${MODPY_EGG_VERSION}
> :+GH_COMMIT = 7770b5ff73737d1269eb1ba7554b8d3486c7f5ec
> :+DISTNAME = offlineimap-${MODPY_EGG_VERSION}
> :
> : NO_TEST= Yes
> :
> : MODULES= lang/python
> :
> : BUILD_DEPENDS= textproc/py-docutils
> :-
> :-WRKDIST= ${WRKDIR}/spaetz-offlineimap-c9e9690
> :
> : EXAMPLESDIR= ${PREFIX}/share/examples/offlineimap
> :
> :Index: distinfo
> :===================================================================
> :RCS file: /home/edd/cvsync/ports/mail/offlineimap/distinfo,v
> :retrieving revision 1.16
> :diff -u -p -r1.16 distinfo
> :--- distinfo 15 Aug 2012 13:09:58 -0000 1.16
> :+++ distinfo 22 Oct 2014 20:51:55 -0000
> :@@ -1,2 +1,2 @@
> :-SHA256 (offlineimap-6.5.4.tar.gz) =
> gxqXtRVPOYtl4cBkJ2aLeM+DPZn6w2zIJ4rSzww5Ogw=
> :-SIZE (offlineimap-6.5.4.tar.gz) = 167023
> :+SHA256 (offlineimap-6.5.6.tar.gz) =
> wjIZzbuuf+EjRuzpTEJ3N/1Ag3IKEk//b5WibFb3KMM=
> :+SIZE (offlineimap-6.5.6.tar.gz) = 187803
> :Index: patches/patch-docs_MANUAL_rst
> :===================================================================
> :RCS file:
> /home/edd/cvsync/ports/mail/offlineimap/patches/patch-docs_MANUAL_rst,v
> :retrieving revision 1.3
> :diff -u -p -r1.3 patch-docs_MANUAL_rst
> :--- patches/patch-docs_MANUAL_rst 15 Aug 2012 13:09:59 -0000 1.3
> :+++ patches/patch-docs_MANUAL_rst 22 Oct 2014 20:51:55 -0000
> :@@ -1,7 +1,7 @@
> : $OpenBSD: patch-docs_MANUAL_rst,v 1.3 2012/08/15 13:09:59 gonzalo Exp $
> :---- docs/MANUAL.rst.orig Sat Jun 2 08:41:46 2012
> :-+++ docs/MANUAL.rst Mon Aug 6 17:32:45 2012
> :-@@ -322,7 +322,7 @@ a running offlineimap "daemon".
> :+--- docs/MANUAL.rst.orig Fri May 23 18:50:46 2014
> :++++ docs/MANUAL.rst Wed Oct 22 21:43:18 2014
> :+@@ -335,7 +335,7 @@ core.
> : Folder filtering and nametrans
> : ==============================
> :
> :Index: patches/patch-offlineimap___init___py
> :===================================================================
> :RCS file: patches/patch-offlineimap___init___py
> :diff -N patches/patch-offlineimap___init___py
> :--- /dev/null 1 Jan 1970 00:00:00 -0000
> :+++ patches/patch-offlineimap___init___py 22 Oct 2014 20:51:55 -0000
> :@@ -0,0 +1,15 @@
> :+$OpenBSD$
> :+
> :+They forgot to bump the version.
> :+
> :+--- offlineimap/__init__.py.orig Wed Oct 22 21:46:26 2014
> :++++ offlineimap/__init__.py Wed Oct 22 21:46:36 2014
> :+@@ -1,7 +1,7 @@
> :+ __all__ = ['OfflineImap']
> :+
> :+ __productname__ = 'OfflineIMAP'
> :+-__version__ = "6.5.5"
> :++__version__ = "6.5.6"
> :+ __copyright__ = "Copyright 2002-2013 John Goerzen & contributors"
> :+ __author__ = "John Goerzen"
> :+ __author_email__= "j...@complete.org"
> :Index: patches/patch-offlineimap_conf
> :===================================================================
> :RCS file:
> /home/edd/cvsync/ports/mail/offlineimap/patches/patch-offlineimap_conf,v
> :retrieving revision 1.2
> :diff -u -p -r1.2 patch-offlineimap_conf
> :--- patches/patch-offlineimap_conf 15 Aug 2012 13:09:59 -0000 1.2
> :+++ patches/patch-offlineimap_conf 22 Oct 2014 20:51:55 -0000
> :@@ -1,7 +1,7 @@
> : $OpenBSD: patch-offlineimap_conf,v 1.2 2012/08/15 13:09:59 gonzalo Exp $
> :---- offlineimap.conf.orig Sat Jun 2 08:41:46 2012
> :-+++ offlineimap.conf Mon Aug 6 17:32:45 2012
> :-@@ -312,7 +312,7 @@ ssl = yes
> :+--- offlineimap.conf.orig Fri May 23 18:50:46 2014
> :++++ offlineimap.conf Wed Oct 22 21:43:18 2014
> :+@@ -385,7 +385,7 @@ ssl = yes
> : # specified, the CA Cert(s) need to verify the Server cert AND
> : # match the hostname (* wildcard allowed on the left hand side)
> : # The certificate should be in PEM format.
> :Index: pkg/PLIST
> :===================================================================
> :RCS file: /home/edd/cvsync/ports/mail/offlineimap/pkg/PLIST,v
> :retrieving revision 1.11
> :diff -u -p -r1.11 PLIST
> :--- pkg/PLIST 13 May 2012 11:56:35 -0000 1.11
> :+++ pkg/PLIST 22 Oct 2014 20:51:55 -0000
> :@@ -8,6 +8,8 @@ lib/python${MODPY_VERSION}/site-packages
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/__init__.pyc
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/accounts.py
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/accounts.pyc
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/emailutil.py
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/emailutil.pyc
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/error.py
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/error.pyc
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/folder/
> :@@ -15,6 +17,8 @@ lib/python${MODPY_VERSION}/site-packages
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/folder/Base.pyc
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/folder/Gmail.py
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/folder/Gmail.pyc
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/folder/GmailMaildir.py
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/folder/GmailMaildir.pyc
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/folder/IMAP.py
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/folder/IMAP.pyc
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/folder/LocalStatus.py
> :@@ -27,6 +31,8 @@ lib/python${MODPY_VERSION}/site-packages
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/folder/UIDMaps.pyc
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/folder/__init__.py
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/folder/__init__.pyc
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/globals.py
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/globals.pyc
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/imaplib2.py
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/imaplib2.pyc
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/imaplibutil.py
> :@@ -46,6 +52,8 @@ lib/python${MODPY_VERSION}/site-packages
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/repository/Base.pyc
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/repository/Gmail.py
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/repository/Gmail.pyc
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/repository/GmailMaildir.py
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/repository/GmailMaildir.pyc
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/repository/IMAP.py
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/repository/IMAP.pyc
> :
> lib/python${MODPY_VERSION}/site-packages/offlineimap/repository/LocalStatus.py
> :@@ -73,6 +81,13 @@ lib/python${MODPY_VERSION}/site-packages
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/ui/__init__.pyc
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/ui/debuglock.py
> : lib/python${MODPY_VERSION}/site-packages/offlineimap/ui/debuglock.pyc
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/utils/
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/utils/__init__.py
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/utils/__init__.pyc
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/utils/const.py
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/utils/const.pyc
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/utils/stacktrace.py
> :+lib/python${MODPY_VERSION}/site-packages/offlineimap/utils/stacktrace.pyc
> : @man man/man1/offlineimap.1
> : share/examples/offlineimap/
> : share/examples/offlineimap/offlineimap.conf
> :
> :--
> :Best Regards
> :Edd Barrett
> :
> :http://www.theunixzoo.co.uk
> :
>
> --
> Don't steal; thou'lt never thus compete successfully in business.
> Cheat.
> -- Ambrose Bierce
