pkgsrc-WIP-changes archive

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

*: py-meson -> meson



Module Name:	pkgsrc-wip
Committed By:	Maya Rashish <maya%NetBSD.org@localhost>
Pushed By:	coypu
Date:		Wed Oct 9 11:47:04 2019 +0300
Changeset:	fa99f8359a5dd03561d73852146a41bf75de9f52

Modified Files:
	MesaLib-dfbsd-meson/Makefile
	MesaLib-dfbsd/Makefile
	cinnamon-desktop/Makefile
	cinnamon-session/Makefile
	epiphany/Makefile
	foliate/Makefile
	frida-gum/Makefile
	glib2/Makefile
	libdazzle/Makefile
	libdrm-dfbsd-meson/Makefile
	libdrm-dfbsd/Makefile
	nemo/Makefile
	pango/Makefile
	xapps/Makefile

Log Message:
*: py-meson -> meson

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

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

diffstat:
 MesaLib-dfbsd-meson/Makefile | 2 +-
 MesaLib-dfbsd/Makefile       | 2 +-
 cinnamon-desktop/Makefile    | 2 +-
 cinnamon-session/Makefile    | 2 +-
 epiphany/Makefile            | 2 +-
 foliate/Makefile             | 2 +-
 frida-gum/Makefile           | 2 +-
 glib2/Makefile               | 2 +-
 libdazzle/Makefile           | 2 +-
 libdrm-dfbsd-meson/Makefile  | 2 +-
 libdrm-dfbsd/Makefile        | 2 +-
 nemo/Makefile                | 2 +-
 pango/Makefile               | 2 +-
 xapps/Makefile               | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diffs:
diff --git a/MesaLib-dfbsd-meson/Makefile b/MesaLib-dfbsd-meson/Makefile
index 7c83bffb52..cfdcaa3a36 100644
--- a/MesaLib-dfbsd-meson/Makefile
+++ b/MesaLib-dfbsd-meson/Makefile
@@ -182,7 +182,7 @@ CWRAPPERS_APPEND.cxx+=	-fuse-ld=${PKG_LD:Q}
 
 # Meson
 CFLAGS+=	-Wno-return-type
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
diff --git a/MesaLib-dfbsd/Makefile b/MesaLib-dfbsd/Makefile
index 3c54a12490..44839ea446 100644
--- a/MesaLib-dfbsd/Makefile
+++ b/MesaLib-dfbsd/Makefile
@@ -120,7 +120,7 @@ CWRAPPERS_APPEND.cxx+=	-fuse-ld=${PKG_LD:Q}
 
 # Meson
 CFLAGS+=	-Wno-return-type
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
diff --git a/cinnamon-desktop/Makefile b/cinnamon-desktop/Makefile
index 1bf27c3a68..3d19d033ea 100644
--- a/cinnamon-desktop/Makefile
+++ b/cinnamon-desktop/Makefile
@@ -28,7 +28,7 @@ MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libcinnamon-
 pre-install:
 	${CHMOD} +x ${WRKSRC}/install-scripts/meson_install_schemas.py
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../lang/python/application.mk"
 
diff --git a/cinnamon-session/Makefile b/cinnamon-session/Makefile
index 421c325267..9d778fd775 100644
--- a/cinnamon-session/Makefile
+++ b/cinnamon-session/Makefile
@@ -21,7 +21,7 @@ LDFLAGS.SunOS+=	-lsocket
 .include "../../wip/xapps/buildlink3.mk"
 
 .include "../../audio/libcanberra/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
diff --git a/epiphany/Makefile b/epiphany/Makefile
index 5c2274aa3f..44bc685efc 100644
--- a/epiphany/Makefile
+++ b/epiphany/Makefile
@@ -23,7 +23,7 @@ PYTHON_FOR_BUILD_ONLY=		yes
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../lang/python/application.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
diff --git a/foliate/Makefile b/foliate/Makefile
index f5049fb06d..4dd1a746b4 100644
--- a/foliate/Makefile
+++ b/foliate/Makefile
@@ -36,7 +36,7 @@ post-install:
 	${LN} -s -f ${DESTDIR}${PREFIX}/bin/com.github.johnfactotum.Foliate \
 		${DESTDIR}${PREFIX}/bin/foliate
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/frida-gum/Makefile b/frida-gum/Makefile
index 5f35ab504c..339d9fee23 100644
--- a/frida-gum/Makefile
+++ b/frida-gum/Makefile
@@ -45,5 +45,5 @@ BUILDLINK_PASSTHRU_RPATHDIRS+=	${PREFIX}/frida
 .include "../../wip/frida-capstone/buildlink3.mk"
 .include "../../wip/frida-glib2/buildlink3.mk"
 .include "../../wip/frida-libffi/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/glib2/Makefile b/glib2/Makefile
index 8750b9366c..634e63726b 100644
--- a/glib2/Makefile
+++ b/glib2/Makefile
@@ -60,7 +60,7 @@ TOOL_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 PYTHON_FOR_BUILD_ONLY?=	yes
 .include "../../lang/python/pyversion.mk"
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/libdazzle/Makefile b/libdazzle/Makefile
index e890ebcb00..eab83a4a5a 100644
--- a/libdazzle/Makefile
+++ b/libdazzle/Makefile
@@ -18,6 +18,6 @@ MESON_ARGS+=	-D with_introspection=false
 
 .include "../../devel/glib2/buildlink3.mk"
 #.include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libdrm-dfbsd-meson/Makefile b/libdrm-dfbsd-meson/Makefile
index cae909798f..2f67217827 100644
--- a/libdrm-dfbsd-meson/Makefile
+++ b/libdrm-dfbsd-meson/Makefile
@@ -153,6 +153,6 @@ CPPFLAGS+=	-DSTRICT_XSRC_NETBSD
 
 # Meson
 # CPPFLAGS+=	-Wno-return-type
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/libdrm-dfbsd/Makefile b/libdrm-dfbsd/Makefile
index 3c8312aa8e..6faca1e7b2 100644
--- a/libdrm-dfbsd/Makefile
+++ b/libdrm-dfbsd/Makefile
@@ -116,6 +116,6 @@ CPPFLAGS+=	-DSTRICT_XSRC_NETBSD
 
 # Meson
 # CPPFLAGS+=	-Wno-return-type
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/nemo/Makefile b/nemo/Makefile
index 9f388b536f..450f1abfe4 100644
--- a/nemo/Makefile
+++ b/nemo/Makefile
@@ -40,7 +40,7 @@ REPLACE_PYTHON=	data/merge_action_strings \
 MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libnemo-private
 MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libnemo-extension
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../lang/python/application.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/exempi/buildlink3.mk"
diff --git a/pango/Makefile b/pango/Makefile
index 81497207a3..7261b5c36e 100644
--- a/pango/Makefile
+++ b/pango/Makefile
@@ -59,5 +59,5 @@ BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.12.10
 # which corresponds to release version 2.8.1
 BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.8.1
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xapps/Makefile b/xapps/Makefile
index 8703ae62cc..9a68a38b20 100644
--- a/xapps/Makefile
+++ b/xapps/Makefile
@@ -33,7 +33,7 @@ REPLACE_BASH=	files/usr/bin/xfce4-set-wallpaper
 pre-install:
 	${CHMOD} +x ${WRKSRC}/schemas/meson_install_schemas.py
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/py-gobject3-common/buildlink3.mk"


Home | Main Index | Thread Index | Old Index