From 3c0c785332ea64b935c818adb62acfbf2d57e0a5 Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Mon, 28 Dec 2020 09:41:38 -0500 Subject: [PATCH] mu: update to 1.4.13 --- mu/Makefile | 10 +++++++--- mu/PLIST | 7 +++++-- mu/PLIST.emacs | 16 +++++++++++----- mu/PLIST.guile | 8 ++++---- mu/distinfo | 8 ++++---- mu/options.mk | 8 +++++++- 6 files changed, 38 insertions(+), 19 deletions(-) diff --git a/mu/Makefile b/mu/Makefile index 9e2aaa5c26..af8a134290 100644 --- a/mu/Makefile +++ b/mu/Makefile @@ -1,8 +1,8 @@ # $NetBSD: Makefile,v 1.4 2014/11/09 21:02:11 thomasklausner Exp $ -DISTNAME= mu-0.9.9.6 +DISTNAME= mu-1.4.13 CATEGORIES= mail -MASTER_SITES= -https://github.com/djcb/mu/archive/v${PKGVERSION}${EXTRACT_SUFX} +MASTER_SITES= ${MASTER_SITE_GITHUB:=djcb/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.djcbsoftware.nl/code/mu/ @@ -10,6 +10,7 @@ COMMENT= E-mail searching and indexing tools LICENSE= gnu-gpl-v3 GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --infodir=${PREFIX}/${PKGINFODIR} USE_LIBTOOL= yes USE_LANGUAGES= c c++ USE_TOOLS+= gmake pkg-config autoconf automake autoreconf @@ -19,9 +20,12 @@ USE_TOOLS+= gmake pkg-config autoconf automake autoreconf pre-configure: cd ${WRKSRC} && autoreconf -fiv +post-install: + -${RM} -f ${DESTDIR}${PREFIX}/info/dir + .include "../../databases/sqlite3/buildlink3.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 .include "../../devel/glib2/buildlink3.mk" -.include "../../mail/gmime/buildlink3.mk" +.include "../../mail/gmime3/buildlink3.mk" .include "../../textproc/xapian/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mu/PLIST b/mu/PLIST index 743cafafb6..9a13d685da 100644 --- a/mu/PLIST +++ b/mu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2014/11/02 18:30:39 thomasklausner Exp $ +@comment $NetBSD$ bin/mu man/man1/mu-add.1 man/man1/mu-cfind.1 @@ -7,6 +7,8 @@ man/man1/mu-extract.1 man/man1/mu-find.1 man/man1/mu-help.1 man/man1/mu-index.1 +man/man1/mu-info.1 +man/man1/mu-init.1 man/man1/mu-mkdir.1 man/man1/mu-remove.1 man/man1/mu-script.1 @@ -14,5 +16,6 @@ man/man1/mu-server.1 man/man1/mu-verify.1 man/man1/mu-view.1 man/man1/mu.1 -man/man1/mug.1 man/man5/mu-bookmarks.5 +man/man7/mu-query.7 +share/doc/mu/NEWS.org diff --git a/mu/PLIST.emacs b/mu/PLIST.emacs index 3a591753b3..30d2962c92 100644 --- a/mu/PLIST.emacs +++ b/mu/PLIST.emacs @@ -1,17 +1,20 @@ @comment $NetBSD: PLIST.emacs,v 1.1 2014/11/09 21:02:12 thomasklausner Exp $ -info/mu4e.info -${EMACS_LISPPREFIX}/mu4e/mu4e-about.el -${EMACS_LISPPREFIX}/mu4e/mu4e-about.elc ${EMACS_LISPPREFIX}/mu4e/mu4e-actions.el ${EMACS_LISPPREFIX}/mu4e/mu4e-actions.elc ${EMACS_LISPPREFIX}/mu4e/mu4e-compose.el ${EMACS_LISPPREFIX}/mu4e/mu4e-compose.elc +${EMACS_LISPPREFIX}/mu4e/mu4e-context.el +${EMACS_LISPPREFIX}/mu4e/mu4e-context.elc ${EMACS_LISPPREFIX}/mu4e/mu4e-contrib.el ${EMACS_LISPPREFIX}/mu4e/mu4e-contrib.elc ${EMACS_LISPPREFIX}/mu4e/mu4e-draft.el ${EMACS_LISPPREFIX}/mu4e/mu4e-draft.elc +${EMACS_LISPPREFIX}/mu4e/mu4e.el +${EMACS_LISPPREFIX}/mu4e/mu4e.elc ${EMACS_LISPPREFIX}/mu4e/mu4e-headers.el ${EMACS_LISPPREFIX}/mu4e/mu4e-headers.elc +${EMACS_LISPPREFIX}/mu4e/mu4e-icalendar.el +${EMACS_LISPPREFIX}/mu4e/mu4e-icalendar.elc ${EMACS_LISPPREFIX}/mu4e/mu4e-lists.el ${EMACS_LISPPREFIX}/mu4e/mu4e-lists.elc ${EMACS_LISPPREFIX}/mu4e/mu4e-main.el @@ -22,6 +25,8 @@ ${EMACS_LISPPREFIX}/mu4e/mu4e-message.el ${EMACS_LISPPREFIX}/mu4e/mu4e-message.elc ${EMACS_LISPPREFIX}/mu4e/mu4e-meta.el ${EMACS_LISPPREFIX}/mu4e/mu4e-meta.elc +${EMACS_LISPPREFIX}/mu4e/mu4e-org.el +${EMACS_LISPPREFIX}/mu4e/mu4e-org.elc ${EMACS_LISPPREFIX}/mu4e/mu4e-proc.el ${EMACS_LISPPREFIX}/mu4e/mu4e-proc.elc ${EMACS_LISPPREFIX}/mu4e/mu4e-speedbar.el @@ -32,7 +37,8 @@ ${EMACS_LISPPREFIX}/mu4e/mu4e-vars.el ${EMACS_LISPPREFIX}/mu4e/mu4e-vars.elc ${EMACS_LISPPREFIX}/mu4e/mu4e-view.el ${EMACS_LISPPREFIX}/mu4e/mu4e-view.elc -${EMACS_LISPPREFIX}/mu4e/mu4e.el -${EMACS_LISPPREFIX}/mu4e/mu4e.elc ${EMACS_LISPPREFIX}/mu4e/org-mu4e.el ${EMACS_LISPPREFIX}/mu4e/org-mu4e.elc +info/mu4e.info +info/mu-guile.info +share/doc/mu/mu4e-about.org diff --git a/mu/PLIST.guile b/mu/PLIST.guile index 79f702a5a5..5a0af1aa6f 100644 --- a/mu/PLIST.guile +++ b/mu/PLIST.guile @@ -1,10 +1,10 @@ @comment $NetBSD: PLIST.guile,v 1.1 2015/01/03 09:55:19 thomasklausner Exp $ info/mu-guile.info lib/libguile-mu.la -share/guile/site/2.0/mu.scm -share/guile/site/2.0/mu/plot.scm -share/guile/site/2.0/mu/script.scm -share/guile/site/2.0/mu/stats.scm +share/guile/site/2.2/mu/plot.scm +share/guile/site/2.2/mu.scm +share/guile/site/2.2/mu/script.scm +share/guile/site/2.2/mu/stats.scm share/mu/scripts/find-dups.scm share/mu/scripts/msgs-count.scm share/mu/scripts/msgs-per-day.scm diff --git a/mu/distinfo b/mu/distinfo index 2a8c4c4c8f..0b4b9e258d 100644 --- a/mu/distinfo +++ b/mu/distinfo @@ -1,6 +1,6 @@ $NetBSD: distinfo,v 1.2 2014/11/02 18:30:40 thomasklausner Exp $ -SHA1 (mu-0.9.9.6.tar.gz) = 45feb511fecf8b306c87a42f3a84858ac442642c -RMD160 (mu-0.9.9.6.tar.gz) = 59a8ef474bd5621cab7dd01bc368397b9c871f60 -SHA512 (mu-0.9.9.6.tar.gz) = 0213033aa7599a5120c38a4b9ec018357ebd63a3c4828e0f9d7af41529dc1b001db8d506408b0341e0efe9835fbd21dbf23c836920c98ae2caabcb0cdc7dac2b -Size (mu-0.9.9.6.tar.gz) = 2172349 bytes +SHA1 (mu-1.4.13.tar.gz) = 55454a5ee4f18c4cd54181dbf3d1c449b4cd2777 +RMD160 (mu-1.4.13.tar.gz) = 2c9d6b8ddb339ce1d15bd9249414e3082ef0dcba +SHA512 (mu-1.4.13.tar.gz) = 0f8e7f75332257e8cfdecf2c27bc23c83420387e40ecf92089232af6c545700a6c4925665b39fc236cacf8b26fa4b81df71775cdbe04c340fe3455c54c0d1bbc +Size (mu-1.4.13.tar.gz) = 2309545 bytes diff --git a/mu/options.mk b/mu/options.mk index cdd2c77c40..e07b31a764 100644 --- a/mu/options.mk +++ b/mu/options.mk @@ -13,6 +13,8 @@ PLIST_SRC= PLIST INFO_FILES= yes USE_TOOLS+= makeinfo PLIST_SRC+= PLIST.emacs +.else +CONFIGURE_ARGS+= --disable-mu4e .endif # needs gtk3 and webkit-gtk-3 @@ -22,6 +24,10 @@ PLIST_SRC+= PLIST.emacs .endif .if !empty(PKG_OPTIONS:Mguile) -.include "../../lang/guile20/buildlink3.mk" +.include "../../lang/guile22/buildlink3.mk" PLIST_SRC+= PLIST.guile +CONFIGURE_ENV+= ac_cv_path_GUILE=guile +USE_TOOLS+= makeinfo +.else +CONFIGURE_ARGS+= --disable-guile .endif