2 files changed, 24 insertions, 17 deletions

diff --git a/x11-fm/worker/Makefile b/x11-fm/worker/Makefile
index 846906afffd6..49110e387eb5 100644
--- a/x11-fm/worker/Makefile
+++ b/x11-fm/worker/Makefile
@@ -3,34 +3,41 @@
 
 PORTNAME=	worker
 PORTVERSION=	3.6.2
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.boomerangsworld.de/cms/worker/downloads/
 
 MAINTAINER=	mp39590@gmail.com
-COMMENT=	X11 File Manager based on Directory Opus
+COMMENT=	X11 file manager based on Directory Opus of AmigaOS
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
+USES=		compiler:c++11-lib pkgconfig shebangfix tar:bzip2
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
+USE_XORG=	x11 xinerama
 
-USES=	shebangfix tar:bzip2
 SHEBANG_FILES=	${WRKSRC}/scripts/*.sh \
 		${WRKSRC}/scripts/xeditor
 
-OPTIONS_DEFINE=	XFT AVFS
+OPTIONS_DEFINE=	AVFS HAL INOTIFY LUA XFT
+OPTIONS_DEFAULT=	AVFS INOTIFY
 
+INOTIFY_DESC=	Monitor directory changes via libinotify
 AVFS_DESC=	Use AVFS library to access an archives
+
 AVFS_LIB_DEPENDS=	libavfs.so:${PORTSDIR}/sysutils/avfs
-XFT_CONFIGURE_ENABLE=	xft
-XFT_USE=	XORG=xft
 
-.include <bsd.port.pre.mk>
+HAL_LIB_DEPENDS=	libhal-storage.so:${PORTSDIR}/sysutils/hal \
+			libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+INOTIFY_LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+INOTIFY_LDFLAGS=	-L${LOCALBASE}/lib
 
-.if ${OSVERSION} < 1000024
-USE_GCC=	yes
-.endif
+LUA_CONFIGURE_OFF=	--disable-lua
+LUA_USES=	lua:51
+
+XFT_CONFIGURE_OFF=	--disable-xft
+XFT_USE=	XORG=xft
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/worker/pkg-descr b/x11-fm/worker/pkg-descr
index 842f0680d949..38bd1ba1e279 100644
--- a/x11-fm/worker/pkg-descr
+++ b/x11-fm/worker/pkg-descr
@@ -1,7 +1,7 @@
-Worker is a file-manager exclusive for X based on the famous filemanager
-"DirectoryOpus" on the AmigaOS. It is configurable on the fly without
-restarting Worker. Any extern program can be easily integrated in the GUI,
-including a button and a hotkey. Worker uses real file-recognition on
-file-content AND/OR file-ending, where each file-type can get it's own action.
+Worker is a file manager for X11, based on the famous Directory Opus file
+manager for AmigaOS.  It is configurable on the fly without the need for
+restart.  Any external program can be easily integrated in GUI, including
+buttons and hotkeys.  Worker uses real file recognition on file content
+and/or file ending, where each file type can get their own action.
 
 WWW: http://www.boomerangsworld.de/worker/