Index: Mk/bsd.options.mk =================================================================== --- Mk/bsd.options.mk +++ Mk/bsd.options.mk @@ -106,6 +106,8 @@ # ${opt}_CMAKE_BOOL_OFF Will add to CMAKE_ARGS: # Option enabled -D${content}:BOOL=false # Option disabled -D${content}:BOOL=true +# ${opt}_CMAKE_DISABLE_FIND_ON Option enabled -DCMAKE_DISABLE_FIND_PACKAGE_${content}:BOOL=true +# ${opt}_CMAKE_DISABLE_FIND_OFF Option disabled -DCMAKE_DISABLE_FIND_PACKAGE_${content}:BOOL=true # # ${opt}_QMAKE_ON When option is enabled, it will add its content to # the QMAKE_ARGS. @@ -491,6 +493,9 @@ . if defined(${opt}_CMAKE_BOOL_OFF) CMAKE_ARGS+= ${${opt}_CMAKE_BOOL_OFF:C/.*/-D&:BOOL=false/} . endif +. if defined(${opt}_CMAKE_DISABLE_FIND_ON) +CMAKE_ARGS+= ${${opt}_CMAKE_DISABLE_FIND_ON:C/.*/-DCMAKE_DISABLE_FIND_PACKAGE_&:BOOL=true/} +. endif . if defined(${opt}_MESON_TRUE) MESON_ARGS+= ${${opt}_MESON_TRUE:C/.*/-D&=true/} . endif @@ -552,6 +557,9 @@ . endif . if defined(${opt}_CMAKE_BOOL_OFF) CMAKE_ARGS+= ${${opt}_CMAKE_BOOL_OFF:C/.*/-D&:BOOL=true/} +. endif +. if defined(${opt}_CMAKE_DISABLE_FIND_OFF) +CMAKE_ARGS+= ${${opt}_CMAKE_DISABLE_FIND_OFF:C/.*/-DCMAKE_DISABLE_FIND_PACKAGE_&:BOOL=true/} . endif . if defined(${opt}_MESON_TRUE) MESON_ARGS+= ${${opt}_MESON_TRUE:C/.*/-D&=false/} Index: devel/kio-extras/Makefile =================================================================== --- devel/kio-extras/Makefile +++ devel/kio-extras/Makefile @@ -31,32 +31,32 @@ OPTIONS_SUB= yes SAMBA_DESC= Needed to build the SMB kioslave -SAMBA_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Samba +SAMBA_DISABLE_OFF= Samba SAMBA_USES= samba:lib MTP_DESC= Needed to build the MTP kioslave -MTP_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Mtp +MTP_CMAKE_DISABLE_FIND_OFF= Mtp MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp EXR_DESC= Provides support for OpenEXR formatted images in the thumbnail kioslave -EXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR +EXR_CMAKE_DISABLE_FIND_OFF= OpenEXR EXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr EXIV_DESC= Provides support for automatic rotation of JPEGs in the thumbnail kioslave -EXIV_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Exiv2 +EXIV_CMAKE_DISABLE_FIND_OFF= Exiv2 EXIV_LIB_DEPENDS= libexiv2.so:graphics/exiv2 SLP_DESC= Provides SLP support in the network:/ kioslave -SLP_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_SLP +SLP_CMAKE_DISABLE_FIND_OFF= SLP SLP_LIB_DEPENDS= libslp.so:net/openslp SSH_DESC= Needed to build the SFTP kioslave -SSH_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_LibSSH +SSH_CMAKE_DISABLE_FIND_OFF= LibSSH SSH_LIB_DEPENDS= libssh.so:security/libssh # Our taglib is too old TAGLIB_DESC= Needed to build the audio thumbnail kioslave -TAGLIB_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Taglib +TAGLIB_CMAKE_DISABLE_FIND_OFF= Taglib TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib .include