svn commit: r564738 - head/x11-fm/worker

[Alexey Dokuchaev]

Author: danfe
Date: Mon Feb  8 19:59:12 2021
New Revision: 564738
URL: https://svnweb.freebsd.org/changeset/ports/564738

Log:
  Now that HAL support and associated dependencies had been removed in
  r564687, expose D-Bus device handling support, which HAL option had
  previously implied, via dedicated option, DBUS, and make it default.
  
  While here, add a few missing FOO_CONFIGURE_OFF's, sort the knobs so
  that "on" knobs are listed before the "off" ones, and reindent them.

Modified:
  head/x11-fm/worker/Makefile

Modified: head/x11-fm/worker/Makefile
==============================================================================
--- head/x11-fm/worker/Makefile	Mon Feb  8 19:36:33 2021	(r564737)
+++ head/x11-fm/worker/Makefile	Mon Feb  8 19:59:12 2021	(r564738)
@@ -22,26 +22,31 @@ SHEBANG_FILES=	${WRKSRC}/scripts/*.sh \
 		${WRKSRC}/scripts/xeditor \
 		${WRKSRC}/scripts/find_file_by_chksum.py
 
-OPTIONS_DEFINE=	AVFS INOTIFY LUA SSL XFT
-OPTIONS_DEFAULT=	AVFS INOTIFY SSL XFT
+OPTIONS_DEFINE=	AVFS DBUS INOTIFY LUA SSL XFT
+OPTIONS_DEFAULT=	AVFS DBUS INOTIFY SSL XFT
 OPTIONS_EXCLUDE_DragonFly=	AVFS
 
 INOTIFY_DESC=	Monitor directory changes via libinotify
 AVFS_DESC=	Use AVFS library to access archives
+SSL_DESC=	SHA-256 checksum support via OpenSSL
 
 AVFS_LIB_DEPENDS=	libavfs.so:sysutils/avfs
+AVFS_CONFIGURE_OFF=	--without-avfs
 
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
+DBUS_CONFIGURE_OFF=	--without-dbus
+
 INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
+INOTIFY_CONFIGURE_OFF=	--disable-inotify
 
+LUA_USES=		lua
 LUA_CONFIGURE_OFF=	--disable-lua
-LUA_USES=	lua
 
-SSL_DESC=	SHA-256 checksum support via OpenSSL
+SSL_USES=		ssl
 SSL_CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
-SSL_USES=	ssl
 
+XFT_USE=		xorg=xft
 XFT_CONFIGURE_OFF=	--disable-xft
-XFT_USE=	xorg=xft
 
 .include <bsd.port.mk>