aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Druzenko <vvd@FreeBSD.org>2024-04-29 13:38:55 +0000
committerVladimir Druzenko <vvd@FreeBSD.org>2024-04-29 13:38:55 +0000
commit817c2557b778ecc8b0bb920f055487e7d2415c6b (patch)
tree116a2663a66394765672abb5a1403af3938dffe2
parent0bcd20b238ac35ec0db95a496b8c9ce7b6015b4e (diff)
downloadports-817c2557b778ecc8b0bb920f055487e7d2415c6b.tar.gz
ports-817c2557b778ecc8b0bb920f055487e7d2415c6b.zip
Revert "graphics/glfw: fix build with EXAMPLES enabled and PREEDIT disabled"
This reverts commit 0bcd20b238ac35ec0db95a496b8c9ce7b6015b4e. Mk/Uses/mysql.mk got there by accident
-rw-r--r--Mk/Uses/mysql.mk4
-rw-r--r--graphics/glfw/Makefile4
2 files changed, 3 insertions, 5 deletions
diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk
index 2a5edc80bb3c..cf5840131744 100644
--- a/Mk/Uses/mysql.mk
+++ b/Mk/Uses/mysql.mk
@@ -5,8 +5,8 @@
#
# version If no version is given (by the maintainer via the port), try to
# find the currently installed version. Fall back to default if
-# necessary (MariaDB-10.11 = 10.11m, look at bsd.default-versions.mk
-# for possible values).
+# necessary (MySQL-8.0 = 80, look at bsd.default-versions.mk for
+# possible values).
# client Depends on the libmysqlclient library (default)
# server Depend on the server at run/build time. If none of these is
# set, depends on the client.
diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile
index 3b2e330c99ac..8b33dd90eda3 100644
--- a/graphics/glfw/Makefile
+++ b/graphics/glfw/Makefile
@@ -65,7 +65,6 @@ X11_CMAKE_BOOL= GLFW_BUILD_X11
.if ${PORT_OPTIONS:MEXAMPLES} && ${PORT_OPTIONS:MPREEDIT}
LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig
-TESTS_FILES= input_text
.endif
do-install-DOCS-on:
@@ -84,9 +83,8 @@ do-install-EXAMPLES-on:
${STAGEDIR}${EXAMPLESDIR}
cd ${WRKSRC}/tests && ${INSTALL_PROGRAM} \
allocator clipboard cursor empty events gamma glfwinfo icon \
- iconify inputlag joysticks monitors msaa reopen \
+ iconify input_text inputlag joysticks monitors msaa reopen \
tearing threads timeout title triangle-vulkan window \
- ${TESTS_FILES} \
${STAGEDIR}${EXAMPLESDIR}/tests
.include <bsd.port.mk>