Package DeforaOS Keyboard 0.3.0

This release brings:
- support for the newest API from libDesktop
- generic keyboard widget for libDesktop
- improved support for Gtk+ 3
- early translation to Spanish
- no more conflicts with x11/gnome-control-center

5 files changed, 18 insertions, 37 deletions

diff --git a/x11/deforaos-keyboard/Makefile b/x11/deforaos-keyboard/Makefile
index 9488a8488a6..8325c61e100 100644
--- a/x11/deforaos-keyboard/Makefile
+++ b/x11/deforaos-keyboard/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2015/08/09 15:20:41 khorben Exp $
+# $NetBSD: Makefile,v 1.12 2016/03/12 02:22:08 khorben Exp $
 #
 
-DISTNAME=	Keyboard-0.2.1
-PKGNAME=	deforaos-keyboard-0.2.1
-PKGREVISION=	10
+DISTNAME=	Keyboard-0.3.0
+PKGNAME=	deforaos-keyboard-0.3.0
 CATEGORIES=	x11
-MASTER_SITES=	http://www.defora.org/os/download/download/3696/
+MASTER_SITES=	http://www.defora.org/os/download/download/4436/
 
 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	http://www.defora.org/
@@ -13,16 +12,14 @@ COMMENT=	DeforaOS desktop virtual keyboard
 
 LICENSE=	gnu-gpl-v3
 
-CONFLICTS+=	gnome-control-center>=2.20.1{,nb*}
-
 USE_TOOLS+=	pkg-config
 USE_TOOLS+=	xgettext
 
 MAKE_FLAGS+=	DESTDIR=${DESTDIR}
 MAKE_FLAGS+=	PREFIX=${PREFIX}
 MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
 
 .include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/deforaos-libdesktop/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/deforaos-keyboard/PLIST b/x11/deforaos-keyboard/PLIST
index fb515078625..6ea804ef741 100644
--- a/x11/deforaos-keyboard/PLIST
+++ b/x11/deforaos-keyboard/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2012/12/17 00:27:52 khorben Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/03/12 02:22:08 khorben Exp $
 bin/keyboard
 bin/keyboardctl
 include/Desktop/Keyboard.h
-share/applications/keyboard.desktop
+lib/Desktop/widget/keyboard.so
+share/applications/deforaos-keyboard.desktop
+share/locale/es/LC_MESSAGES/Keyboard.mo
 share/locale/fr/LC_MESSAGES/Keyboard.mo
diff --git a/x11/deforaos-keyboard/buildlink3.mk b/x11/deforaos-keyboard/buildlink3.mk
index 05452a68d0c..5f864eb7a54 100644
--- a/x11/deforaos-keyboard/buildlink3.mk
+++ b/x11/deforaos-keyboard/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2015/04/25 14:25:03 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2016/03/12 02:22:08 khorben Exp $
 #
 
 BUILDLINK_TREE+=	deforaos-keyboard
@@ -6,11 +6,11 @@ BUILDLINK_TREE+=	deforaos-keyboard
 .if !defined(DEFORAOS_KEYBOARD_BUILDLINK3_MK)
 DEFORAOS_KEYBOARD_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.deforaos-keyboard+=	deforaos-keyboard>=0.0.2
-BUILDLINK_ABI_DEPENDS.deforaos-keyboard?=	deforaos-keyboard>=0.2.1nb10
+BUILDLINK_API_DEPENDS.deforaos-keyboard+=	deforaos-keyboard>=0.3.0
+BUILDLINK_ABI_DEPENDS.deforaos-keyboard?=	deforaos-keyboard>=0.3.0
 BUILDLINK_PKGSRCDIR.deforaos-keyboard?=	../../x11/deforaos-keyboard
 
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/deforaos-libdesktop/buildlink3.mk"
 .endif	# DEFORAOS_KEYBOARD_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-deforaos-keyboard
diff --git a/x11/deforaos-keyboard/distinfo b/x11/deforaos-keyboard/distinfo
index 827c2a3ad66..a1541e7b386 100644
--- a/x11/deforaos-keyboard/distinfo
+++ b/x11/deforaos-keyboard/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 03:28:27 agc Exp $
+$NetBSD: distinfo,v 1.4 2016/03/12 02:22:08 khorben Exp $
 
-SHA1 (Keyboard-0.2.1.tar.gz) = f852d01c172fd7bebb9f73b6709050b7ed8d7526
-RMD160 (Keyboard-0.2.1.tar.gz) = 9f3206cc67b7e68ad81aebb767ca258bbe8853ca
-SHA512 (Keyboard-0.2.1.tar.gz) = 603226094905ce6c48d6644e4c584d5cf3bdc641b21d0d5ad06e83bb7d2f1fd29359d3818a8694f51ffcd40f1d5c512d9ded1d284de340c00e8166cccacca63e
-Size (Keyboard-0.2.1.tar.gz) = 29127 bytes
-SHA1 (patch-src_keyboard.c) = ffc100bea3bd5d6dd643bf19d41567011d988e87
+SHA1 (Keyboard-0.3.0.tar.gz) = 5f8a3d9d32594046e5a6856e0b696edf67ed6c92
+RMD160 (Keyboard-0.3.0.tar.gz) = f9578c491a1ee3c1abb8f7c5318491fadca5db1f
+SHA512 (Keyboard-0.3.0.tar.gz) = d0289193f130324473482ee8e20e253ec3633bb612f8ed9e447b6aaf03910bbad50c14d504c194fc56cc0ff57f4167bda6ee2ed550aa3c277ae4da5c8b8aafbc
+Size (Keyboard-0.3.0.tar.gz) = 31145 bytes
diff --git a/x11/deforaos-keyboard/patches/patch-src_keyboard.c b/x11/deforaos-keyboard/patches/patch-src_keyboard.c
deleted file mode 100644
index 9170df31cfc..00000000000
--- a/x11/deforaos-keyboard/patches/patch-src_keyboard.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_keyboard.c,v 1.1 2013/06/15 12:27:47 khorben Exp $
-
-API change in libDesktop 0.0.10
-
---- src/keyboard.c.orig	2012-09-22 01:07:48.000000000 +0000
-+++ src/keyboard.c
-@@ -437,8 +437,8 @@ Keyboard * keyboard_new(KeyboardPrefs * 
- 	keyboard_set_layout(keyboard, KLS_LETTERS);
- 	pango_font_description_free(bold);
- 	/* messages */
--	desktop_message_register(KEYBOARD_CLIENT_MESSAGE, on_keyboard_message,
--			keyboard);
-+	desktop_message_register(keyboard->window, KEYBOARD_CLIENT_MESSAGE,
-+			on_keyboard_message, keyboard);
- 	return keyboard;
- }
-