Re: [update] mail/mu-1.4.3

2020-05-04 Thread Miguel 
On Sun, May 03, 2020 at 01:23:34PM +0200, Stefan Hagen wrote:
> Stefan Hagen wrote:
> > Miguel wrote:
> >> - Added README for upgrade
> >
> > I just saw we can just put the release announcement here.
> > https://github.com/djcb/mu/releases/tag/1.4
> >
> > The new release is incompatible. The mu commands are reporting the
> > incompatibility, for example mu index -m ~/Mails reports, that you need
> > to run mu init first and omit the -m. But it will break scripts if the
> > user does not adapt them.
> >
> > I think it would make sense to add a pkg/MESSAGE to notified the user
> > about the incompatibility.

(Sorry for the delay replying.)

Thanks for taking care of this, Stefan.  And sorry for messing up with the
missing README file -- I totally failed to prepare that diff.

> I created a new patch, but now as I see it in action I'm unsure about
> the MESSAGE:
> 
> ===>Installing mu-1.4.3 from /usr/ports/packages/amd64/all/
> mu-1.4.3: ok
> New and changed readme(s):
> /usr/local/share/doc/pkg-readmes/mu
> --- +mu-1.4.3 ---
> The mu tools command line interface and default paths have been changed.
> Review share/doc/pkg-readmes/mu for details.
> 
> The last line may be redundant. What do you think?

Well, I'm OK either way (with or without the MESSAGE).  What I think it's
probably redundant is the contents of the README, which includes a lot of
info taken from a file that's already included in the package
(share/doc/mu/NEWS.org).

FWIW I'm including my original README bellow.  It simply summarises what's
required for upgrading from a previous version, and this is also taken
from from NEWS.org.

Cheers,
--
Miguel

+---
| Running ${PKGSTEM} on OpenBSD
+---

Upgrading to 1.4.x
==
- Close emacs application

- Run 'mu init'

- Make sure 'mu init' points to the right Maildir folder and add your email
  address(es) the following way:

   mu init --maildir=~/Maildir --my-address=j...@example.com \
 --my-address=b...@example.com

- Once this is done run 'mu index'

- Don't forget to delete your old mail cache location if necessary

- see release notes in NEWS.org for more detail.

Re: [update] mail/mu-1.4.3

2020-05-03 Thread Stefan Hagen 
Stefan Hagen wrote:
> Miguel wrote:
>> - Added README for upgrade
>
> I just saw we can just put the release announcement here.
> https://github.com/djcb/mu/releases/tag/1.4
>
> The new release is incompatible. The mu commands are reporting the
> incompatibility, for example mu index -m ~/Mails reports, that you need
> to run mu init first and omit the -m. But it will break scripts if the
> user does not adapt them.
>
> I think it would make sense to add a pkg/MESSAGE to notified the user
> about the incompatibility.

I created a new patch, but now as I see it in action I'm unsure about
the MESSAGE:

===>Installing mu-1.4.3 from /usr/ports/packages/amd64/all/
mu-1.4.3: ok
New and changed readme(s):
/usr/local/share/doc/pkg-readmes/mu
--- +mu-1.4.3 ---
The mu tools command line interface and default paths have been changed.
Review share/doc/pkg-readmes/mu for details.

The last line may be redundant. What do you think?

Changes:
+ WANTLIB+= curses readline
+ README
+ MESSAGE

Cheers,
Stefan

Index: mail/mu/Makefile
===
RCS file: /cvs/ports/mail/mu/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- mail/mu/Makefile24 Jan 2020 10:36:41 -  1.19
+++ mail/mu/Makefile3 May 2020 11:05:11 -
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.19 2020/01/24 10:36:41 sthen Exp $
 
 COMMENT=   maildir indexer and searcher with emacs frontend
-
-DISTNAME=  mu-1.2.0
-REVISION=  0
+V= 1.4.3
+DISTNAME=  mu-${V}
 
 CATEGORIES=mail
 HOMEPAGE=  http://www.djcbsoftware.nl/code/mu/
@@ -13,12 +12,12 @@ MAINTAINER= Stefan Hagen https://github.com/djcb/mu/releases/download/1.2/
+MASTER_SITES=  https://github.com/djcb/mu/releases/download/${V}/
 EXTRACT_SUFX=  .tar.xz
 
 BUILD_DEPENDS= emacs->=24:editors/emacs
