pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

muon: Update to 0.3.0

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed Sep 25 12:42:13 2024 +0200
Changeset:	a3481b808486db4f36a68c5e57ad1817d1f3f18b

Modified Files:
	muon/DESCR
	muon/Makefile
	muon/build.mk
	muon/distinfo
Added Files:
	muon/COMMIT_MSG
	muon/patches/patch-meson.build

Log Message:
muon: Update to 0.3.0

- Brand-new interpreter: https://mochiro.moe/posts/10-muon-internals/
- Lots of windows improvements
    - bootstrap.bat
    - Simple tests passing
- Lots of macOS improvements
    - All tests passing
    - Universal binary deployed by CI
- Script modules introduced: a way of writing muon modules with mostly normal
  meson code.
    - i18n module
    - gnome module (wip)
- Embedded cross-platform samurai implementation
- Lots of bugs fixed!
- 17 contributors:
    Andrea Pappacoda (1)
    Andrew McNulty (11)
    Eli Schwartz (1)
    Filipe Laíns (4)
    JCWasmx86 (1)
    Michael Forney (2)
    Michal Sieron (2)
    Seedo Paul (27)
    Sertonix (3)
    Stone Tickle (497)
    Thomas Adam (1)
    Tokunori Ikegami (1)
    Vincent Torri (12)
    kzc (2)
    rofl0r (1)
    sewn (1)
    torque (1)

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

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

diffstat:
 muon/COMMIT_MSG                | 35 +++++++++++++++++++++++++++++++++++
 muon/DESCR                     |  7 +++++++
 muon/Makefile                  | 38 +++++++++++++++++++++++++++-----------
 muon/build.mk                  |  2 +-
 muon/distinfo                  | 13 +++++++------
 muon/patches/patch-meson.build | 16 ++++++++++++++++
 6 files changed, 93 insertions(+), 18 deletions(-)

diffs:
diff --git a/muon/COMMIT_MSG b/muon/COMMIT_MSG
new file mode 100644
index 0000000000..3f66e79a85
--- /dev/null
+++ b/muon/COMMIT_MSG
@@ -0,0 +1,35 @@
+devel/muon: Add muon version 0.3.0
+
+## 0.3.0
+
+- Brand-new interpreter: https://mochiro.moe/posts/10-muon-internals/
+- Lots of windows improvements
+    - bootstrap.bat
+    - Simple tests passing
+- Lots of macOS improvements
+    - All tests passing
+    - Universal binary deployed by CI
+- Script modules introduced: a way of writing muon modules with mostly normal
+  meson code.
+    - i18n module
+    - gnome module (wip)
+- Embedded cross-platform samurai implementation
+- Lots of bugs fixed!
+- 17 contributors:
+    Andrea Pappacoda (1)
+    Andrew McNulty (11)
+    Eli Schwartz (1)
+    Filipe Laíns (4)
+    JCWasmx86 (1)
+    Michael Forney (2)
+    Michal Sieron (2)
+    Seedo Paul (27)
+    Sertonix (3)
+    Stone Tickle (497)
+    Thomas Adam (1)
+    Tokunori Ikegami (1)
+    Vincent Torri (12)
+    kzc (2)
+    rofl0r (1)
+    sewn (1)
+    torque (1)
diff --git a/muon/DESCR b/muon/DESCR
index 9f9fe5b9b6..6261f9f870 100644
--- a/muon/DESCR
+++ b/muon/DESCR
@@ -1,6 +1,13 @@
 muon is an implementation of the meson build system in C99 with minimal
 dependencies.
 
+Features
+========
+- muon analyze - a static analyzer for meson.build files.
+- muon fmt - a meson.build code formatter.
+- An interactive stepping debugger.
+- fast.
+
 Non-features
 ============
 - bug-for-bug compatibility with meson.
