Merge libgnomekbd3 into libgnomekbd.

Tested with XFCE [1]
Stagify while here.

Submitted by:	Joe Maloney


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18916 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 37 insertions, 194 deletions

diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 3ba48ca4a..b76263a1a 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,30 +1,34 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/libgnomekbd/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#   $MCom: ports/trunk/x11/libgnomekbd3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libgnomekbd
-PORTVERSION=	2.32.0
-PORTREVISION=	2
+PORTVERSION=	3.6.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME keyboard shared library
 
+BUILD_DEPENDS=	libxklavier>=5.2:${PORTSDIR}/x11/libxklavier
 LIB_DEPENDS=	libxklavier.so:${PORTSDIR}/x11/libxklavier
 
-CONFLICTS=	libgnomekbd-3.[0-9]*
-
-USE_BZIP2=	yes
-USE_GNOME=	gnomeprefix ltverhack gconf2
-USE_AUTOTOOLS=	libtool
+USE_XZ=		yes
+USE_GNOME=	gnomeprefix ltverhack intltool gtk30 introspection:build
+GNU_CONFIGURE=	yes
+USE_XORG=	ice
 INSTALLS_ICONS=	yes
 USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-GCONF_SCHEMAS=	desktop_gnome_peripherals_keyboard_xkb.schemas
+GLIB_SCHEMAS=	org.gnome.libgnomekbd.desktop.gschema.xml \
+		org.gnome.libgnomekbd.gschema.xml \
+		org.gnome.libgnomekbd.keyboard.gschema.xml
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnomekbd*.so.8
 
 .include <bsd.port.mk>
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index f82388af9..7e6f98afc 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/libgnomekbd-2.32.0.tar.bz2) = ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256
-SIZE (gnome2/libgnomekbd-2.32.0.tar.bz2) = 410928
+SHA256 (gnome3/libgnomekbd-3.6.0.tar.xz) = c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09
+SIZE (gnome3/libgnomekbd-3.6.0.tar.xz) = 373588
diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist
index 094f291da..e1c8a1c6b 100644
--- a/x11/libgnomekbd/pkg-plist
+++ b/x11/libgnomekbd/pkg-plist
@@ -1,29 +1,34 @@
-bin/gkbd-indicator-plugins-capplet
+bin/gkbd-keyboard-display
+include/libgnomekbd/gkbd-configuration.h
 include/libgnomekbd/gkbd-desktop-config.h
 include/libgnomekbd/gkbd-indicator-config.h
-include/libgnomekbd/gkbd-indicator-plugin.h
 include/libgnomekbd/gkbd-indicator.h
 include/libgnomekbd/gkbd-keyboard-config.h
 include/libgnomekbd/gkbd-keyboard-drawing.h
 include/libgnomekbd/gkbd-status.h
 include/libgnomekbd/gkbd-util.h
+lib/girepository-1.0/Gkbd-3.0.typelib
 lib/libgnomekbd.a
 lib/libgnomekbd.la
 lib/libgnomekbd.so
-lib/libgnomekbd.so.4
+lib/libgnomekbd.so.8
 lib/libgnomekbdui.a
 lib/libgnomekbdui.la
 lib/libgnomekbdui.so
-lib/libgnomekbdui.so.4
+lib/libgnomekbdui.so.8
 libdata/pkgconfig/libgnomekbd.pc
 libdata/pkgconfig/libgnomekbdui.pc
-share/applications/gkbd-indicator-plugins-capplet.desktop
-%%DATADIR%%/ui/gkbd-indicator-plugins.ui
-%%DATADIR%%/ui/gkbd-indicator-plugins_add.ui
+share/GConf/gsettings/libgnomekbd.convert
+share/applications/gkbd-keyboard-display.desktop
+share/gir-1.0/Gkbd-3.0.gir
+%%DATADIR%%/icons/kbdled-caps-lock.svg
+%%DATADIR%%/icons/kbdled-num-lock.svg
+%%DATADIR%%/icons/kbdled-scroll-lock.svg
 %%DATADIR%%/ui/show-layout.ui
 share/locale/ar/LC_MESSAGES/libgnomekbd.mo
 share/locale/as/LC_MESSAGES/libgnomekbd.mo
 share/locale/ast/LC_MESSAGES/libgnomekbd.mo
