[Update] mail/mu: Version 1.0->1.2

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

[Update] mail/mu: Version 1.0->1.2

Stefan Hagen-3
Hello,

This is my first contribution to OpenBSD. I've updated port mail/mu
to version 1.2.

The software changes from Version 1.0 to 1.2 can be found here:
https://github.com/djcb/mu/releases/tag/1.2
(There was no Version 1.1)

Port changes:
- Switched to MASTER_SITES to grab the release file and not the
  auto-generated Github tarball (which may change checksum).
- updated dependency gmime->gmime30
- new dependency glib-json
- change emacs dependency to emacs,no_x11 (enough to build)
- adding myself as maintainer

I added a patch to bring g_vasprintf into scope.

I'm mainly using "mu" and not "mu4e".
Tests for mu4e would be welcome.

Compiling and tests done on a current snapshot/amd64.

Did I do this right?
Comments? Improvements? Ok?

Best Regards,
Stefan

mail-mu-1.2.diff.txt (2K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [Update] mail/mu: Version 1.0->1.2

James Turner-5
On Sat, Jul 20, 2019 at 01:11:15AM +0200, Stefan Hagen wrote:

> Hello,
>
> This is my first contribution to OpenBSD. I've updated port mail/mu
> to version 1.2.
>
> The software changes from Version 1.0 to 1.2 can be found here:
> https://github.com/djcb/mu/releases/tag/1.2
> (There was no Version 1.1)
>
> Port changes:
> - Switched to MASTER_SITES to grab the release file and not the
> auto-generated Github tarball (which may change checksum).
> - updated dependency gmime->gmime30
> - new dependency glib-json
> - change emacs dependency to emacs,no_x11 (enough to build)
> - adding myself as maintainer
>
> I added a patch to bring g_vasprintf into scope.
>
> I'm mainly using "mu" and not "mu4e".
> Tests for mu4e would be welcome.
>
> Compiling and tests done on a current snapshot/amd64.
>
> Did I do this right?
> Comments? Improvements? Ok?
>
> Best Regards,
> Stefan

Looks pretty good to me, however since it's a brand new version you can
just remove the REVISION. REVISION is only needed if you make changes to
the current version of the port and make changes that require a bump.

> Index: mail/mu/Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/mu/Makefile,v
> retrieving revision 1.17
> diff -u -p -u -r1.17 Makefile
> --- mail/mu/Makefile 12 Jul 2019 20:47:30 -0000 1.17
> +++ mail/mu/Makefile 19 Jul 2019 23:03:44 -0000
> @@ -2,27 +2,32 @@
>  
>  COMMENT= maildir indexer and searcher with emacs frontend
>  
> -GH_TAGNAME= v1.0
> -GH_ACCOUNT= djcb
> -GH_PROJECT= mu
> +DISTNAME= mu-1.2.0
>  
>  CATEGORIES= mail
>  HOMEPAGE= http://www.djcbsoftware.nl/code/mu/
> -REVISION = 1
> +REVISION = 0
> +
> +MAINTAINER= Stefan Hagen <[hidden email]>
>  
>  # GPLv3
>  PERMIT_PACKAGE= Yes
>  
> -BUILD_DEPENDS= emacs->=24:editors/emacs
> +MASTER_SITES=https://github.com/djcb/mu/releases/download/1.2/
> +EXTRACT_SUFX= .tar.xz
> +
> +BUILD_DEPENDS= emacs->=24:editors/emacs,no_x11
>  
>  LIB_DEPENDS= databases/xapian-core \
>   devel/glib2 \
> - mail/gmime \
> + devel/json-glib \
> + mail/gmime30 \
>   security/gpgme
>  
> -WANTLIB += assuan c ffi gio-2.0 glib-2.0 gmime-2.6 gmodule-2.0
> +WANTLIB += assuan c ffi gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0
>  WANTLIB += gobject-2.0 gpg-error gpgme gthread-2.0 iconv
> -WANTLIB += intl m pcre pthread ${COMPILER_LIBCXX} uuid xapian z
> +WANTLIB += intl json-glib-1.0 m pcre pthread ${COMPILER_LIBCXX}
> +WANTLIB += uuid xapian z
>  
>  # C++14 required
>  COMPILER= base-clang ports-clang
> Index: mail/mu/distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/mu/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -r1.6 distinfo
> --- mail/mu/distinfo 29 Apr 2018 09:23:56 -0000 1.6
> +++ mail/mu/distinfo 19 Jul 2019 23:03:44 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (mu-1.0.tar.gz) = UzFJq6uWfigJ9y6f5ixt63HUW2rSpYRiR3M6HdLeaaA=
> -SIZE (mu-1.0.tar.gz) = 2273670
> +SHA256 (mu-1.2.0.tar.xz) = 9jTH8kTcaET/cdw8PhiT5I4ZPKqeDnR+umFjCXdfBTo=
> +SIZE (mu-1.2.0.tar.xz) = 844192
> Index: mail/mu/patches/patch-lib_parser_utils_cc
> ===================================================================
> RCS file: mail/mu/patches/patch-lib_parser_utils_cc
> diff -N mail/mu/patches/patch-lib_parser_utils_cc
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ mail/mu/patches/patch-lib_parser_utils_cc 19 Jul 2019 23:03:44 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +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.
> + */
> +
> +-#define _XOPEN_SOURCE
> ++#define _XOPEN_SOURCE_EXTENDED 1
> + #include <time.h>
> +
> + #define GNU_SOURCE


--
James Turner

Reply | Threaded
Open this post in threaded view
|

Re: [Update] mail/mu: Version 1.0->1.2

Stuart Henderson
On 2019/07/20 14:43, James Turner wrote:

> On Sat, Jul 20, 2019 at 01:11:15AM +0200, Stefan Hagen wrote:
> > Hello,
> >
> > This is my first contribution to OpenBSD. I've updated port mail/mu
> > to version 1.2.
> >
> > The software changes from Version 1.0 to 1.2 can be found here:
> > https://github.com/djcb/mu/releases/tag/1.2
> > (There was no Version 1.1)
> >
> > Port changes:
> > - Switched to MASTER_SITES to grab the release file and not the
> > auto-generated Github tarball (which may change checksum).
> > - updated dependency gmime->gmime30
> > - new dependency glib-json
> > - change emacs dependency to emacs,no_x11 (enough to build)

This should stay as it was - it is better for bulk builds if all ports
that have a build dependency on emacs depend on the same flavour, and
the "unflavoured" version is the most common.

> > - adding myself as maintainer
> >
> > I added a patch to bring g_vasprintf into scope.
> >
> > I'm mainly using "mu" and not "mu4e".
> > Tests for mu4e would be welcome.
> >
> > Compiling and tests done on a current snapshot/amd64.
> >
> > Did I do this right?
> > Comments? Improvements? Ok?
> >
> > Best Regards,
> > Stefan
>
> Looks pretty good to me, however since it's a brand new version you can
> just remove the REVISION. REVISION is only needed if you make changes to
> the current version of the port and make changes that require a bump.

Right. Also (not new but might as well fix it) the canonical place for
WANTLIB is right after PERMIT_*, and it could do with a tab after
MASTER_SITES= to line things up.

Otherwise OK with me.

Reply | Threaded
Open this post in threaded view
|

Re: [Update] mail/mu: Version 1.0->1.2

Stefan Hagen-3
Stuart Henderson wrote:
> On 2019/07/20 14:43, James Turner wrote:
>> Looks pretty good to me, however since it's a brand new version you can
>> just remove the REVISION. REVISION is only needed if you make changes to
>> the current version of the port and make changes that require a bump.

Ah, thank you. Of course.
Fixed.

> Right. Also (not new but might as well fix it) the canonical place for
> WANTLIB is right after PERMIT_*, and it could do with a tab after
> MASTER_SITES= to line things up.

Fixed.

> [emacs,no_x11]
> This should stay as it was - it is better for bulk builds if all ports
> that have a build dependency on emacs depend on the same flavour, and
> the "unflavoured" version is the most common.

Makes sense. I thought no_x11 would be lighter for people only
interested in "mu" and not the mu4e part. But I didn't think of bulk
builds.

Fixed.

> Right. Also (not new but might as well fix it) the canonical place for
> WANTLIB is right after PERMIT_*, and it could do with a tab after
> MASTER_SITES= to line things up.

Also fixed.

Updated diff attached.

Best Regards,
Stefan

mail-mu-1.2.diff.txt (2K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [Update] mail/mu: Version 1.0->1.2

James Turner-5
On Sat, Jul 20, 2019 at 11:53:24PM +0200, Stefan Hagen wrote:

> Stuart Henderson wrote:
> > On 2019/07/20 14:43, James Turner wrote:
> > > Looks pretty good to me, however since it's a brand new version you can
> > > just remove the REVISION. REVISION is only needed if you make changes to
> > > the current version of the port and make changes that require a bump.
>
> Ah, thank you. Of course.
> Fixed.
>
> > Right. Also (not new but might as well fix it) the canonical place for
> > WANTLIB is right after PERMIT_*, and it could do with a tab after
> > MASTER_SITES= to line things up.
>
> Fixed.
>
> > [emacs,no_x11]
> > This should stay as it was - it is better for bulk builds if all ports
> > that have a build dependency on emacs depend on the same flavour, and
> > the "unflavoured" version is the most common.
>
> Makes sense. I thought no_x11 would be lighter for people only
> interested in "mu" and not the mu4e part. But I didn't think of bulk
> builds.
>
> Fixed.
>
> > Right. Also (not new but might as well fix it) the canonical place for
> > WANTLIB is right after PERMIT_*, and it could do with a tab after
> > MASTER_SITES= to line things up.
>
> Also fixed.
>
> Updated diff attached.
>
> Best Regards,
> Stefan

Thanks, commited!

> Index: mail/mu/Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/mu/Makefile,v
> retrieving revision 1.17
> diff -u -p -u -r1.17 Makefile
> --- mail/mu/Makefile 12 Jul 2019 20:47:30 -0000 1.17
> +++ mail/mu/Makefile 20 Jul 2019 21:48:59 -0000
> @@ -2,27 +2,32 @@
>  
>  COMMENT= maildir indexer and searcher with emacs frontend
>  
> -GH_TAGNAME= v1.0
> -GH_ACCOUNT= djcb
> -GH_PROJECT= mu
> +DISTNAME= mu-1.2.0
>  
>  CATEGORIES= mail
>  HOMEPAGE= http://www.djcbsoftware.nl/code/mu/
> -REVISION = 1
> +
> +MAINTAINER= Stefan Hagen <[hidden email]>
>  
>  # GPLv3
>  PERMIT_PACKAGE= Yes
>  
> +WANTLIB+= assuan c ffi gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0
> +WANTLIB+= gobject-2.0 gpg-error gpgme gthread-2.0 iconv
> +WANTLIB+= intl json-glib-1.0 m pcre pthread ${COMPILER_LIBCXX}
> +WANTLIB+= uuid xapian z
> +
> +MASTER_SITES= https://github.com/djcb/mu/releases/download/1.2/
> +EXTRACT_SUFX= .tar.xz
> +
>  BUILD_DEPENDS= emacs->=24:editors/emacs
>  
>  LIB_DEPENDS= databases/xapian-core \
>   devel/glib2 \
> - mail/gmime \
> + devel/json-glib \
> + mail/gmime30 \
>   security/gpgme
>  
> -WANTLIB += assuan c ffi gio-2.0 glib-2.0 gmime-2.6 gmodule-2.0
> -WANTLIB += gobject-2.0 gpg-error gpgme gthread-2.0 iconv
> -WANTLIB += intl m pcre pthread ${COMPILER_LIBCXX} uuid xapian z
>  
>  # C++14 required
>  COMPILER= base-clang ports-clang
> Index: mail/mu/distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/mu/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -r1.6 distinfo
> --- mail/mu/distinfo 29 Apr 2018 09:23:56 -0000 1.6
> +++ mail/mu/distinfo 20 Jul 2019 21:48:59 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (mu-1.0.tar.gz) = UzFJq6uWfigJ9y6f5ixt63HUW2rSpYRiR3M6HdLeaaA=
> -SIZE (mu-1.0.tar.gz) = 2273670
> +SHA256 (mu-1.2.0.tar.xz) = 9jTH8kTcaET/cdw8PhiT5I4ZPKqeDnR+umFjCXdfBTo=
> +SIZE (mu-1.2.0.tar.xz) = 844192
> Index: mail/mu/patches/patch-lib_parser_utils_cc
> ===================================================================
> RCS file: mail/mu/patches/patch-lib_parser_utils_cc
> diff -N mail/mu/patches/patch-lib_parser_utils_cc
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ mail/mu/patches/patch-lib_parser_utils_cc 20 Jul 2019 21:48:59 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +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.
> + */
> +
> +-#define _XOPEN_SOURCE
> ++#define _XOPEN_SOURCE_EXTENDED 1
> + #include <time.h>
> +
> + #define GNU_SOURCE


--
James Turner

Reply | Threaded
Open this post in threaded view
|

Re: [Update] mail/mu: Version 1.0->1.2

Pavel Korovin-2
On 07/20, James Turner wrote:
> Thanks, commited!

Hi James,

You forgot to cvs add patch.
I've commited it to unbreak the port.

--
With best regards,
Pavel Korovin