muon: Update to git commit 6b8073be2501abf34f488c46f9eca9958d702f8a

diff --git a/muon/Makefile b/muon/Makefile
index 6d156849a3b222402272d1b20f63b0ec7a3c761f..b9b1e6a217e96a8d39d077c45ffa66a5edbf30f1 100644 (file)
--- 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
 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 c64dbb779ea20b96a5b01e227fa7e667e2c90567..3736a7e6c70bf0eb1ea658a4171bc34574220dce 100644 (file)
--- 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 47a31f275f90a1faeab55f66552918db584ce68f..8b2b8bf705cc0dd2b7bce3f89ec99ecbd094fd80 100644 (file)
--- 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'