muon: Update to git commit 6b8073be2501abf34f488c46f9eca9958d702f8a

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Aug 19 12:59:59 2022 +0200
Changeset:	1cc86e6110dfe53b34dfbb7533556847107463e4

Modified Files:
	muon/Makefile
	muon/distinfo
	muon/patches/patch-meson.build

Log Message:
muon: Update to git commit 6b8073be2501abf34f488c46f9eca9958d702f8a

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

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

diffstat:
 muon/Makefile                  |  7 +++----
 muon/distinfo                  |  2 +-
 muon/patches/patch-meson.build | 18 ++++++------------
 3 files changed, 10 insertions(+), 17 deletions(-)

diffs:
diff --git a/muon/Makefile b/muon/Makefile
index 6d156849a3..b9b1e6a217 100644
--- a/muon/Makefile
+++ b/muon/Makefile
@@ -4,7 +4,7 @@ DISTNAME=	muon-0.0.1
 CATEGORIES=	devel
 GIT_REPO=	https://git.sr.ht/~lattis/muon
 GIT_BRANCH=	master
-GIT_REVISION=	944dd7e2f91a83fd39f50aa49b30a19c2fcb02ce
+GIT_REVISION=	6b8073be2501abf34f488c46f9eca9958d702f8a
 
 MAINTAINER=	micha%NetBSD.org@localhost
 HOMEPAGE=	https://git.sr.ht/~lattis/muon
@@ -18,10 +18,9 @@ MESON_LDFLAGS=	${LDFLAGS:S/ /' link_args+='/Wg}
 
 SUBST_CLASSES+=		flags1
 SUBST_STAGE.flags1=	pre-configure
-SUBST_MESSAGE.flags1=	Honor CFLAGS and LDFLAGS in bootstrap.sh ...
+SUBST_MESSAGE.flags1=	Honor LDFLAGS in bootstrap.sh ...
 SUBST_FILES.flags1=	bootstrap.sh
-SUBST_SED.flags1=	-e 's,$${CC:-c99} -o "$$dir/muon",$${CC} -std=c99 $$LDFLAGS -o "$$dir/muon",'
-SUBST_SED.flags1+=	-e 's,$${CC:-c99} -g,$${CC} -std=c99 $$CFLAGS -g,'
+SUBST_SED.flags1=	-e 's, -o ,$$LDFLAGS -o,'
 
 SUBST_CLASSES+=		flags2
 SUBST_STAGE.flags2=	pre-configure
diff --git a/muon/distinfo b/muon/distinfo
index c64dbb779e..3736a7e6c7 100644
--- a/muon/distinfo
+++ b/muon/distinfo
@@ -1,3 +1,3 @@
 $NetBSD$
 
-SHA1 (patch-meson.build) = 7ba0c01fdf672c2e032af836de1e0bdb8a76081a
+SHA1 (patch-meson.build) = 38141a8c5a8e6429ac87cae1a9384a58ecd2134c
diff --git a/muon/patches/patch-meson.build b/muon/patches/patch-meson.build
index 47a31f275f..8b2b8bf705 100644
--- a/muon/patches/patch-meson.build
+++ b/muon/patches/patch-meson.build
@@ -2,21 +2,15 @@ $NetBSD$
 
 Honor CFLAGS and LDFLAGS.
 
---- meson.build.orig	2022-05-25 11:33:02.000000000 +0000
+--- meson.build.orig	2022-07-11 08:37:18.000000000 +0000
 +++ meson.build
-@@ -58,6 +58,7 @@ add_project_arguments(
+@@ -43,7 +43,9 @@ endif
+ # compiler setup
  
- deps = []
- c_args = []
+ c_args = ['-DMUON_PLATFORM_' + platform]
 +@CFLAGS@
- 
- include_dir = include_directories('include')
- 
-@@ -65,6 +66,7 @@ subdir('tools')
- subdir('src')
- 
  link_args = []
 +@LDFLAGS@
+ 
  if get_option('static')
-     link_args += '-static'
- endif
+     c_args += '-DMUON_STATIC'