Index: mail/mu/distinfo
===
RCS file: /cvs/ports/mail/mu/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- mail/mu/distinfo21 Jul 2019 00:10:04 -  1.7
+++ mail/mu/distinfo3 May 2020 11:05:11 -
@@ -1,2 +1,2 @@
-SHA256 (mu-1.2.0.tar.xz) = 9jTH8kTcaET/cdw8PhiT5I4ZPKqeDnR+umFjCXdfBTo=
-SIZE (mu-1.2.0.tar.xz) = 844192
+SHA256 (mu-1.4.3.tar.xz) = 
f819db50a21eb200f015ff3486e9bb9db51e0a616aa9dd257b6654512c7c782a
+SIZE (mu-1.4.3.tar.xz) = 875272
Index: mail/mu/patches/patch-lib_parser_utils_cc
===
RCS file: /cvs/ports/mail/mu/patches/patch-lib_parser_utils_cc,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-lib_parser_utils_cc
--- mail/mu/patches/patch-lib_parser_utils_cc   26 Jul 2019 06:41:59 -  
1.1
+++ mail/mu/patches/patch-lib_parser_utils_cc   3 May 2020 11:05:11 -
@@ -1,11 +1,11 @@
 $OpenBSD: patch-lib_parser_utils_cc,v 1.1 2019/07/26 06:41:59 pvk Exp $
 Bring g_vasprintf into scope
-Index: lib/parser/utils.cc
 lib/parser/utils.cc.orig
-+++ lib/parser/utils.cc
-@@ -17,7 +17,7 @@
- **  02110-1301, USA.
+Index: lib/utils/mu-utils.cc
+--- lib/utils/mu-utils.cc.orig
 lib/utils/mu-utils.cc
+@@ -18,7 +18,7 @@
  */
+ 
  
 -#define _XOPEN_SOURCE
 +#define _XOPEN_SOURCE_EXTENDED 1
Index: mail/mu/pkg/MESSAGE
===
RCS file: mail/mu/pkg/MESSAGE
diff -N mail/mu/pkg/MESSAGE
--- /dev/null   1 Jan 1970 00:00:00 -
+++ mail/mu/pkg/MESSAGE 3 May 2020 11:05:11 -
@@ -0,0 +1,2 @@
+The mu tools command line interface and default paths have been changed.
+Review share/doc/pkg-readmes/${PKGSTEM} for details.
Index: mail/mu/pkg/PLIST
===
RCS file: /cvs/ports/mail/mu/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- mail/mu/pkg/PLIST   20 May 2018 08:02:14 -  1.6
+++ mail/mu/pkg/PLIST   3 May 2020 11:05:11 -
@@ -8,6 +8,8 @@
 @man man/man1/mu-find.1
 @man man/man1/mu-help.1
 @man man/man1/mu-index.1
+@man man/man1/mu-info.1
+@man man/man1/mu-init.1
 @man man/man1/mu-mkdir.1
 @man man/man1/mu-remove.1
 @man man/man1/mu-script.1
@@ -22,6 +24,7 @@
 share/doc/mu/
 share/doc/mu/NEWS.org
 share/doc/mu/mu4e-about.org
+share/doc/pkg-readmes/${PKGSTEM}
 share/emacs/
 share/emacs/site-lisp/
 share/emacs/site-lisp/mu4e/
@@ -37,6 +40,8 @@ share/emacs/site-lisp/mu4e/mu4e-draft.el
 share/emacs/site-lisp/mu4e/mu4e-draft.elc
 share/emacs/site-lisp/mu4e/mu4e-headers.el
 share/emacs/site-lisp/mu4e/mu4e-headers.elc
+share/emacs/site-lisp/mu4e/mu4e-icalendar.el
+share/emacs/site-lisp/mu4e/mu4e-icalendar.elc
 share/emacs/site-lisp/mu4e/mu4e-lists.el
 share/emacs/site-lisp/mu4e/mu4e-lists.elc
 share/emacs/site-lisp/mu4e/mu4e-main.el
@@ -47,6 +52,8 @@ share/emacs/site-lisp/mu4e/mu4e-message.
 share/emacs/site-lisp/mu4e/mu4e-message.elc
 share/emacs/site-lisp/mu4e/mu4e-meta.el
 share/emacs/site-lisp/mu4e/mu4e-meta.elc
+share/emacs/site-lisp/mu4e/mu4e-org.el

Re: [update] mail/mu-1.4.3

2020-05-02 Thread Stefan Hagen 
Hi,

