Index: head/x11/deforaos-locker/Makefile
===================================================================
--- head/x11/deforaos-locker/Makefile
+++ head/x11/deforaos-locker/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	locker
-PORTVERSION=	0.2.1
-PORTREVISION=	2
+PORTVERSION=	0.4.0
 CATEGORIES=	x11
-MASTER_SITES=	http://www.defora.org/os/download/download/3703/
+MASTER_SITES=	http://www.defora.org/os/download/download/4424/
 PKGNAMEPREFIX=	deforaos-
 DISTNAME=	Locker-${PORTVERSION}
 
@@ -13,20 +12,47 @@
 COMMENT=	DeforaOS desktop screensaver
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-DEPRECATED=	Depends on broken and expiring x11/deforaos-panel
-EXPIRATION_DATE=	2016-11-01
-
-LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
-		libDesktop.so:x11/deforaos-libdesktop \
-		libXss.so:x11/libXScrnSaver
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/Panel.pc:x11/deforaos-panel \
-		xsltproc:textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
-
-USE_GNOME=	gtk20
-USES=		desktop-file-utils gettext pkgconfig
+LIB_DEPENDS=	libDesktop.so:x11/deforaos-libdesktop \
+				libSystem.so:devel/deforaos-libsystem \
+				libfontconfig.so:x11-fonts/fontconfig \
+				libfreetype.so:print/freetype2 \
+				libXss.so:x11/libXScrnSaver
+
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/Panel.pc:x11/deforaos-panel
+
+USE_GNOME=	gtk20 cairo gdkpixbuf2
+USE_XORG=	x11 xext
+USES=		desktop-file-utils pkgconfig
 MAKE_ARGS+=	PREFIX=${PREFIX}
 MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
