graphics/mesa-demos: Drop patch to rename bitmap to bitmap_demo

mesa-demos provides a bitmap program that conflict with x11/bitmap. Instead of patching the makefiles just rename the binary in post-stage. Differential Revision: https://reviews.freebsd.org/D44967 Sponsored by: Beckhoff Automation GmbH & Co.KG
freebsd · Apr 30, 2024 · c0e16d7 · c0e16d7
1 parent ed57274
commit c0e16d7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 70 deletions.
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
@@ -28,4 +28,8 @@ CONFIGURE_ARGS+=--disable-gles1 --disable-osmesa --disable-vg --disable-wayland
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
+post-stage:
+	# bitmap program conflicts with x11/bitmap
+	${MV} ${STAGEDIR}/${PREFIX}/bin/bitmap ${STAGEDIR}/${PREFIX}/bin/bitmap_demo
+
 .include <bsd.port.mk>
diff --git a/graphics/mesa-demos/files/patch-src-glsl-Makefile.am b/graphics/mesa-demos/files/patch-src-glsl-Makefile.am
diff --git a/graphics/mesa-demos/files/patch-src-glsl-Makefile.in b/graphics/mesa-demos/files/patch-src-glsl-Makefile.in