+share/locale/be/LC_MESSAGES/libgnomekbd.mo
 share/locale/be@latin/LC_MESSAGES/libgnomekbd.mo
 share/locale/bg/LC_MESSAGES/libgnomekbd.mo
 share/locale/bn/LC_MESSAGES/libgnomekbd.mo
@@ -35,12 +40,13 @@ share/locale/da/LC_MESSAGES/libgnomekbd.mo
 share/locale/de/LC_MESSAGES/libgnomekbd.mo
 share/locale/dz/LC_MESSAGES/libgnomekbd.mo
 share/locale/el/LC_MESSAGES/libgnomekbd.mo
-share/locale/en_GB/LC_MESSAGES/libgnomekbd.mo
 share/locale/en@shaw/LC_MESSAGES/libgnomekbd.mo
+share/locale/en_GB/LC_MESSAGES/libgnomekbd.mo
 share/locale/eo/LC_MESSAGES/libgnomekbd.mo
 share/locale/es/LC_MESSAGES/libgnomekbd.mo
 share/locale/et/LC_MESSAGES/libgnomekbd.mo
 share/locale/eu/LC_MESSAGES/libgnomekbd.mo
+share/locale/fa/LC_MESSAGES/libgnomekbd.mo
 share/locale/fi/LC_MESSAGES/libgnomekbd.mo
 share/locale/fr/LC_MESSAGES/libgnomekbd.mo
 share/locale/ga/LC_MESSAGES/libgnomekbd.mo
@@ -84,16 +90,16 @@ share/locale/ta/LC_MESSAGES/libgnomekbd.mo
 share/locale/te/LC_MESSAGES/libgnomekbd.mo
 share/locale/th/LC_MESSAGES/libgnomekbd.mo
 share/locale/tr/LC_MESSAGES/libgnomekbd.mo
+share/locale/ug/LC_MESSAGES/libgnomekbd.mo
 share/locale/uk/LC_MESSAGES/libgnomekbd.mo
 share/locale/vi/LC_MESSAGES/libgnomekbd.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomekbd.mo
 share/locale/zh_HK/LC_MESSAGES/libgnomekbd.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%