diff --git a/muon/Makefile b/muon/Makefile
index 2a3bea190f..d55bd8a757 100644
--- a/muon/Makefile
+++ b/muon/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKGNAME=		muon-0.2.0
+PKGNAME=		muon-0.3.0
 DISTNAME=		${PKGNAME:S/muon-//}
 CATEGORIES=		devel
 MASTER_SITES=		https://git.sr.ht/~lattis/muon/archive/
@@ -13,9 +13,9 @@ HOMEPAGE=	https://git.sr.ht/~lattis/muon
 COMMENT=	Implementation of meson build system in C99 with minimal dependencies
 LICENSE=	gnu-gpl-v3
 
-USE_LANGUAGES=	c99
+USE_CC_FEATURES=	c99
 
-TOOL_DEPENDS+=	samurai>=1.2:../../devel/samurai
+TOOL_DEPENDS+=		samurai>=1.2:../../devel/samurai
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
@@ -24,15 +24,33 @@ do-configure:
 	cd ${WRKSRC} && env ${CONFIGURE_ENV} \
 		${CONFIG_SHELL} ./bootstrap.sh bootstrap1
 	cd ${WRKSRC} && env ${CONFIGURE_ENV} ./bootstrap1/muon setup \
-		-Ddocs=disabled -Dstatic=false -Dlibcurl=disabled \
-		-Dlibarchive=disabled bootstrap2
-	cd ${WRKSRC} && env ${CONFIGURE_ENV} samu -C bootstrap2
+		-Dlibcurl=disabled \
+		-Dlibarchive=disabled \
+		-Dlibpkgconf=enabled \
+		-Dsamurai=disabled \
+		-Dreadline=builtin \
+		-Dstatic=false \
+		-Ddocs=disabled \
+		-Dwebsite=false \
+		-Dtracy=disabled \
+		bootstrap2
+	cd ${WRKSRC} && env ${CONFIGURE_ENV} \
+		samu -j ${_MAKE_JOBS_N:U1} -C bootstrap2
 
 do-build:
 	cd ${WRKSRC} && env ${MAKE_ENV} ./bootstrap2/muon setup \
-		-Ddocs=disabled -Dstatic=false -Dlibcurl=disabled \
-		-Dlibarchive=disabled output
-	cd ${WRKSRC} && env ${MAKE_ENV} samu -C output
+		-Dlibcurl=disabled \
+		-Dlibarchive=disabled \
+		-Dlibpkgconf=enabled \
+		-Dsamurai=disabled \
+		-Dreadline=builtin \
+		-Dstatic=false \
+		-Ddocs=disabled \
+		-Dwebsite=false \
+		-Dtracy=disabled \
+		output
+	cd ${WRKSRC} && env ${MAKE_ENV} \
+		samu -j ${_MAKE_JOBS_N:U1} -C output
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/output/muon \
@@ -40,8 +58,6 @@ do-install:
 	${INSTALL_MAN} ${WRKDIR}/man/muon.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-#.include "../../archivers/libarchive/buildlink3.mk"
 .include "../../devel/pkgconf/buildlink3.mk"
-#.include "../../www/curl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/muon/build.mk b/muon/build.mk
index 7ed2e80f5c..80d790d2ee 100644
--- a/muon/build.mk
+++ b/muon/build.mk
@@ -4,7 +4,7 @@
 # (cross-compilation is not supported by muon).
 # Uses devel/samurai as build tool (instead of devel/ninja-build).
 
-MUON_REQD?=	0
+MUON_REQD?=	0.3
 .for version in ${MUON_REQD}
 TOOL_DEPENDS+=	muon>=${version}:../../wip/muon
 .endfor
diff --git a/muon/distinfo b/muon/distinfo
index 260ddd05ce..2e22111a40 100644
--- a/muon/distinfo
+++ b/muon/distinfo
@@ -1,8 +1,9 @@
 $NetBSD$
 
-BLAKE2s (muon-0.2.0/0.2.0.tar.gz) = 8de947544673e3a26b6569866ba40802de80fd36229b8bc1454ced55b698356b
-SHA512 (muon-0.2.0/0.2.0.tar.gz) = b2e90048756bdc26bdea24fe227a87ad4d0e57176e217e22ea492a55229c62e2a70243f60af1e162e2dde8468fdda9662a32ea5cfadd69fab95a83499efa077b
-Size (muon-0.2.0/0.2.0.tar.gz) = 510533 bytes
-BLAKE2s (muon-0.2.0/man.tar.gz) = cdd8868cb2a23a86d2969c7e73f5bd853927955b61d299fdc0159bfe2e1f80cd
-SHA512 (muon-0.2.0/man.tar.gz) = e1ef67ae1e03ca843f839bef9eee04a6a8aee7e3b7ecf13ea95aff992f390884da146d8386ea75ea3d6c3a9aca96acf61a5c743fdfab9745539eab20d838d068
-Size (muon-0.2.0/man.tar.gz) = 7131 bytes
+BLAKE2s (muon-0.3.0/0.3.0.tar.gz) = 831af6f70a771160c51c9611071abcff98be556f553a7b9eb75bf19e4aab9afe
+SHA512 (muon-0.3.0/0.3.0.tar.gz) = 32a0275845bcd6b3fba710d4820c9d88c74f02f9ed50b55118a9df10432ad169d67c713b071a2feeac7f1389fd4010486dcf3e631c33bf7a9af9f485bfad3772
+Size (muon-0.3.0/0.3.0.tar.gz) = 445990 bytes
+BLAKE2s (muon-0.3.0/man.tar.gz) = a29909a298c4140169684bfb3c0156aef8269b1335473f37ed02506dce110f49
+SHA512 (muon-0.3.0/man.tar.gz) = 8dfc00ce366b172196d815e74e9941debcc4a306333f1d8cda8ca31d501bdb72fe3a0ec8df0391731906674fa9d4bf014d96974bc73566f5baf30f10c232d60f
+Size (muon-0.3.0/man.tar.gz) = 8067 bytes
+SHA1 (patch-meson.build) = 3533d7c4b34a2f3dd9e67778becd17f342a69dfa
diff --git a/muon/patches/patch-meson.build b/muon/patches/patch-meson.build
new file mode 100644
index 0000000000..cebb5561fb
--- /dev/null
+++ b/muon/patches/patch-meson.build
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Disable subdirectories "tests" and "doc".
+The build system tries to download additional stuff (not allowed for pkgsrc).
+
+--- meson.build.orig	2024-09-24 16:08:34.000000000 +0000
++++ meson.build
+@@ -154,5 +154,6 @@ muon = executable(
+ 
+ python3 = find_program('python3', required: false)
+ 
+-subdir('tests')
+-subdir('doc')
++# Disabled for pkgsrc
++#subdir('tests')
++#subdir('doc')
Home | Main Index | Thread Index | Old Index