pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

muon: Remove patches



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Nov 14 11:57:33 2022 +0100
Changeset:	3571866e9325860610163f41013ad42373ac5676

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

Log Message:
muon: Remove patches

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

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

diffstat:
 muon/Makefile                  | 17 -----------------
 muon/distinfo                  |  1 -
 muon/patches/patch-meson.build | 16 ----------------
 3 files changed, 34 deletions(-)

diffs:
diff --git a/muon/Makefile b/muon/Makefile
index 1f7ad8228b..180ab67c2f 100644
--- a/muon/Makefile
+++ b/muon/Makefile
@@ -14,23 +14,6 @@ USE_LANGUAGES=	c99
 
 TOOL_DEPENDS+=	samurai>=1.2:../../devel/samurai
 
-MESON_CFLAGS=	${CFLAGS:C/ /' c_args+='/Wg}
-MESON_LDFLAGS=	${LDFLAGS:S/ /' link_args+='/Wg}
-
-SUBST_CLASSES+=		flags1
-SUBST_STAGE.flags1=	pre-configure
-SUBST_MESSAGE.flags1=	Honor LDFLAGS in bootstrap.sh ...
-SUBST_FILES.flags1=	bootstrap.sh
-SUBST_SED.flags1=	-e 's, -o ,$$LDFLAGS -o,'
-
-SUBST_CLASSES+=		flags2
-SUBST_STAGE.flags2=	pre-configure
-SUBST_MESSAGE.flags2=	Honor CFLAGS and LDFLAGS in meson.build ...
-SUBST_FILES.flags2=	meson.build
-SUBST_SED.flags2=	-e "s|@CFLAGS@|c_args+='${MESON_CFLAGS:S/ /@LF@/Wg}'|"
-SUBST_SED.flags2+=	-e "s|@LDFLAGS@|link_args+='${MESON_LDFLAGS:S/ /@LF@/Wg}'|"
-SUBST_SED.flags2+=	-e "s|@LF@|\\${.newline}|g"
-
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 INSTALLATION_DIRS=	bin
 
diff --git a/muon/distinfo b/muon/distinfo
index 032a4f4dfc..c069c59b37 100644
--- a/muon/distinfo
+++ b/muon/distinfo
@@ -3,4 +3,3 @@ $NetBSD$
 BLAKE2s (0.1.0.tar.gz) = 1783bc2a85e8558f4680b652bc66ae21b2cc9fed29f5f2d8d56880f914cf98d5
 SHA512 (0.1.0.tar.gz) = 54337fed8ae41bf2dca3cbb0a303a521b7750eb7e5b40ca1aeb0fc045ac82b163d77c7b06a6a790eb3feef6f8d10f2a6b7937f55cfb1404c70b429dd0899dd5f
 Size (0.1.0.tar.gz) = 472632 bytes
-SHA1 (patch-meson.build) = 38141a8c5a8e6429ac87cae1a9384a58ecd2134c
diff --git a/muon/patches/patch-meson.build b/muon/patches/patch-meson.build
deleted file mode 100644
index 8b2b8bf705..0000000000
--- a/muon/patches/patch-meson.build
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Honor CFLAGS and LDFLAGS.
-
---- meson.build.orig	2022-07-11 08:37:18.000000000 +0000
-+++ meson.build
-@@ -43,7 +43,9 @@ endif
- # compiler setup
- 
- c_args = ['-DMUON_PLATFORM_' + platform]
-+@CFLAGS@
- link_args = []
-+@LDFLAGS@
- 
- if get_option('static')
-     c_args += '-DMUON_STATIC'


Home | Main Index | Thread Index | Old Index