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
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 <sh+po...@codevoid.de>
# 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
