mail/mu: Upgrade version 0.9.9 => 0.9.9.6 and stage

PR:		192209
Submitted by:	Ports Fury

4 files changed, 111 insertions, 29 deletions

diff --git a/mail/mu/Makefile b/mail/mu/Makefile
index 8f8dc233a256..22b7d3502c71 100644
--- a/mail/mu/Makefile
+++ b/mail/mu/Makefile
@@ -2,38 +2,47 @@
 # $FreeBSD$
 
 PORTNAME=	mu
-PORTVERSION=	0.9.9
-PORTREVISION=	1
+PORTVERSION=	0.9.9.6
 CATEGORIES=	mail
-MASTER_SITES=	http://mu0.googlecode.com/files/
+MASTER_SITES=	GH
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mail searching frontend for Xapian
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libxapian.so:${PORTSDIR}/databases/xapian-core \
-		libgmime.so:${PORTSDIR}/mail/gmime24
+		libgmime-2.6.so:${PORTSDIR}/mail/gmime26
 
-GNU_CONFIGURE=	yes
-USES=		pkgconfig gmake
-USE_GNOME=	glib20
+USE_GITHUB=	yes
+GH_ACCOUNT=	djcb
+GH_PROJECT=	${PORTNAME}
+GH_TAGNAME=	${PORTVERSION:S/^/v/}
+GH_COMMIT=	ab58307
 
-MAN1=		mu-cfind.1 mu-easy.1 mu-extract.1 mu-find.1 mu-index.1 \
-		mu-mkdir.1 mu-view.1 mu-add.1 mu-remove.1 mu-server.1 mu.1 \
-		mug.1
-MAN5=		mu-bookmarks.5
+USES=		gmake libtool makeinfo pkgconfig
+USE_GNOME=	glib20
+USE_AUTOTOOLS=	libtoolize aclocal autoheader automake autoconf
+AUTOMAKE_ARGS=	--add-missing
+CONFIGURE_ARGS=	--disable-silent-rules --disable-gtk
 
-CFLAGS+=	-I${LOCALBASE}/include
-CXXFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--with-gui=none
-
-NO_STAGE=	yes
-do-install:
-	cd ${WRKSRC}/mu && ${INSTALL_PROGRAM} mu ${PREFIX}/bin
-	cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask ${PREFIX}/bin
-	cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1
-	cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN5} ${MANPREFIX}/man/man5
+
+OPTIONS_DEFINE=		GUILE MU4E
+OPTIONS_SUB=		yes
+
+GUILE_LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
+GUILE_USE=		ldconfig=yes
+GUILE_CONFIGURE_ENABLE=	guile
+GUILE_INFO=		mu-guile
+MU4E_DESC=		Email cluent for Emacs
+MU4E_USE=		emacs=yes
+MU4E_CONFIGURE_ENABLE=	mu4e
+MU4E_INFO=		mu4e
+
+post-install:
+	(cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \
+		${STAGEDIR}${PREFIX}/bin)
 
 .include <bsd.port.mk>
diff --git a/mail/mu/distinfo b/mail/mu/distinfo
index 4ff9fbb1d288..e993549f8e0a 100644
--- a/mail/mu/distinfo
+++ b/mail/mu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mu-0.9.9.tar.gz) = 83f8e2814ba1a89a3153ab3dcd21105cc62e1386c176c5312ccb6bae0af02013
-SIZE (mu-0.9.9.tar.gz) = 1185624
+SHA256 (mu-0.9.9.6.tar.gz) = 3de15ee22db402dff4f2593e3d2a08341c17496ac925cf69492c925afdab3dac
+SIZE (mu-0.9.9.6.tar.gz) = 2172766
diff --git a/mail/mu/pkg-descr b/mail/mu/pkg-descr
index 8cba3c5757d2..521fcd47cfb9 100644
--- a/mail/mu/pkg-descr
+++ b/mail/mu/pkg-descr
@@ -1,7 +1,6 @@
-mu is a tool for dealing with e-mail messages stored
-in the Maildir-format, on Unix-like systems.
-mu's main purpose is to help you to find the messages
-you need, quickly; in addition, it allows you to view messages,
-extract attachments, create new maildirs, ...
+mu is a tool for dealing with e-mail messages stored in the
+Maildir-format, on Unix-like systems. mu's main purpose is to help you
+to find the messages you need, quickly; in addition, it allows you to
+view messages, extract attachments, create new maildirs, ...
 
 WWW: http://www.djcbsoftware.nl/code/mu/
diff --git a/mail/mu/pkg-plist b/mail/mu/pkg-plist
index 674e540cf9b1..108dfbc052ed 100644
--- a/mail/mu/pkg-plist
+++ b/mail/mu/pkg-plist
@@ -1,2 +1,76 @@
 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
+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-mkdir.1.gz
+man/man1/mu-remove.1.gz
+man/man1/mu-script.1.gz
+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
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-about.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-about.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-mark.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-mark.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-meta.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-meta.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-proc.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-proc.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-utils.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-utils.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-vars.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-vars.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e.elc
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.el
+%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.elc
+%%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
+%%GUILE%%@dirrm %%DATADIR%%/scripts
+%%GUILE%%@dirrm %%DATADIR%%
+%%GUILE%%@dirrm share/guile/site/2.0/mu
+%%GUILE%%@dirrmtry share/guile/site/2.0
+%%GUILE%%@dirrmtry share/guile/site
+%%GUILE%%@dirrmtry share/guile
+%%MU4E%%@dirrm %%EMACS_SITE_LISPDIR%%/mu4e