--- mu/Makefile	(revision 548225)
+++ mu/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	mu
-PORTVERSION=	1.2
+PORTVERSION=	1.4.13
 CATEGORIES=	mail
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -16,7 +16,7 @@ 
 		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 \
+USES=		gmake autoreconf compiler:c++14-lang gettext-runtime gmake gnome \
 		libtool makeinfo pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	djcb
--- mu/distinfo	(revision 548225)
+++ mu/distinfo	(working copy)
@@ -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 = 1599781859
+SHA256 (djcb-mu-1.4.13_GH0.tar.gz) = 8856465501dccd9101eda1a29bedada010e6ff828c9d922f1abe86b152a2741b
+SIZE (djcb-mu-1.4.13_GH0.tar.gz) = 2309545
--- mu/pkg-plist	(revision 548225)
+++ mu/pkg-plist	(working copy)
@@ -1,9 +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
 man/man1/mu-add.1.gz
 man/man1/mu-cfind.1.gz
 man/man1/mu-easy.1.gz
@@ -11,6 +7,8 @@ 
 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,18 +16,6 @@ 
 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%%%%DATADIR%%/scripts/find-dups.scm
-%%GUILE%%%%DATADIR%%/scripts/msgs-count.scm
-%%GUILE%%%%DATADIR%%/scripts/msgs-per-day.scm
-%%GUILE%%%%DATADIR%%/scripts/msgs-per-hour.scm
-%%GUILE%%%%DATADIR%%/scripts/msgs-per-month.scm
-%%GUILE%%%%DATADIR%%/scripts/msgs-per-year.scm
-%%GUILE%%%%DATADIR%%/scripts/msgs-per-year-month.scm
--- mu4e/Makefile	(revision 548225)
+++ mu4e/Makefile	(working copy)
@@ -1,8 +1,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	mu4e
-PORTVERSION=	1.2
-PORTREVISION=	2
+PORTVERSION=	1.4.13
 CATEGORIES=	mail
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
@@ -13,7 +12,7 @@ 
 
 RUN_DEPENDS=	mu:mail/mu
 
-USES=		autoreconf emacs makeinfo pkgconfig
+USES=		gmake autoreconf emacs makeinfo pkgconfig
 USE_GITHUB=	yes
 GH_PROJECT=	mu
 GH_ACCOUNT=	djcb
@@ -34,11 +33,6 @@ 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SUB=		yes
 
-pre-build:
-	${REINPLACE_CMD} -e '/.el.elc/,/^$$/d' ${BUILD_WRKSRC}/Makefile && \
-	    ${ECHO_CMD} '.include "${FILESDIR}/byte-compile.mk"' \
-	    >> ${BUILD_WRKSRC}/Makefile
-
 post-install:
 	cd ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e && \
 	    ${GZIP_CMD} *.el
--- mu4e/distinfo	(revision 548225)
+++ mu4e/distinfo	(working copy)
@@ -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 = 1599781274
+SHA256 (djcb-mu-1.4.13_GH0.tar.gz) = 8856465501dccd9101eda1a29bedada010e6ff828c9d922f1abe86b152a2741b
+SIZE (djcb-mu-1.4.13_GH0.tar.gz) = 2309545
--- mu4e/files/byte-compile.mk	(revision 548225)
+++ mu4e/files/byte-compile.mk	(nonexistent)
@@ -1,18 +0,0 @@ 
-# $FreeBSD$
-.el.elc:
-	if test '$(EMACS)' != no; then \
-	  am__dir=. am__subdir_includes=''; \
-	  case $@ in */*) \
-	    am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \
-	    am__subdir_includes="-L $$am__dir -L $(srcdir)/$$am__dir"; \
-	  esac; \
-	  test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \
-	  $(EMACS) --batch \
-	    $(AM_ELCFLAGS) $(ELCFLAGS) \
-	    $$am__subdir_includes -L $(builddir) -L $(srcdir) \
-	    --eval '(setq byte-compile-dest-file-function (lambda (_) "/tmp/$@"))' \
-	    -f batch-byte-compile '$<'; \
-	    if [ -f "/tmp/$@" ]; then \
-		cp /tmp/$@ $@ && rm -f /tmp/$@; \
-	    fi; \
-	else :; fi
--- mu4e/files/patch-configure.ac	(revision 548225)
+++ mu4e/files/patch-configure.ac	(nonexistent)
@@ -1,149 +0,0 @@ 
---- configure.ac.orig	2019-04-07 07:54:18 UTC
-+++ configure.ac
-@@ -37,31 +37,31 @@ 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?
--AC_PROG_CXX
--AC_PROG_CC
--AC_PROG_CC_STDC
--AC_PROG_CC_C99
-+#AC_PROG_CXX
-+#AC_PROG_CC
-+#AC_PROG_CC_STDC
-+#AC_PROG_CC_C99
- AC_PROG_INSTALL
--AC_HEADER_STDC
-+#AC_HEADER_STDC
- 
- 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})])
--AX_VALGRIND_CHECK
-+#AX_CXX_COMPILE_STDCXX_14
-+#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])
- 
- 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"],[
- 
- # 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`"
- 
- # 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`"
- 
- # 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])
- 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"],[
- 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/.* //')])
--
--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.])])
--
-+# 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/.* //')])
-+#
-+#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"
-@@ -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"])
- ###############################################################################
- 
- AC_CONFIG_FILES([
- Makefile
--mu/Makefile
--mu/tests/Makefile
--lib/Makefile
--lib/doxyfile
--lib/parser/Makefile
--lib/tests/Makefile
- mu4e/Makefile
- mu4e/mu4e-meta.el
--guile/Makefile
--guile/texi.texi
--guile/mu/Makefile
--guile/examples/Makefile
--guile/tests/Makefile
--guile/scripts/Makefile
--toys/Makefile
--toys/mug/Makefile
--toys/msg2pdf/Makefile
--man/Makefile
--m4/Makefile
--contrib/Makefile
- ])
- AC_OUTPUT
- 
--- mu4e/pkg-plist	(revision 548225)
+++ mu4e/pkg-plist	(working copy)
@@ -3,14 +3,16 @@ 
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.el.gz
 %%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,5 @@ 
 %%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
+share/info/dir
+share/info/mu4e.info