+LDFLAGS+=	-lXext
+
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+NLS_USES=		gettext
+DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
+
+post-patch:
+	${REINPLACE_CMD} 's|-Wl,-pie||g' \
+		${WRKSRC}/tests/Makefile \
+		${WRKSRC}/tools/Makefile \
+		${WRKSRC}/src/Makefile
+
+post-patch-DOCS-off:
+	${REINPLACE_CMD} 's|data doc include|data include|' \
+		${WRKSRC}/Makefile
+
+post-patch-NLS-off:
+	${REINPLACE_CMD} 's|include po src|include src|' \
+		${WRKSRC}/Makefile
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* \
+		${STAGEDIR}${PREFIX}/lib/Locker/auth/* \
+		${STAGEDIR}${PREFIX}/lib/Locker/plugins/* \
+		${STAGEDIR}${PREFIX}/lib/Locker/demos/*
 
 .include <bsd.port.mk>
Index: head/x11/deforaos-locker/distinfo
===================================================================
--- head/x11/deforaos-locker/distinfo
+++ head/x11/deforaos-locker/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Locker-0.2.1.tar.gz) = 6df132143b9efea2af85ce64dde3f8a8fb40bc041eedf441257c6f66a5e5e4a3
-SIZE (Locker-0.2.1.tar.gz) = 49812
+TIMESTAMP = 1483369725
+SHA256 (Locker-0.4.0.tar.gz) = 286aec05034add8b364a33ddc5fed72de7e7aca00d64d1ec686bb628e9e6f3b3
+SIZE (Locker-0.4.0.tar.gz) = 62105
Index: head/x11/deforaos-locker/files/patch-doc_Makefile
===================================================================
--- head/x11/deforaos-locker/files/patch-doc_Makefile
+++ head/x11/deforaos-locker/files/patch-doc_Makefile
@@ -0,0 +1,34 @@
+--- doc/Makefile.orig	2016-02-20 13:12:47 UTC
++++ doc/Makefile
+@@ -1,4 +1,4 @@
+-TARGETS	= $(OBJDIR)index.html $(OBJDIR)locker.1 $(OBJDIR)locker.html $(OBJDIR)lockerctl.1 $(OBJDIR)lockerctl.html
++TARGETS	= $(OBJDIR)locker.1 $(OBJDIR)lockerctl.1
+ OBJDIR	=
+ PREFIX	= /usr/local
+ DESTDIR	=
+@@ -27,25 +27,18 @@ $(OBJDIR)lockerctl.html: lockerctl.css.x
+ 
+ clean:
+ 	$(RM) -- $(index.html_OBJS) $(locker.1_OBJS) $(locker.html_OBJS) $(lockerctl.1_OBJS) $(lockerctl.html_OBJS)
+-	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)index.html"
+ 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)locker.1"
+-	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)locker.html"
+ 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)lockerctl.1"
+-	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)lockerctl.html"
+ 
+ distclean: clean
+ 	$(RM) -- $(TARGETS)
+ 
+ install: $(TARGETS)
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)locker.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)locker.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)lockerctl.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)lockerctl.html"
+ 
+ uninstall:
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "locker.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "locker.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "lockerctl.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "lockerctl.html"
+ 
+ .PHONY: all clean distclean install uninstall
Index: head/x11/deforaos-locker/files/patch-doc__Makefile
===================================================================
--- head/x11/deforaos-locker/files/patch-doc__Makefile
+++ head/x11/deforaos-locker/files/patch-doc__Makefile
@@ -1,18 +0,0 @@
---- ./doc/Makefile.orig	2012-10-14 18:56:53.000000000 +0200
-+++ ./doc/Makefile	2012-12-19 13:06:45.711358747 +0100
-@@ -1,4 +1,4 @@
--TARGETS	= locker.1 locker.html lockerctl.1 lockerctl.html
-+TARGETS	= locker.1 lockerctl.1
- PREFIX	= /usr/local
- DESTDIR	=
- RM	?= rm -f
-@@ -29,9 +29,7 @@
- 
- install: $(TARGETS)
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "locker.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "locker.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "lockerctl.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "lockerctl.html"
- 
- uninstall:
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "locker.1"
Index: head/x11/deforaos-locker/files/patch-locker.c.diff
===================================================================
--- head/x11/deforaos-locker/files/patch-locker.c.diff
+++ head/x11/deforaos-locker/files/patch-locker.c.diff
@@ -1,15 +0,0 @@
---- src/locker.c.orig	2013-11-03 22:28:05.640455922 +0100
-+++ src/locker.c	2013-11-03 22:30:35.005447608 +0100
-@@ -268,8 +268,10 @@
- 			GDK_WINDOW_XID(root), ScreenSaverNotifyMask);
- 	gdk_x11_register_standard_event_type(locker->display, locker->event, 1);
- 	gdk_window_add_filter(root, _locker_on_filter, locker);
--	desktop_message_register(LOCKER_CLIENT_MESSAGE, _locker_on_message,
--			locker);
-+  /* listen to desktop messages */
-+  gtk_widget_realize(locker->windows[0]);
-+  desktop_message_register(locker->windows[0], LOCKER_CLIENT_MESSAGE,
-+      _locker_on_message, locker);
- 	return locker;
- }
- 
Index: head/x11/deforaos-locker/files/patch-src_Makefile
===================================================================
--- head/x11/deforaos-locker/files/patch-src_Makefile
+++ head/x11/deforaos-locker/files/patch-src_Makefile
@@ -0,0 +1,11 @@
+--- src/Makefile.orig	2016-02-20 13:12:47 UTC
++++ src/Makefile
+@@ -30,7 +30,7 @@ subdirs:
+ 
+ locker_OBJS = $(OBJDIR)locker.o $(OBJDIR)main.o
+ locker_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags x11 xscrnsaver`
+-locker_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs x11 xscrnsaver`
++locker_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -lXext `pkg-config --libs x11 xscrnsaver`
+ 
+ $(OBJDIR)locker$(EXEEXT): $(locker_OBJS)
+ 	$(CC) -o $(OBJDIR)locker$(EXEEXT) $(locker_OBJS) $(locker_LDFLAGS)
Index: head/x11/deforaos-locker/pkg-plist
===================================================================
--- head/x11/deforaos-locker/pkg-plist
+++ head/x11/deforaos-locker/pkg-plist
@@ -7,15 +7,16 @@
 include/Desktop/Locker/plugin.h
 lib/Locker/auth/password.so
 lib/Locker/auth/slider.so
+lib/Locker/demos/colors.so
 lib/Locker/demos/gtk-demo.so
 lib/Locker/demos/logo.so
 lib/Locker/demos/xscreensaver.so
 lib/Locker/demos/xterm.so
 lib/Locker/plugins/openmoko.so
-lib/Locker/plugins/panel.so
 lib/Locker/plugins/suspend.so
 lib/Locker/plugins/systray.so
-man/man1/locker.1.gz
-man/man1/lockerctl.1.gz
-share/applications/locker-settings.desktop
-share/locale/fr/LC_MESSAGES/Locker.mo
+%%PORTDOCS%%man/man1/locker.1.gz
+%%PORTDOCS%%man/man1/lockerctl.1.gz
+share/applications/deforaos-locker-settings.desktop
+%%NLS%%share/locale/fr/LC_MESSAGES/Locker.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Locker.mo