mu: clean up, simplify

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Apr 26 16:25:17 2024 +0200
Changeset:	978413acbaef042110b214a2395104124dd91d35

Modified Files:
	mu/Makefile
	mu/PLIST.guile
	mu/options.mk

Log Message:
mu: clean up, simplify

XXX: options.mk needs fixing for meson
XXX: guile option needs testing

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=978413acbaef042110b214a2395104124dd91d35

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mu/Makefile    | 29 +++++++----------------------
 mu/PLIST.guile |  2 +-
 mu/options.mk  |  3 +++
 3 files changed, 11 insertions(+), 23 deletions(-)

diffs:
diff --git a/mu/Makefile b/mu/Makefile
index 3f545ce239..b6167cfd7e 100644
--- a/mu/Makefile
+++ b/mu/Makefile
@@ -3,43 +3,28 @@
 DISTNAME=	mu-1.12.3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=djcb/}
-GITHUB_TAG=	refs/tags/v${PKGVERSION_NOREV}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://www.djcbsoftware.nl/code/mu/
 COMMENT=	E-mail searching and indexing tools
 LICENSE=	gnu-gpl-v3
 
-WRKSRC=	${WRKDIR}/${DISTNAME}
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
 MESON_ARGS+=	-Dlispdir=${EMACS_LISPPREFIX}
 MESON_ARGS+=	-Dreadline=enabled
-USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake pkg-config autoconf automake ninja
+USE_TOOLS+=	pkg-config
 
-PYTHON_FOR_BUILD_ONLY=tool
+PYTHON_FOR_BUILD_ONLY=		tool
 PYTHON_VERSIONS_INCOMPATIBLE=	27
-# TODO: this isn't working at the moment
-# REPLACE_TOOL_PYTHON=	build-aux/date.py
-
-SUBST_CLASSES+=		py
-SUBST_FILES.py=	build-aux/date.py
-SUBST_STAGE.py=	post-extract
-SUBST_SED.py=	-e 's,/usr/bin/env,${PREFIX}/bin/env,'
-SUBST_SED.py=	-e 's,python3,python3.11,'
+REPLACE_PYTHON+=		build-aux/date.py
 
 .include "options.mk"
 
-pre-configure:
-	cd ${WRKSRC} && sh autogen.sh
-
-post-install:
-	-${RM} -f ${DESTDIR}${PREFIX}/info/dir
+#post-install:
+#	-${RM} -f ${DESTDIR}${PREFIX}/info/dir
 
-#.include "../../lang/python/application.mk"
+.include "../../lang/python/application.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../devel/readline/buildlink3.mk"
diff --git a/mu/PLIST.guile b/mu/PLIST.guile
index 5a0af1aa6f..910c1c7d99 100644
--- a/mu/PLIST.guile
+++ b/mu/PLIST.guile
@@ -1,8 +1,8 @@
 @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.2/mu/plot.scm
 share/guile/site/2.2/mu.scm
+share/guile/site/2.2/mu/plot.scm
 share/guile/site/2.2/mu/script.scm
 share/guile/site/2.2/mu/stats.scm
 share/mu/scripts/find-dups.scm
diff --git a/mu/options.mk b/mu/options.mk
index 8ded2dba13..e0593dd03b 100644
--- a/mu/options.mk
+++ b/mu/options.mk
@@ -14,14 +14,17 @@ INFO_FILES=	yes
 USE_TOOLS+=	makeinfo
 PLIST_SRC+=	PLIST.emacs
 .else
+# TODO: update for meson
 CONFIGURE_ARGS+= --disable-mu4e
 .endif
 
 .if !empty(PKG_OPTIONS:Mguile)
 .include "../../lang/guile22/buildlink3.mk"
 PLIST_SRC+=	PLIST.guile
+# TODO: update for meson
 CONFIGURE_ENV+= ac_cv_path_GUILE=guile
 USE_TOOLS+= makeinfo
 .else
+# TODO: update for meson
 CONFIGURE_ARGS+= --disable-guile
 .endif