4 files changed, 40 insertions, 23 deletions

diff --git a/x11/deforaos-keyboard/Makefile b/x11/deforaos-keyboard/Makefile
index 59a2b951d37b..dabec6be3205 100644
--- a/x11/deforaos-keyboard/Makefile
+++ b/x11/deforaos-keyboard/Makefile
@@ -2,23 +2,46 @@
 # $FreeBSD$
 
 PORTNAME=	keyboard
-PORTVERSION=	0.2.1
-PORTREVISION=	3
+PORTVERSION=	0.3.1
 CATEGORIES=	x11
-MASTER_SITES=	http://www.defora.org/os/download/download/3696/
+MASTER_SITES=	http://www.defora.org/os/download/download/4453/
 PKGNAMEPREFIX=	deforaos-
 DISTNAME=	Keyboard-${PORTVERSION}
 
 MAINTAINER=	olivier@FreeBSD.org
-COMMENT=	DeforaOS desktop virtual keyboardr
+COMMENT=	DeforaOS desktop virtual keyboard
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libDesktop.so:x11/deforaos-libdesktop
+LIB_DEPENDS=	libDesktop.so:x11/deforaos-libdesktop \
+				libSystem.so:devel/deforaos-libsystem \
+				libfontconfig.so:x11-fonts/fontconfig \
+				libfreetype.so:print/freetype2
 
-USE_GNOME=	gtk20
-USES=		desktop-file-utils gettext pkgconfig
-USE_XORG=	xtst
+USE_GNOME=	gtk20 cairo gdkpixbuf2
+USES=		desktop-file-utils pkgconfig
+USE_XORG=	x11 xtst
 MAKE_ARGS+=	PREFIX=${PREFIX}
 
+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-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/keyboardctl \
+		${STAGEDIR}${PREFIX}/bin/keyboard \
+		${STAGEDIR}${PREFIX}/lib/Desktop/widget/keyboard.so
+
 .include <bsd.port.mk>
diff --git a/x11/deforaos-keyboard/distinfo b/x11/deforaos-keyboard/distinfo
index e532ff6101bb..b2383e75b169 100644
--- a/x11/deforaos-keyboard/distinfo
+++ b/x11/deforaos-keyboard/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Keyboard-0.2.1.tar.gz) = 96a2b6d1180c2d82d31a839cd616173a03529a6d795512af50cebbe3ac16bda2
-SIZE (Keyboard-0.2.1.tar.gz) = 29127
+TIMESTAMP = 1475616754
+SHA256 (Keyboard-0.3.1.tar.gz) = 259dfdaf09d5450b9f5406eaea68c1f42f762edccb8c5bfbbfc2f6dd905fa045
+SIZE (Keyboard-0.3.1.tar.gz) = 20251
diff --git a/x11/deforaos-keyboard/files/patch-keyboard.c.diff b/x11/deforaos-keyboard/files/patch-keyboard.c.diff
deleted file mode 100644
index 81cc847fad24..000000000000
--- a/x11/deforaos-keyboard/files/patch-keyboard.c.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/keyboard.c.orig	2013-10-30 12:04:38.512854430 +0100
-+++ src/keyboard.c	2013-10-30 12:04:53.198851447 +0100
-@@ -437,7 +437,7 @@
- 	keyboard_set_layout(keyboard, KLS_LETTERS);
- 	pango_font_description_free(bold);
- 	/* messages */
--	desktop_message_register(KEYBOARD_CLIENT_MESSAGE, on_keyboard_message,
-+	desktop_message_register(keyboard->window,KEYBOARD_CLIENT_MESSAGE, on_keyboard_message,
- 			keyboard);
- 	return keyboard;
- }
diff --git a/x11/deforaos-keyboard/pkg-plist b/x11/deforaos-keyboard/pkg-plist
index 1d466e2bc65a..dad4bb6baa55 100644
--- a/x11/deforaos-keyboard/pkg-plist
+++ b/x11/deforaos-keyboard/pkg-plist
@@ -1,5 +1,9 @@
 bin/keyboardctl
+lib/Desktop/widget/keyboard.so
 bin/keyboard
 include/Desktop/Keyboard.h
-share/applications/keyboard.desktop
-share/locale/fr/LC_MESSAGES/Keyboard.mo
+share/applications/deforaos-keyboard.desktop
+%%NLS%%share/locale/fr/LC_MESSAGES/Keyboard.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Keyboard.mo
+%%PORTDOCS%%share/doc/Keyboard/README.md
+