mutter: Fix pkgconfig overrides. Use unversioned libgl on netbsd.

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Tue Nov 10 02:45:34 2020 +0100
Changeset:	89833163fbb8f1214e6517769beb833a942972ba

Modified Files:
	mutter/Makefile

Log Message:
mutter: Fix pkgconfig overrides. Use unversioned libgl on netbsd.

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

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

diffstat:
 mutter/Makefile | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diffs:
diff --git a/mutter/Makefile b/mutter/Makefile
index 7dd91cc941..3abb80c93c 100644
--- a/mutter/Makefile
+++ b/mutter/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	mutter-3.38.1
-CATEGORIES=	x11 gnome
+CATEGORIES=	wm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/mutter/3.38/}
 EXTRACT_SUFX=	.tar.xz
 
@@ -11,7 +11,6 @@ COMMENT=	GNOME Window manager and Wayland compositor
 LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=		pkg-config
-USE_PKGLOCALEDIR=	yes
 
 .include "../../graphics/MesaLib/features.mk"
 
@@ -32,13 +31,17 @@ MESON_ARGS+=		-Dwayland=false
 MESON_ARGS+=		-Dtests=false #tests require Wayland support
 MESON_ARGS+=		-Dsm=true
 MESON_ARGS+=		-Dverbose=true
-MESON_ARGS+=		-Dopengl_libname=libGL.so.3
 
-PKGCONFIG_OVERRIDE+=	clutter/clutter/mutter-clutter.pc.in
-PKGCONFIG_OVERRIDE+=	cogl/cogl-pango/mutter-cogl-pango.pc.in
-PKGCONFIG_OVERRIDE+=	cogl/cogl-path/mutter-cogl-path.pc.in
-PKGCONFIG_OVERRIDE+=	cogl/cogl/mutter-cogl.pc.in
-PKGCONFIG_OVERRIDE+=	src/libmutter.pc.in
+.if ${OPSYS} == "NetBSD"
+MESON_ARGS+=		-Dopengl_libname=libGL.so
+.endif
+
+PKGCONFIG_OVERRIDE_STAGE=	pre-install
+PKGCONFIG_OVERRIDE+=		output/meson-private/mutter-cogl-7.pc
+PKGCONFIG_OVERRIDE+=		output/meson-private/mutter-cogl-pango-7.pc
+PKGCONFIG_OVERRIDE+=		output/meson-private/mutter-clutter-7.pc
+PKGCONFIG_OVERRIDE+=		output/meson-private/mutter-clutter-x11-7.pc
+PKGCONFIG_OVERRIDE+=		output/meson-private/libmutter-7.pc
 
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mutter-7
 
@@ -47,7 +50,7 @@ LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mutter-7
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/graphene/buildlink3.mk"
-.include "../../wip/gnome-settings-daemon/buildlink3.mk"
+.include "../../sysutils/gnome-settings-daemon/buildlink3.mk"
 .include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"