> A new attempt to have mu package updated to the latest release (and this
> time Cc'ing the package maintainer).

Oha! This is what I get for monitoring https://www.djcbsoftware.nl/code/mu
instead of the github release page :( Thanks for picking this up.

> Changes:
> - Use variable to keep version and used it in DISTNAME and MASTER_SITES
> - Update distinfo
> - Refreshed patch (file renamed lib/{parser/utils.cc=>utils/mu-utils.cc}
> - Update PLIST
> - Dropped REVISION (thanks Elias!)

Thanks.

> - Added README for upgrade

This one is missing in the patch. Can you add or send it?

Also, curses and readline may be added to WANTLIB.

$ make port-lib-depends-check
mu-1.4.3(mail/mu):
Missing: curses.14 (/usr/local/bin/mu) (system lib)
Missing: readline.4 (/usr/local/bin/mu) (system lib)
WANTLIB += curses readline
*** Error 1 in target 'port-lib-depends-check' (ignored)

Otherwise it looks good to me.

Thanks,
Stefan

Re: [update] mail/mu-1.4.3

2020-05-02 Thread Stefan Hagen 
Hi,

Miguel wrote:
> - Added README for upgrade

I just saw we can just put the release announcement here.
https://github.com/djcb/mu/releases/tag/1.4

The new release is incompatible. The mu commands are reporting the
incompatibility, for example mu index -m ~/Mails reports, that you need
to run mu init first and omit the -m. But it will break scripts if the
user does not adapt them.

I think it would make sense to add a pkg/MESSAGE to notified the user
about the incompatibility.

Proposal:
The mu tools command line interface and default paths have been changed.
Review share/doc/pkg-readmes/${PKGSTEM} for details.

Best Regards,
Stefan

[update] mail/mu-1.4.3

2020-05-02 Thread Miguel 
Hi!

A new attempt to have mu package updated to the latest release (and this
time Cc'ing the package maintainer).

Please find below an update of mail/mu from 1.2.0 to 1.4.3.  Changes:

- Use variable to keep version and used it in DISTNAME and MASTER_SITES
- Update distinfo
- Refreshed patch (file renamed lib/{parser/utils.cc=>utils/mu-utils.cc}
- Added README for upgrade
- Update PLIST
- Dropped REVISION (thanks Elias!)

Cheers,
--
Miguel


diff --git a/mail/mu/Makefile b/mail/mu/Makefile
index 2062eae2a347..e21ecbcf4e9d 100644
--- a/mail/mu/Makefile
+++ b/mail/mu/Makefile
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.19 2020/01/24 10:36:41 sthen Exp $
 
 COMMENT=   maildir indexer and searcher with emacs frontend
-
-DISTNAME=  mu-1.2.0
-REVISION=  0
+V= 1.4.3
+DISTNAME=  mu-${V}
 
 CATEGORIES=mail
 HOMEPAGE=  http://www.djcbsoftware.nl/code/mu/
@@ -18,7 +17,7 @@ WANTLIB += gmodule-2.0 gobject-2.0 gpg-error gpgme gthread-2.0
 WANTLIB += iconv idn2 intl json-glib-1.0 m pcre unistring uuid
 WANTLIB += xapian z
 
-MASTER_SITES=  https://github.com/djcb/mu/releases/download/1.2/
+MASTER_SITES=  https://github.com/djcb/mu/releases/download/${V}/
 EXTRACT_SUFX=  .tar.xz
 
 BUILD_DEPENDS= emacs->=24:editors/emacs
diff --git a/mail/mu/distinfo b/mail/mu/distinfo
index 437fb1dede15..2e1dd7c7c820 100644
--- a/mail/mu/distinfo
+++ b/mail/mu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mu-1.2.0.tar.xz) = 9jTH8kTcaET/cdw8PhiT5I4ZPKqeDnR+umFjCXdfBTo=
-SIZE (mu-1.2.0.tar.xz) = 844192
+SHA256 (mu-1.4.3.tar.xz) = 
f819db50a21eb200f015ff3486e9bb9db51e0a616aa9dd257b6654512c7c782a
+SIZE (mu-1.4.3.tar.xz) = 875272
diff --git a/mail/mu/patches/patch-lib_parser_utils_cc 
b/mail/mu/patches/patch-lib_parser_utils_cc
index 58e1438e96fa..cef6a7b57378 100644
--- a/mail/mu/patches/patch-lib_parser_utils_cc
+++ b/mail/mu/patches/patch-lib_parser_utils_cc
@@ -1,8 +1,8 @@
 $OpenBSD: patch-lib_parser_utils_cc,v 1.1 2019/07/26 06:41:59 pvk Exp $
 Bring g_vasprintf into scope
-Index: lib/parser/utils.cc
 lib/parser/utils.cc.orig
-+++ lib/parser/utils.cc
+Index: lib/utils/mu-utils.cc
+--- lib/utils/mu-utils.cc.orig
 lib/utils/mu-utils.cc
 @@ -17,7 +17,7 @@
  **  02110-1301, USA.
  */
diff --git a/mail/mu/pkg/PLIST b/mail/mu/pkg/PLIST
index a24708f574d4..faac4569cc84 100644
--- a/mail/mu/pkg/PLIST
+++ b/mail/mu/pkg/PLIST
@@ -8,6 +8,8 @@
 @man man/man1/mu-find.1
 @man man/man1/mu-help.1
 @man man/man1/mu-index.1
+@man man/man1/mu-info.1
+@man man/man1/mu-init.1
 @man man/man1/mu-mkdir.1
 @man man/man1/mu-remove.1
 @man man/man1/mu-script.1
@@ -22,6 +24,7 @@
 share/doc/mu/
 share/doc/mu/NEWS.org
 share/doc/mu/mu4e-about.org
+share/doc/pkg-readmes/${PKGSTEM}
 share/emacs/
 share/emacs/site-lisp/
 share/emacs/site-lisp/mu4e/
@@ -37,6 +40,8 @@ share/emacs/site-lisp/mu4e/mu4e-draft.el
 share/emacs/site-lisp/mu4e/mu4e-draft.elc
 share/emacs/site-lisp/mu4e/mu4e-headers.el
 share/emacs/site-lisp/mu4e/mu4e-headers.elc
+share/emacs/site-lisp/mu4e/mu4e-icalendar.el
+share/emacs/site-lisp/mu4e/mu4e-icalendar.elc
 share/emacs/site-lisp/mu4e/mu4e-lists.el
 share/emacs/site-lisp/mu4e/mu4e-lists.elc
 share/emacs/site-lisp/mu4e/mu4e-main.el
@@ -47,6 +52,8 @@ share/emacs/site-lisp/mu4e/mu4e-message.el
 share/emacs/site-lisp/mu4e/mu4e-message.elc
 share/emacs/site-lisp/mu4e/mu4e-meta.el
 share/emacs/site-lisp/mu4e/mu4e-meta.elc
+share/emacs/site-lisp/mu4e/mu4e-org.el
+share/emacs/site-lisp/mu4e/mu4e-org.elc
 share/emacs/site-lisp/mu4e/mu4e-proc.el
 share/emacs/site-lisp/mu4e/mu4e-proc.elc
 share/emacs/site-lisp/mu4e/mu4e-speedbar.el
@@ -61,5 +68,3 @@ share/emacs/site-lisp/mu4e/mu4e.el
 share/emacs/site-lisp/mu4e/mu4e.elc
 share/emacs/site-lisp/mu4e/org-mu4e.el
 share/emacs/site-lisp/mu4e/org-mu4e.elc
-share/emacs/site-lisp/mu4e/org-old-mu4e.el
-share/emacs/site-lisp/mu4e/org-old-mu4e.elc

[update] mail/mu-1.4.3

2020-04-30 Thread Miguel 
Hi again!
 
A new attempt to have mu package updated to the latest release.

Please find below an update of mail/mu from 1.2.0 to 1.4.3.  Changes:

- Use variable to keep version and used it in DISTNAME and MASTER_SITES
- Update distinfo
- Refreshed patch (file renamed lib/{parser/utils.cc=>utils/mu-utils.cc}
- Added README for upgrade
- Update PLIST


diff --git a/mail/mu/Makefile b/mail/mu/Makefile
index 2062eae2a347..0c3bb202c672 100644
--- a/mail/mu/Makefile
+++ b/mail/mu/Makefile
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.19 2020/01/24 10:36:41 sthen Exp $
 
 COMMENT=   maildir indexer and searcher with emacs frontend
-
-DISTNAME=  mu-1.2.0
+V= 1.4.3
+DISTNAME=  mu-${V}
 REVISION=  0
 
 CATEGORIES=mail
@@ -18,7 +18,7 @@ WANTLIB += gmodule-2.0 gobject-2.0 gpg-error gpgme gthread-2.0
 WANTLIB += iconv idn2 intl json-glib-1.0 m pcre unistring uuid
 WANTLIB += xapian z
 
-MASTER_SITES=  https://github.com/djcb/mu/releases/download/1.2/
+MASTER_SITES=  https://github.com/djcb/mu/releases/download/${V}/
 EXTRACT_SUFX=  .tar.xz
 
 BUILD_DEPENDS= emacs->=24:editors/emacs
diff --git a/mail/mu/distinfo b/mail/mu/distinfo
index 437fb1dede15..2e1dd7c7c820 100644
--- a/mail/mu/distinfo
+++ b/mail/mu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mu-1.2.0.tar.xz) = 9jTH8kTcaET/cdw8PhiT5I4ZPKqeDnR+umFjCXdfBTo=
-SIZE (mu-1.2.0.tar.xz) = 844192
+SHA256 (mu-1.4.3.tar.xz) = 
f819db50a21eb200f015ff3486e9bb9db51e0a616aa9dd257b6654512c7c782a
+SIZE (mu-1.4.3.tar.xz) = 875272
diff --git a/mail/mu/patches/patch-lib_parser_utils_cc 
b/mail/mu/patches/patch-lib_parser_utils_cc
index 58e1438e96fa..cef6a7b57378 100644
--- a/mail/mu/patches/patch-lib_parser_utils_cc
+++ b/mail/mu/patches/patch-lib_parser_utils_cc
@@ -1,8 +1,8 @@
 $OpenBSD: patch-lib_parser_utils_cc,v 1.1 2019/07/26 06:41:59 pvk Exp $
 Bring g_vasprintf into scope
-Index: lib/parser/utils.cc
 lib/parser/utils.cc.orig
-+++ lib/parser/utils.cc
+Index: lib/utils/mu-utils.cc
+--- lib/utils/mu-utils.cc.orig
 lib/utils/mu-utils.cc
 @@ -17,7 +17,7 @@
  **  02110-1301, USA.
  */
diff --git a/mail/mu/pkg/PLIST b/mail/mu/pkg/PLIST
index a24708f574d4..faac4569cc84 100644
--- a/mail/mu/pkg/PLIST
+++ b/mail/mu/pkg/PLIST
@@ -8,6 +8,8 @@
 @man man/man1/mu-find.1
 @man man/man1/mu-help.1
 @man man/man1/mu-index.1
+@man man/man1/mu-info.1
+@man man/man1/mu-init.1
 @man man/man1/mu-mkdir.1
 @man man/man1/mu-remove.1
 @man man/man1/mu-script.1
@@ -22,6 +24,7 @@
 share/doc/mu/
 share/doc/mu/NEWS.org
 share/doc/mu/mu4e-about.org
+share/doc/pkg-readmes/${PKGSTEM}
 share/emacs/
 share/emacs/site-lisp/
 share/emacs/site-lisp/mu4e/
@@ -37,6 +40,8 @@ share/emacs/site-lisp/mu4e/mu4e-draft.el
 share/emacs/site-lisp/mu4e/mu4e-draft.elc
 share/emacs/site-lisp/mu4e/mu4e-headers.el
 share/emacs/site-lisp/mu4e/mu4e-headers.elc
+share/emacs/site-lisp/mu4e/mu4e-icalendar.el
+share/emacs/site-lisp/mu4e/mu4e-icalendar.elc
 share/emacs/site-lisp/mu4e/mu4e-lists.el
 share/emacs/site-lisp/mu4e/mu4e-lists.elc
 share/emacs/site-lisp/mu4e/mu4e-main.el
@@ -47,6 +52,8 @@ share/emacs/site-lisp/mu4e/mu4e-message.el
 share/emacs/site-lisp/mu4e/mu4e-message.elc
 share/emacs/site-lisp/mu4e/mu4e-meta.el
 share/emacs/site-lisp/mu4e/mu4e-meta.elc
+share/emacs/site-lisp/mu4e/mu4e-org.el
+share/emacs/site-lisp/mu4e/mu4e-org.elc
 share/emacs/site-lisp/mu4e/mu4e-proc.el
 share/emacs/site-lisp/mu4e/mu4e-proc.elc
 share/emacs/site-lisp/mu4e/mu4e-speedbar.el
@@ -61,5 +68,3 @@ share/emacs/site-lisp/mu4e/mu4e.el
 share/emacs/site-lisp/mu4e/mu4e.elc
 share/emacs/site-lisp/mu4e/org-mu4e.el
 share/emacs/site-lisp/mu4e/org-mu4e.elc
-share/emacs/site-lisp/mu4e/org-old-mu4e.el
-share/emacs/site-lisp/mu4e/org-old-mu4e.elc