diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk index cf5840131744..2a5edc80bb3c 100644 --- a/Mk/Uses/mysql.mk +++ b/Mk/Uses/mysql.mk @@ -1,154 +1,154 @@ # Provide support for MySQL # Feature: mysql # Usage: USES=mysql or USES=mysql:args # Valid ARGS: , client, server # # 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 (MySQL-8.0 = 80, look at bsd.default-versions.mk for -# possible values). +# necessary (MariaDB-10.11 = 10.11m, 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. # # IGNORE_WITH_MYSQL # This variable can be defined if the ports does not support one # or more versions of MySQL. # WITH_MYSQL_VER # User defined variable to set MySQL version. # MYSQL_VER # Detected MySQL version. # # DBD_MYSQL # Set compatible p5-DBD-mysql version # # MAINTAINER: ports@FreeBSD.org .if !defined(_INCLUDE_USES_MYSQL_MK) _INCLUDE_USES_MYSQL_MK= yes . if !empty(mysql_ARGS) .undef _WANT_MYSQL_VER .undef _WANT_MYSQL_SERVER _MYSQL_ARGS= ${mysql_ARGS:S/,/ /g} . if ${_MYSQL_ARGS:Mserver} _WANT_MYSQL_SERVER= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nserver} . endif . if ${_MYSQL_ARGS:Mclient} _WANT_MYSQL_CLIENT= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nclient} . endif # Port requested a version . if !empty(_MYSQL_ARGS) _WANT_MYSQL_VER= ${_MYSQL_ARGS} . if (${_WANT_MYSQL_VER:C/[0-9]*//} == "m") _WANT_MYSQL_FLAVOUR= mariadb . else _WANT_MYSQL_FLAVOUR= mysql . endif . endif . endif # !empty(mysql_ARGS) . if defined(DEFAULT_MYSQL_VER) WARNING+= "DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead" . endif DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} # MySQL client version currently supported. # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. MYSQL80_LIBVER= 21 MYSQL81_LIBVER= 22 . for v in 5 6 11 MYSQL10${v}m_LIBVER= 3 . endfor # Setting/finding MySQL version we want. . if exists(${LOCALBASE}/bin/mysql) _MYSQL!= ${LOCALBASE}/bin/mysql_config --version | ${SED} -e 's/\([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/' _MARIADB!= ${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l . if ${_MARIADB} == 1 _MYSQL_VER= ${_MYSQL}m _MYSQL_FLAVOUR= mariadb . else _MYSQL_VER= ${_MYSQL} _MYSQL_FLAVOUR= mysql . endif . endif . if defined(_WANT_MYSQL_VER) . if defined(WITH_MYSQL_VER) && (${WITH_MYSQL_VER:C/[0-9]*//} == "m") WITH_MYSQL_FLAVOUR= mariadb . else WITH_MYSQL_FLAVOUR= mysql . endif . if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${_WANT_MYSQL_VER} IGNORE= cannot install: the port wants ${_WANT_MYSQL_FLAVOUR}${_WANT_MYSQL_VER:C/[m]//}-client and you try to install ${WITH_MYSQL_FLAVOUR}${WITH_MYSQL_VER:C/[m]//}-client . endif MYSQL_VER= ${_WANT_MYSQL_VER} . elif defined(WITH_MYSQL_VER) MYSQL_VER= ${WITH_MYSQL_VER} . else . if defined(_MYSQL_VER) MYSQL_VER= ${_MYSQL_VER} . else MYSQL_VER= ${DEFAULT_MYSQL_VER} . endif . endif # _WANT_MYSQL_VER . if ${MYSQL_VER:C/[0-9]*//} == "m" MYSQL_FLAVOUR= mariadb . else MYSQL_FLAVOUR= mysql . endif . if defined(_MYSQL_VER) . if ${_MYSQL_VER} != ${MYSQL_VER} IGNORE= cannot install: MySQL versions mismatch: ${_MYSQL_FLAVOUR}${_MYSQL_VER:C/[m]//}-client is installed and wanted version is ${MYSQL_FLAVOUR}${MYSQL_VER:C/[m]//}-client . endif . endif _MYSQL_SHLIB= libmysqlclient . if (${MYSQL_VER:C/[0-9]*//} == "m") _MYSQL_SERVER_FLAVOUR= mariadb _MYSQL_CLIENT_FLAVOUR= mariadb . if ${MYSQL_VER:C/m//} >= 105 _MYSQL_SHLIB= libmariadb . endif . else _MYSQL_SERVER_FLAVOUR= mysql _MYSQL_CLIENT_FLAVOUR= mysql . endif _MYSQL_CLIENT= databases/${_MYSQL_CLIENT_FLAVOUR}${MYSQL_VER:C/[m]//}-client _MYSQL_SERVER= databases/${_MYSQL_SERVER_FLAVOUR}${MYSQL_VER:C/[m]//}-server # And now we are checking if we can use it . if defined(MYSQL${MYSQL_VER}_LIBVER) . if defined(IGNORE_WITH_MYSQL) . for VER in ${IGNORE_WITH_MYSQL} . if (${MYSQL_VER} == "${VER}") IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${IGNORE_WITH_MYSQL} not supported) . endif . endfor . endif # IGNORE_WITH_MYSQL . if defined(_WANT_MYSQL_SERVER) RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER} . endif . if defined(_WANT_MYSQL_CLIENT) || !defined(_WANT_MYSQL_SERVER) LIB_DEPENDS+= ${_MYSQL_SHLIB}.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT} . endif . else IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} . endif # Check for correct libs . if ${MYSQL_FLAVOUR} == mariadb DBD_MYSQL= p5-DBD-mysql4>=0:databases/p5-DBD-mysql4 . else DBD_MYSQL= p5-DBD-mysql>=0:databases/p5-DBD-mysql . endif .endif diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile index 8b33dd90eda3..3b2e330c99ac 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -1,90 +1,92 @@ PORTNAME= glfw DISTVERSION= 3.4 CATEGORIES= graphics MASTER_SITES= https://github.com/glfw/glfw/releases/download/${DISTVERSION}/ MAINTAINER= vvd@FreeBSD.org COMMENT= Portable framework for OpenGL development WWW= https://www.glfw.org/ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE.md USES= cmake:insource localbase:ldflags zip USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= GLFW_BUILD_DOCS CONFLICTS_INSTALL= glfw2 PLIST_SUB= MAJVER=${DISTVERSION:R} \ VERSION=${DISTVERSION} PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES PREEDIT OPTIONS_DEFAULT= X11 OPTIONS_MULTI= PLATFORM OPTIONS_MULTI_PLATFORM= WAYLAND X11 PLATFORM_DESC= Window creation platform PREEDIT_DESC= Add patches for run Minecraft (https://github.com/glfw/glfw/pull/2130) EXAMPLES_CMAKE_BOOL= GLFW_BUILD_EXAMPLES GLFW_BUILD_TESTS # Patches to support running applications such as Minecraft with games/lwjgl3 PREEDIT_PATCH_SITES= https://github.com/glfw/glfw/commit/ PREEDIT_PATCHFILES= bf945f1213728a98f7647380616f9cff9f6b3611.patch:-p1 \ 0d7379403edd2f3a3476ce76fba4ac8c6d8410b7.patch:-p1 \ 55cdeb59029d51be4b622d3b66a9735e4cf07a3b.patch:-p1 \ 5f2118a2fa052f4361c6129378d5e8d0c923b118.patch:-p1 \ 4da43dd83e1d16055107f91d9c34df3b114ab6f4.patch:-p1 \ 11fd72171161e77f8c85a4ce51370ae8b813532d.patch:-p1 \ d8d0e52de8fb7c4f9879c2ff3599e0ba13ce8bc6.patch:-p1 \ d793a873a0fa740fa832917f99de35d5e09e7987.patch:-p1 \ d1f1b2a88de2a6d1701558c732164f5e070030a5.patch:-p1 \ cef608cf56c2fb88ff3eded4240f7a609610abad.patch:-p1 \ a66cc4d8805fc2857edf75812ba702e39e2873d7.patch:-p1 \ c4ba4cd58ea4e3eb6686a34596998de65330f71c.patch:-p1 \ 0729aacc8cc6ff888f593108fdf70ce3fc2800b2.patch:-p1 \ 6be88608b1ddbc42d5c59448dc15852f9de7ec26.patch:-p1 WAYLAND_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ libxkbcommon>0:x11/libxkbcommon \ wayland-protocols>=0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim WAYLAND_USES= kde:5 pkgconfig WAYLAND_USE= KDE=ecm WAYLAND_CMAKE_BOOL= GLFW_BUILD_WAYLAND X11_USES= xorg X11_USE= XORG=x11,xcursor,xi,xinerama,xrandr,xxf86vm X11_CMAKE_BOOL= GLFW_BUILD_X11 .include .if ${PORT_OPTIONS:MEXAMPLES} && ${PORT_OPTIONS:MPREEDIT} LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig +TESTS_FILES= input_text .endif do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/docs/html/search ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/html/search/* \ ${STAGEDIR}${DOCSDIR}/docs/html/search cd ${WRKSRC}/docs/html && ${INSTALL_DATA} *.html *.png *.css *.js \ ${STAGEDIR}${DOCSDIR}/docs/html do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/tests cd ${WRKSRC}/examples && ${INSTALL_PROGRAM} \ boing gears heightmap offscreen particles sharing splitview \ triangle-opengl triangle-opengles wave windows \ ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/tests && ${INSTALL_PROGRAM} \ allocator clipboard cursor empty events gamma glfwinfo icon \ - iconify input_text inputlag joysticks monitors msaa reopen \ + iconify inputlag joysticks monitors msaa reopen \ tearing threads timeout title triangle-vulkan window \ + ${TESTS_FILES} \ ${STAGEDIR}${EXAMPLESDIR}/tests .include