Date: Fri, 9 Apr 2021 10:47:06 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 741d28a5ac0d - main - x11/libxkbcommon: simplify OSVERSION check Message-ID: <202104091047.139Al69f073298@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=741d28a5ac0d06b6e0b65d8c46ba6a1b83815b77 commit 741d28a5ac0d06b6e0b65d8c46ba6a1b83815b77 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-04-07 16:27:51 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-04-09 10:45:27 +0000 x11/libxkbcommon: simplify OSVERSION check bsd.port.{pre,post}.mk can be simplifed to bsd.port{,.options}.mk but .include can be eliminated via lazy evaluation. Approved by: manu Differential Revision: https://reviews.freebsd.org/D29664 --- x11/libxkbcommon/Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile index 28def286825d..0341cf8c8d51 100644 --- a/x11/libxkbcommon/Makefile +++ b/x11/libxkbcommon/Makefile @@ -16,7 +16,9 @@ USES= bison gnome meson pkgconfig tar:xz USE_GNOME= libxml2 MESON_ARGS= -Denable-docs=false \ -Denable-wayland=false \ - -Dx-locale-root="${PREFIX}/lib/X11/locale" + -Dx-locale-root="${PREFIX}/lib/X11/locale" \ + ${MESON_ARGS_${OPSYS}_${OSREL:R}} +MESON_ARGS_FreeBSD_11= -Ddefault-rules=xorg OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 @@ -26,10 +28,4 @@ X11_USES= xorg X11_USE= XORG=xcb X11_MESON_TRUE= enable-x11 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 1200000 -MESON_ARGS+= -Ddefault-rules=xorg -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104091047.139Al69f073298>