Attachment 219045 Details for Bug 250588 – Update to 1.14.3

[patch] Update to 1.14.3

0001-mail-mu-update-to-1.4.13.patch (text/plain), 14.96 KB, created by Derek Schrock on 2020-10-25 00:06:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Schrock

Created: 2020-10-25 00:06:35 UTC

Size: 14.96 KB

patch

obsolete

>From 236bcf0cc61182f3a9aedfc13397043ee1fe79d1 Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Sat, 24 Oct 2020 18:56:42 -0400
>Subject: [PATCH] mail/mu: update to 1.4.13
>
>- Update mu and mu4e to 1.4.13
>- Add test target
>- UPDATING about mail/mu moving to ~/.cache/mu
>---
> UPDATING                           |  12 +++
> mail/mu/Makefile                   |  15 +--
> mail/mu/distinfo                   |   6 +-
> mail/mu/pkg-plist                  |  12 +--
> mail/mu4e/Makefile                 |   3 +-
> mail/mu4e/distinfo                 |   6 +-
> mail/mu4e/files/patch-configure.ac | 165 ++++++++++++++---------------
> mail/mu4e/pkg-plist                |   6 +-
> 8 files changed, 113 insertions(+), 112 deletions(-)
>
>diff --git a/UPDATING b/UPDATING
>index 75221c472..d2bec33e0 100644
>--- a/UPDATING
>+++ b/UPDATING
>@@ -5,6 +5,18 @@ they are unavoidable.
> You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
>+20201024:
>+  AFFECTS: Users of mail/mu with default locations
>+  AUTHOR: dereks@lifeofadishwasher.com
>+
>+  mu now defaults to the [XDG Base Directory Specification][1] for the
>+  default locations for various files. E.g. on Unix the mu database
>+  now lives under `~/.cache/mu/' rather than `~/.mu'. You can still
>+  use the old location by passing `--muhome=~/.mu' to various `mu'
>+  commands.
>+
>+  [1] https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
>+
> 20201021:
>   AFFECTS: users of www/py-unit
>   AUTHOR: osa@FreeBSD.org
>diff --git a/mail/mu/Makefile b/mail/mu/Makefile
>index c50612337..46c78e068 100644
>--- a/mail/mu/Makefile
>+++ b/mail/mu/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mu
>-PORTVERSION=	1.2
>+PORTVERSION=	1.4.13
> CATEGORIES=	mail
> 
> MAINTAINER=	hrs@FreeBSD.org
>@@ -15,9 +15,9 @@ LIB_DEPENDS=	libxapian.so:databases/xapian-core \
> 		libgmime-3.0.so:mail/gmime30 \
> 		libgc-threaded.so:devel/boehm-gc-threaded \
> 		libjson-glib-1.0.so:devel/json-glib
>- 
>+
> USES=		autoreconf compiler:c++14-lang gettext-runtime gmake gnome \
>-		libtool makeinfo pkgconfig
>+		libtool makeinfo pkgconfig readline
> USE_GITHUB=	yes
> GH_ACCOUNT=	djcb
> USE_GNOME=	glib20
>@@ -25,6 +25,7 @@ USE_GNOME=	glib20
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-gtk --disable-mu4e
> INSTALL_TARGET=	install-strip
>+TEST_TARGET=	test
> 
> OPTIONS_DEFINE=		DOCS GUILE
> OPTIONS_SUB=		yes
>@@ -34,16 +35,8 @@ GUILE_USE=		ldconfig=yes
> GUILE_CONFIGURE_ENABLE=	guile
> GUILE_INFO=		mu-guile
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \
>-	    ${WRKSRC}/configure.ac
>-
> post-install:
> 	cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \
> 	    ${STAGEDIR}${PREFIX}/bin
> 
>-post-install-GUILE-on:
>-	${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \
>-	    ${XARGS} ${STRIP_CMD}
>-
> .include <bsd.port.mk>
>diff --git a/mail/mu/distinfo b/mail/mu/distinfo
>index 8d8e7b803..b243e220c 100644
>--- a/mail/mu/distinfo
>+++ b/mail/mu/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1577309838
>-SHA256 (djcb-mu-1.2_GH0.tar.gz) = 75ac379ddbaa35ab54035b057bf729537afbef09c71505c2f7209826265e049a
>-SIZE (djcb-mu-1.2_GH0.tar.gz) = 2297571
>+TIMESTAMP = 1603254096
>+SHA256 (djcb-mu-1.4.13_GH0.tar.gz) = 8856465501dccd9101eda1a29bedada010e6ff828c9d922f1abe86b152a2741b
>+SIZE (djcb-mu-1.4.13_GH0.tar.gz) = 2309545
>diff --git a/mail/mu/pkg-plist b/mail/mu/pkg-plist
>index d2dfd8566..f63250a5c 100644
>--- a/mail/mu/pkg-plist
>+++ b/mail/mu/pkg-plist
>@@ -1,6 +1,5 @@
> bin/mu
> bin/mu-ask
>-%%GUILE%%lib/libguile-mu.a
> %%GUILE%%lib/libguile-mu.so
> %%GUILE%%lib/libguile-mu.so.0
> %%GUILE%%lib/libguile-mu.so.0.0.0
>@@ -11,6 +10,8 @@ man/man1/mu-extract.1.gz
> man/man1/mu-find.1.gz
> man/man1/mu-help.1.gz
> man/man1/mu-index.1.gz
>+man/man1/mu-info.1.gz
>+man/man1/mu-init.1.gz
> man/man1/mu-mkdir.1.gz
> man/man1/mu-remove.1.gz
> man/man1/mu-script.1.gz
>@@ -18,14 +19,13 @@ man/man1/mu-server.1.gz
> man/man1/mu-verify.1.gz
> man/man1/mu-view.1.gz
> man/man1/mu.1.gz
>-man/man1/mug.1.gz
> man/man5/mu-bookmarks.5.gz
> man/man7/mu-query.7.gz
> %%PORTDOCS%%%%DOCSDIR%%/NEWS.org
>-%%GUILE%%share/guile/site/2.0/mu.scm
>-%%GUILE%%share/guile/site/2.0/mu/plot.scm
>-%%GUILE%%share/guile/site/2.0/mu/script.scm
>-%%GUILE%%share/guile/site/2.0/mu/stats.scm
>+%%GUILE%%share/guile/site/2.2/mu.scm
>+%%GUILE%%share/guile/site/2.2/mu/plot.scm
>+%%GUILE%%share/guile/site/2.2/mu/script.scm
>+%%GUILE%%share/guile/site/2.2/mu/stats.scm
> %%GUILE%%%%DATADIR%%/scripts/find-dups.scm
> %%GUILE%%%%DATADIR%%/scripts/msgs-count.scm
> %%GUILE%%%%DATADIR%%/scripts/msgs-per-day.scm
>diff --git a/mail/mu4e/Makefile b/mail/mu4e/Makefile
>index d02be0c0a..543b47598 100644
>--- a/mail/mu4e/Makefile
>+++ b/mail/mu4e/Makefile
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mu4e
>-PORTVERSION=	1.2
>-PORTREVISION=	2
>+PORTVERSION=	1.4.13
> CATEGORIES=	mail
> PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
> 
>diff --git a/mail/mu4e/distinfo b/mail/mu4e/distinfo
>index 421a22dfe..aa450c44f 100644
>--- a/mail/mu4e/distinfo
>+++ b/mail/mu4e/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1577310090
>-SHA256 (djcb-mu-1.2_GH0.tar.gz) = 75ac379ddbaa35ab54035b057bf729537afbef09c71505c2f7209826265e049a
>-SIZE (djcb-mu-1.2_GH0.tar.gz) = 2297571
>+TIMESTAMP = 1603332752
>+SHA256 (djcb-mu-1.4.13_GH0.tar.gz) = 8856465501dccd9101eda1a29bedada010e6ff828c9d922f1abe86b152a2741b
>+SIZE (djcb-mu-1.4.13_GH0.tar.gz) = 2309545
>diff --git a/mail/mu4e/files/patch-configure.ac b/mail/mu4e/files/patch-configure.ac
>index bc2637476..e12d47432 100644
>--- a/mail/mu4e/files/patch-configure.ac
>+++ b/mail/mu4e/files/patch-configure.ac
>@@ -1,6 +1,6 @@
>---- configure.ac.orig	2019-04-07 07:54:18 UTC
>+--- configure.ac.orig	2020-10-24 23:20:38 UTC
> +++ configure.ac
>-@@ -37,31 +37,31 @@ AC_SUBST(prefix)
>+@@ -37,21 +37,21 @@ AC_SUBST(prefix)
>  
>  # AC_PROG_CXX *before* AC_PROG_CC, otherwise configure won't error out
>  # when a c++ compiler is not found. Weird, huh?
>@@ -16,10 +16,10 @@
> -AC_HEADER_STDC
> +#AC_HEADER_STDC
>  
>- extra_flags="-Wformat-security		\
>-              -Wstack-protector		\
>- 	     -Wstack-protector-all	\
>- 	     -Wno-cast-function-type"
>+ extra_flags="-Wformat-security                                        \
>+              -Wstack-protector                                        \
>+              -Wstack-protector-all                                    \
>+              -Wno-cast-function-type"
>  
> -AX_CXX_COMPILE_STDCXX_14
> -m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
>@@ -28,108 +28,102 @@
> +#m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
> +#AX_VALGRIND_CHECK
>  
>- # for now, use AM_PROG_LIBTOOL, as we don't want to require
>- # a too new setup for autotools/libtool
>--AM_PROG_LIBTOOL
>-+#AM_PROG_LIBTOOL
>- #LT_INIT([disable-shared])
>+ LT_INIT
>  
>- AC_PROG_AWK
>- AC_CHECK_PROG(SORT,sort,sort)
>- 
>--AC_CHECK_HEADERS([wordexp.h])
>-+#AC_CHECK_HEADERS([wordexp.h])
>- 
>- # use the 64-bit versions
>- AC_SYS_LARGEFILE
>-@@ -150,19 +150,19 @@ AS_IF([test "x$PKG_CONFIG" = "xno"],[
>+@@ -138,15 +138,15 @@ AS_IF([test -z "$PKG_CONFIG"],
>+ )
>  
>  # glib2?
>- # we pick some late-2012 version
>--PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.32 gobject-2.0 gio-2.0)
>-+# PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.32 gobject-2.0 gio-2.0)
>- AC_SUBST(GLIB_CFLAGS)
>- AC_SUBST(GLIB_LIBS)
>- glib_version="`$PKG_CONFIG --modversion glib-2.0`"
>+-PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.38 gobject-2.0 gio-2.0)
>++#PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.38 gobject-2.0 gio-2.0)
>+ glib_version="$($PKG_CONFIG --modversion glib-2.0)"
>  
>  # gmime, version 3.0 or higher
> -PKG_CHECK_MODULES(GMIME,gmime-3.0)
>-+# PKG_CHECK_MODULES(GMIME,gmime-3.0)
>- AC_SUBST(GMIME_CFLAGS)
>- AC_SUBST(GMIME_LIBS)
>- gmime_version="`$PKG_CONFIG --modversion gmime-3.0`"
>++#PKG_CHECK_MODULES(GMIME,gmime-3.0)
>+ gmime_version="$($PKG_CONFIG --modversion gmime-3.0)"
>  
>  # gmime, version 3.0 or higher
> -PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no])
>-+# PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no])
>++#PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no])
>  AS_IF([test "x$have_json_glib" = "xyes"],[
>-   AC_SUBST(JSON_GLIB_CFLAGS)
>-   AC_SUBST(JSON_GLIB_LIBS)
>-@@ -172,21 +172,21 @@ AS_IF([test "x$have_json_glib" = "xyes"],[
>+   json_glib_version="$($PKG_CONFIG --modversion json-glib-1.0)"
>+   AC_DEFINE(HAVE_JSON_GLIB,[1], [Do we support json-glib?])
>+@@ -154,35 +154,35 @@ AS_IF([test "x$have_json_glib" = "xyes"],[
>  AM_CONDITIONAL(HAVE_JSON_GLIB,[test "x$have_json_glib" = "xyes"])
>  
>  # xapian checking - we need 1.4 at least
>--AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
>--AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno")
>--AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
>--   AC_MSG_ERROR([
>--   *** xapian could not be found; please install it
>--   *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
>--   *** If you compiled it yourself, you should ensure that xapian-config
>--   *** is in your PATH.])],
>--   [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')])
>+-PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
>+-  have_xapian=yes
>+-  xapian_version=$($PKG_CONFIG xapian-core --modversion)
>+-  AC_SUBST(XAPIAN_CXXFLAGS,${XAPIAN_CFLAGS})
>+-],[
>+-  # fall back to the xapian-config script. Not sure if there are cases where the
>+-  # pkgconfig does not work, but xapian-config does, so keep this for now.
>+-  AC_MSG_NOTICE([falling back to xapian-config])
>+-  AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
>+-  AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
>+-     AC_MSG_ERROR([
>+-     *** xapian could not be found; please install it
>+-     *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
>+-     *** If you compiled it yourself, you should ensure that xapian-config
>+-     *** is in your PATH.])],
>+-     [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')])
>+-
>+-  AS_CASE([$xapian_version],
>+-      [1.[[4-9]].[[0-9]]*],
>+-        [AC_MSG_NOTICE([xapian $xapian_version found.])],
>+-        [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
> -
>--AS_CASE([$xapian_version],
>--	[1.[[4-9]].[[0-9]]*],
>--	  [AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])],
>--	[AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
>+-  XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
>+-  XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
>+-  have_xapian="yes"
> -
>-+# AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
>-+# AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno")
>-+# AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
>-+#   AC_MSG_ERROR([
>-+#    *** xapian could not be found; please install it
>-+#    *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
>-+#    *** If you compiled it yourself, you should ensure that xapian-config
>-+#    *** is in your PATH.])],
>-+#    [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')])
>+-  AC_SUBST(XAPIAN_CXXFLAGS)
>+-  AC_SUBST(XAPIAN_LIBS)
>+-])
>++#PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
>++#  have_xapian=yes
>++#  xapian_version=$($PKG_CONFIG xapian-core --modversion)
>++#  AC_SUBST(XAPIAN_CXXFLAGS,${XAPIAN_CFLAGS})
>++#],[
>++#  # fall back to the xapian-config script. Not sure if there are cases where the
>++#  # pkgconfig does not work, but xapian-config does, so keep this for now.
>++#  AC_MSG_NOTICE([falling back to xapian-config])
>++#  AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
>++#  AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
>++#     AC_MSG_ERROR([
>++#     *** xapian could not be found; please install it
>++#     *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
>++#     *** If you compiled it yourself, you should ensure that xapian-config
>++#     *** is in your PATH.])],
>++#     [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')])
> +#
>-+#AS_CASE([$xapian_version],
>-+#	[1.[[4-9]].[[0-9]]*],
>-+#	  [AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])],
>-+#	[AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
>++#  AS_CASE([$xapian_version],
>++#      [1.[[4-9]].[[0-9]]*],
>++#        [AC_MSG_NOTICE([xapian $xapian_version found.])],
>++#        [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
> +#
>- XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
>- XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
>- have_xapian="yes"
>-@@ -261,37 +261,19 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu")
>- 
>- ###############################################################################
>- # check for pmccabe
>--AC_PATH_PROG([PMCCABE],[pmccabe],[no])
>--AS_IF([test "x$PMCCABE" = "xno"],[
>--   have_pmccabe="no"
>--   AC_MSG_WARN([
>--   *** Developers: you do not seem to have the pmccabe tool installed.
>--   *** Please install it if you want to run the automated code checks])
>--],[have_pmccabe="yes"])
>-+#AC_PATH_PROG([PMCCABE],[pmccabe],[no])
>-+#AS_IF([test "x$PMCCABE" = "xno"],[
>-+#   have_pmccabe="no"
>-+#   AC_MSG_WARN([
>-+#   *** Developers: you do not seem to have the pmccabe tool installed.
>-+#   *** Please install it if you want to run the automated code checks])
>-+#],[have_pmccabe="yes"])
>++#  XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
>++#  XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
>++#  have_xapian="yes"
>++#
>++#  AC_SUBST(XAPIAN_CXXFLAGS)
>++#  AC_SUBST(XAPIAN_LIBS)
>++#])
>  ###############################################################################
>+ # we set the set the version of the MuStore (Xapian database) layout
>+ # here; it will become part of the db name, so we can automatically
>+@@ -258,27 +258,8 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu")
>  
>  AC_CONFIG_FILES([
>  Makefile
> -mu/Makefile
>--mu/tests/Makefile
>+-mu/mu-memcheck
> -lib/Makefile
> -lib/doxyfile
>--lib/parser/Makefile
>--lib/tests/Makefile
>+-lib/utils/Makefile
>+-lib/query/Makefile
>  mu4e/Makefile
>  mu4e/mu4e-meta.el
> -guile/Makefile
>@@ -140,10 +134,11 @@
> -guile/scripts/Makefile
> -toys/Makefile
> -toys/mug/Makefile
>--toys/msg2pdf/Makefile
> -man/Makefile
> -m4/Makefile
> -contrib/Makefile
>+-],[
>+- [chmod +x mu/mu-memcheck]
>  ])
>  AC_OUTPUT
>  
>diff --git a/mail/mu4e/pkg-plist b/mail/mu4e/pkg-plist
>index f0b3154a6..1eed6538e 100644
>--- a/mail/mu4e/pkg-plist
>+++ b/mail/mu4e/pkg-plist
>@@ -11,6 +11,8 @@
> %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.elc
> %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.el.gz
> %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.elc
>+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-icalendar.el.gz
>+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-icalendar.elc
> %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.el.gz
> %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.elc
> %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.el.gz
>@@ -21,6 +23,8 @@
> %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.elc
> %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-meta.el.gz
> %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-meta.elc
>+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-org.el.gz
>+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-org.elc
> %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-proc.el.gz
> %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-proc.elc
> %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.el.gz
>@@ -35,5 +39,3 @@
> %%EMACS_SITE_LISPDIR%%/mu4e/mu4e.elc
> %%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.el.gz
> %%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.elc
>-%%EMACS_SITE_LISPDIR%%/mu4e/org-old-mu4e.el.gz
>-%%EMACS_SITE_LISPDIR%%/mu4e/org-old-mu4e.elc
>-- 
>2.28.0
>

Actions: View | Diff

Attachments on bug 250588: 219045 | 223722