-@dirrm include/libgnomekbd
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -120,3 +126,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+@dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@dirrm include/libgnomekbd
diff --git a/x11/libgnomekbd3/Makefile b/x11/libgnomekbd3/Makefile
deleted file mode 100644
index 802d396f7..000000000
--- a/x11/libgnomekbd3/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Created by: Michael Johnson <ahze@FreeBSD.org>
-# $FreeBSD$
-#   $MCom: ports/trunk/x11/libgnomekbd3/Makefile 18610 2013-06-30 16:33:05Z marcus $
-
-PORTNAME=	libgnomekbd
-PORTVERSION=	3.6.0
-CATEGORIES=	x11 gnome
-MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome3
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME keyboard shared library
-
-BUILD_DEPENDS=	libxklavier>=5.2:${PORTSDIR}/x11/libxklavier
-LIB_DEPENDS=	xklavier:${PORTSDIR}/x11/libxklavier
-
-LATEST_LINK=	libgnomekbd3
-
-CONFLICTS=	libgnomekbd-2.[0-9]*
-
-NO_STAGE=	yes
-USE_XZ=		yes
-USE_GNOME=	gnomeprefix ltverhack intltool gtk30 introspection:build
-USE_AUTOTOOLS=	libtool
-USE_XORG=	ice
-INSTALLS_ICONS=	yes
-USES=		gettext gmake pathfix pkgconfig
-USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-GLIB_SCHEMAS=	org.gnome.libgnomekbd.desktop.gschema.xml \
-		org.gnome.libgnomekbd.gschema.xml \
-		org.gnome.libgnomekbd.keyboard.gschema.xml
-
-.include <bsd.port.mk>
diff --git a/x11/libgnomekbd3/distinfo b/x11/libgnomekbd3/distinfo
deleted file mode 100644
index 7e6f98afc..000000000
--- a/x11/libgnomekbd3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome3/libgnomekbd-3.6.0.tar.xz) = c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09
-SIZE (gnome3/libgnomekbd-3.6.0.tar.xz) = 373588
diff --git a/x11/libgnomekbd3/pkg-descr b/x11/libgnomekbd3/pkg-descr
deleted file mode 100644
index a4b625c78..000000000
--- a/x11/libgnomekbd3/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-GNOME keyboard shared library
diff --git a/x11/libgnomekbd3/pkg-plist b/x11/libgnomekbd3/pkg-plist
deleted file mode 100644
index e1c8a1c6b..000000000
--- a/x11/libgnomekbd3/pkg-plist
+++ /dev/null
@@ -1,132 +0,0 @@
-bin/gkbd-keyboard-display
-include/libgnomekbd/gkbd-configuration.h
-include/libgnomekbd/gkbd-desktop-config.h
-include/libgnomekbd/gkbd-indicator-config.h
-include/libgnomekbd/gkbd-indicator.h
-include/libgnomekbd/gkbd-keyboard-config.h
-include/libgnomekbd/gkbd-keyboard-drawing.h
-include/libgnomekbd/gkbd-status.h
-include/libgnomekbd/gkbd-util.h
-lib/girepository-1.0/Gkbd-3.0.typelib
-lib/libgnomekbd.a
-lib/libgnomekbd.la
-lib/libgnomekbd.so
-lib/libgnomekbd.so.8
-lib/libgnomekbdui.a
-lib/libgnomekbdui.la
-lib/libgnomekbdui.so
-lib/libgnomekbdui.so.8
-libdata/pkgconfig/libgnomekbd.pc
-libdata/pkgconfig/libgnomekbdui.pc
-share/GConf/gsettings/libgnomekbd.convert
-share/applications/gkbd-keyboard-display.desktop
-share/gir-1.0/Gkbd-3.0.gir
-%%DATADIR%%/icons/kbdled-caps-lock.svg
-%%DATADIR%%/icons/kbdled-num-lock.svg
-%%DATADIR%%/icons/kbdled-scroll-lock.svg
-%%DATADIR%%/ui/show-layout.ui
-share/locale/ar/LC_MESSAGES/libgnomekbd.mo
-share/locale/as/LC_MESSAGES/libgnomekbd.mo
-share/locale/ast/LC_MESSAGES/libgnomekbd.mo
-share/locale/be/LC_MESSAGES/libgnomekbd.mo
-share/locale/be@latin/LC_MESSAGES/libgnomekbd.mo
-share/locale/bg/LC_MESSAGES/libgnomekbd.mo
-share/locale/bn/LC_MESSAGES/libgnomekbd.mo
-share/locale/bn_IN/LC_MESSAGES/libgnomekbd.mo
-share/locale/ca/LC_MESSAGES/libgnomekbd.mo
-share/locale/ca@valencia/LC_MESSAGES/libgnomekbd.mo
-share/locale/cs/LC_MESSAGES/libgnomekbd.mo
-share/locale/da/LC_MESSAGES/libgnomekbd.mo
-share/locale/de/LC_MESSAGES/libgnomekbd.mo
-share/locale/dz/LC_MESSAGES/libgnomekbd.mo
-share/locale/el/LC_MESSAGES/libgnomekbd.mo
-share/locale/en@shaw/LC_MESSAGES/libgnomekbd.mo
-share/locale/en_GB/LC_MESSAGES/libgnomekbd.mo
-share/locale/eo/LC_MESSAGES/libgnomekbd.mo
-share/locale/es/LC_MESSAGES/libgnomekbd.mo
-share/locale/et/LC_MESSAGES/libgnomekbd.mo
-share/locale/eu/LC_MESSAGES/libgnomekbd.mo
-share/locale/fa/LC_MESSAGES/libgnomekbd.mo
-share/locale/fi/LC_MESSAGES/libgnomekbd.mo
-share/locale/fr/LC_MESSAGES/libgnomekbd.mo
-share/locale/ga/LC_MESSAGES/libgnomekbd.mo
-share/locale/gl/LC_MESSAGES/libgnomekbd.mo
-share/locale/gu/LC_MESSAGES/libgnomekbd.mo
-share/locale/he/LC_MESSAGES/libgnomekbd.mo
-share/locale/hi/LC_MESSAGES/libgnomekbd.mo
-share/locale/hu/LC_MESSAGES/libgnomekbd.mo
-share/locale/id/LC_MESSAGES/libgnomekbd.mo
-share/locale/it/LC_MESSAGES/libgnomekbd.mo
-share/locale/ja/LC_MESSAGES/libgnomekbd.mo
-share/locale/ka/LC_MESSAGES/libgnomekbd.mo
-share/locale/kn/LC_MESSAGES/libgnomekbd.mo
-share/locale/ko/LC_MESSAGES/libgnomekbd.mo
-share/locale/lt/LC_MESSAGES/libgnomekbd.mo
-share/locale/lv/LC_MESSAGES/libgnomekbd.mo
-share/locale/mai/LC_MESSAGES/libgnomekbd.mo
-share/locale/mk/LC_MESSAGES/libgnomekbd.mo
-share/locale/ml/LC_MESSAGES/libgnomekbd.mo
-share/locale/mr/LC_MESSAGES/libgnomekbd.mo
-share/locale/ms/LC_MESSAGES/libgnomekbd.mo
-share/locale/nb/LC_MESSAGES/libgnomekbd.mo
-share/locale/nl/LC_MESSAGES/libgnomekbd.mo
-share/locale/nn/LC_MESSAGES/libgnomekbd.mo
-share/locale/oc/LC_MESSAGES/libgnomekbd.mo
-share/locale/or/LC_MESSAGES/libgnomekbd.mo
-share/locale/pa/LC_MESSAGES/libgnomekbd.mo
-share/locale/pl/LC_MESSAGES/libgnomekbd.mo
-share/locale/pt/LC_MESSAGES/libgnomekbd.mo
-share/locale/pt_BR/LC_MESSAGES/libgnomekbd.mo
-share/locale/ro/LC_MESSAGES/libgnomekbd.mo
-share/locale/ru/LC_MESSAGES/libgnomekbd.mo
-share/locale/si/LC_MESSAGES/libgnomekbd.mo
-share/locale/sk/LC_MESSAGES/libgnomekbd.mo
-share/locale/sl/LC_MESSAGES/libgnomekbd.mo
-share/locale/sq/LC_MESSAGES/libgnomekbd.mo
-share/locale/sr/LC_MESSAGES/libgnomekbd.mo
-share/locale/sr@latin/LC_MESSAGES/libgnomekbd.mo
-share/locale/sv/LC_MESSAGES/libgnomekbd.mo
-share/locale/ta/LC_MESSAGES/libgnomekbd.mo
-share/locale/te/LC_MESSAGES/libgnomekbd.mo
-share/locale/th/LC_MESSAGES/libgnomekbd.mo
-share/locale/tr/LC_MESSAGES/libgnomekbd.mo
-share/locale/ug/LC_MESSAGES/libgnomekbd.mo
-share/locale/uk/LC_MESSAGES/libgnomekbd.mo
-share/locale/vi/LC_MESSAGES/libgnomekbd.mo
-share/locale/zh_CN/LC_MESSAGES/libgnomekbd.mo
-share/locale/zh_HK/LC_MESSAGES/libgnomekbd.mo
-share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-@dirrm include/libgnomekbd