Index: Mk/bsd.options.mk =================================================================== --- Mk/bsd.options.mk +++ Mk/bsd.options.mk @@ -112,6 +112,13 @@ # ${opt}_QMAKE_OFF When option is disabled, it will add its content to # the QMAKE_ARGS. # +# ${opt}_MESON_ENABLE Will add to MESON_ARGS: +# Option enabled -D${content}=enabled +# Option disabled -D${content}=disabled +# ${opt}_MESON_DISABLE Will add to MESON_ARGS: +# Option enabled -D${content}=disabled +# Option disabled -D${content}=enabled +# # ${opt}_MESON_ON When option is enabled, it will add its # content to MESON_ARGS. # ${opt}_MESON_OFF When option is disabled, it will add its @@ -491,6 +498,12 @@ . if defined(${opt}_CMAKE_BOOL_OFF) CMAKE_ARGS+= ${${opt}_CMAKE_BOOL_OFF:C/.*/-D&:BOOL=false/} . endif +. if defined(${opt}_MESON_ENABLE) +MESON_ARGS+= ${${opt}_MESON_ENABLE:C/.*/-D&=enabled/} +. endif +. if defined(${opt}_MESON_DISABLE) +MESON_ARGS+= ${${opt}_MESON_DISABLE:C/.*/-D&=disabled/} +. endif . if defined(${opt}_MESON_TRUE) MESON_ARGS+= ${${opt}_MESON_TRUE:C/.*/-D&=true/} . endif @@ -552,6 +565,12 @@ . endif . if defined(${opt}_CMAKE_BOOL_OFF) CMAKE_ARGS+= ${${opt}_CMAKE_BOOL_OFF:C/.*/-D&:BOOL=true/} +. endif +. if defined(${opt}_MESON_ENABLE) +MESON_ARGS+= ${${opt}_MESON_ENABLE:C/.*/-D&=disabled/} +. endif +. if defined(${opt}_MESON_DISABLE) +MESON_ARGS+= ${${opt}_MESON_DISABLE:C/.*/-D&=enabled/} . endif . if defined(${opt}_MESON_TRUE) MESON_ARGS+= ${${opt}_MESON_TRUE:C/.*/-D&=false/} Index: x11/swaylock/Makefile =================================================================== --- x11/swaylock/Makefile +++ x11/swaylock/Makefile @@ -30,12 +30,10 @@ OPTIONS_DEFAULT=MANPAGES PIXBUF MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc -MANPAGES_MESON_ON= -Dman-pages=enabled -MANPAGES_MESON_OFF= -Dman-pages=disabled +MANPAGES_MESON_ENABLE= man-pages MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz PIXBUF_USE= GNOME=gdkpixbuf2 -PIXBUF_MESON_ON= -Dgdk-pixbuf=enabled -PIXBUF_MESON_OFF= -Dgdk-pixbuf=disabled +PIXBUF_MESON_ENABLE= gdk-pixbuf .include