On Sun, Nov 29, 2015 at 11:45:25AM +0000, Edd Barrett wrote:
> On Sun, Nov 29, 2015 at 11:05:15AM +0100, Remi Locherer wrote:
> > This is an update for mail/offlineimp to version 6.5.7.
>
> Looks good. A couple of comments:
>
> * Trailing spaces on your post-build lines.
Removed in the new diff. How do you spot these?
> * I don't actually use offlineimap, so it makes little sense for me to
> be MAINTAINER. Do you want it?
Sure.
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/offlineimap/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile 5 Apr 2015 13:31:14 -0000 1.28
+++ Makefile 29 Nov 2015 20:15:12 -0000
@@ -2,7 +2,7 @@
COMMENT= powerful IMAP/Maildir synchronization and reader support
-MODPY_EGG_VERSION = 6.5.6
+MODPY_EGG_VERSION = 6.5.7
GH_ACCOUNT = OfflineIMAP
GH_PROJECT = offlineimap
GH_TAGNAME = v${MODPY_EGG_VERSION}
@@ -11,7 +11,7 @@ CATEGORIES= mail
HOMEPAGE= http://offlineimap.org/
-MAINTAINER= Edd Barrett <e...@openbsd.org>
+MAINTAINER= Remi Locherer <remi.loche...@relo.ch>
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
@@ -20,16 +20,18 @@ NO_TEST= Yes
MODULES= lang/python
-BUILD_DEPENDS= textproc/py-docutils
+BUILD_DEPENDS= textproc/asciidoc
EXAMPLESDIR= ${PREFIX}/share/examples/offlineimap
post-build:
- @cd ${WRKSRC}/docs && ${LOCALBASE}/bin/rst2man MANUAL.rst
${WRKBUILD}/offlineimap.1
+ ${LOCALBASE}/bin/a2x -f manpage ${WRKSRC}/docs/offlineimap.txt
+ ${LOCALBASE}/bin/a2x -f manpage ${WRKSRC}/docs/offlineimapui.txt
post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/offlineimap.conf{,.minimal} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/offlineimap.1 ${PREFIX}/man/man1
+ ${INSTALL_DATA} ${WRKSRC}/docs/offlineimap.1 ${PREFIX}/man/man1
+ ${INSTALL_DATA} ${WRKSRC}/docs/offlineimapui.7 ${PREFIX}/man/man7
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/offlineimap/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 24 Nov 2014 10:01:47 -0000 1.17
+++ distinfo 29 Nov 2015 08:38:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (offlineimap-6.5.6.tar.gz) =
wjIZzbuuf+EjRuzpTEJ3N/1Ag3IKEk//b5WibFb3KMM=
-SIZE (offlineimap-6.5.6.tar.gz) = 187803
+SHA256 (offlineimap-6.5.7.tar.gz) =
t95Sx9iZXgZXu1XaE1McjW+W2CghcVlHfGha5AjjkKM=
+SIZE (offlineimap-6.5.7.tar.gz) = 666620
Index: patches/patch-docs_MANUAL_rst
===================================================================
RCS file: patches/patch-docs_MANUAL_rst
diff -N patches/patch-docs_MANUAL_rst
--- patches/patch-docs_MANUAL_rst 24 Nov 2014 10:01:47 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-docs_MANUAL_rst,v 1.4 2014/11/24 10:01:47 edd Exp $
---- 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
- ==============================
-
--OfflineImap offers flexible (and complex) ways of filtering and transforming
folder names. Please see the docs/dev-docs-src/folderfilters.rst document about
details how to use folder filters and name transformations. The documentation
will be autogenerated by a "make dev-doc" in the docs directory. It is also
viewable at :ref:`folder_filtering_and_name_translation`.
-+OfflineImap offers flexible (and complex) ways of filtering and transforming
folder names. Please see the docs/dev-docs-src/folderfilters.rst document about
details how to use folder filters and name transformations. The documentation
will be autogenerated by a "make dev-doc" in the docs directory. It is also
viewable at `folder_filtering_and_name_translation`.
-
- KNOWN BUGS
- ==========
Index: patches/patch-offlineimap___init___py
===================================================================
RCS file: patches/patch-offlineimap___init___py
diff -N patches/patch-offlineimap___init___py
--- patches/patch-offlineimap___init___py 24 Nov 2014 10:01:47 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-offlineimap___init___py,v 1.1 2014/11/24 10:01:47 edd Exp $
-
-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: /cvs/ports/mail/offlineimap/patches/patch-offlineimap_conf,v
retrieving revision 1.3
diff -u -p -r1.3 patch-offlineimap_conf
--- patches/patch-offlineimap_conf 24 Nov 2014 10:01:47 -0000 1.3
+++ patches/patch-offlineimap_conf 29 Nov 2015 08:38:15 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-offlineimap_conf,v 1.3 2014/11/24 10:01:47 edd Exp $
---- 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.
--# sslcacertfile = /path/to/cacertfile.crt
+$OpenBSD$
+--- offlineimap.conf.orig Wed Nov 11 13:34:03 2015
++++ offlineimap.conf Wed Nov 11 13:34:50 2015
+@@ -593,7 +593,7 @@ remotehost = examplehost
+ # You can also use fingerprint verification via cert_fingerprint.
+ # See below for more verbose explanation.
+ #
+-#sslcacertfile = /path/to/cacertfile.crt
+sslcacertfile = /etc/ssl/cert.pem
- # If you connect via SSL/TLS (ssl=true) and you have no CA certificate
- # specified, offlineimap will refuse to sync as it connects to a server
+
+ # This option stands in the [Repository RemoteExample] section.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/offlineimap/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 24 Nov 2014 10:01:47 -0000 1.12
+++ pkg/PLIST 29 Nov 2015 09:34:58 -0000
@@ -86,9 +86,12 @@ lib/python${MODPY_VERSION}/site-packages
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/distro.py
+lib/python${MODPY_VERSION}/site-packages/offlineimap/utils/distro.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
+@man man/man7/offlineimapui.7
share/examples/offlineimap/
share/examples/offlineimap/offlineimap.conf
share/examples/offlineimap/offlineimap.conf.minimal
