aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPo-Chuan Hsieh <sunpoet@FreeBSD.org>2023-04-05 17:14:41 +0000
committerPo-Chuan Hsieh <sunpoet@FreeBSD.org>2023-04-05 17:29:59 +0000
commitfe54a410559205505a0ba18e5b18619dcf0f4e1e (patch)
treece7a9786093b6fea93471f5f840b05e62ec862a2
parent3b02490d8c4813f8b5f072925b14f70b9b783adb (diff)
downloadports-fe54a410559205505a0ba18e5b18619dcf0f4e1e.tar.gz
ports-fe54a410559205505a0ba18e5b18619dcf0f4e1e.zip
x11-fonts/ots: Fix meson usage
- Convert patch file to MESON_ARGS - Convert nonexistent MESON_TRUE/MESON_FALSE to MESON_ARGS
-rw-r--r--x11-fonts/ots/Makefile3
-rw-r--r--x11-fonts/ots/files/patch-meson.build8
2 files changed, 1 insertions, 10 deletions
diff --git a/x11-fonts/ots/Makefile b/x11-fonts/ots/Makefile
index 01d6f376f24f..1ef563fba129 100644
--- a/x11-fonts/ots/Makefile
+++ b/x11-fonts/ots/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS= libbrotlidec.so:archivers/brotli \
USES= compiler:c++11-lang meson pkgconfig tar:xz
-MESON_FALSE= debug
-MESON_TRUE= graphite
+MESON_ARGS= --default-library=both -Ddebug=false -Dgraphite=true
PLIST_SUB= PORTVERSION=${PORTVERSION}
diff --git a/x11-fonts/ots/files/patch-meson.build b/x11-fonts/ots/files/patch-meson.build
index 65cdb7306c40..a546c2b29cc3 100644
--- a/x11-fonts/ots/files/patch-meson.build
+++ b/x11-fonts/ots/files/patch-meson.build
@@ -1,13 +1,5 @@
--- meson.build.orig 2021-03-07 06:36:19 UTC
+++ meson.build
-@@ -1,6 +1,6 @@
- project('ots', 'c', 'cpp',
- version: '8.1.4',
-- default_options : ['cpp_std=c++11', 'default_library=static', 'warning_level=2'],
-+ default_options : ['cpp_std=c++11', 'default_library=both', 'warning_level=2'],
- meson_version : '>= 0.55.2',
- )
-
@@ -150,6 +150,8 @@ libots = library('ots',
include_directories: include_directories('include'),
cpp_args : '-DHAVE_CONFIG_H',