From: Schantl Stefan <Stevee@ipfire.org>
Date: Sat, 6 Nov 2010 14:00:28 +0000 (+0100)
Subject: xorg-x11-xkb-utils: Provide more binaries.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e882664cd36ac19040a8201b16debf6df211270d;p=ipfire-3.x.git

xorg-x11-xkb-utils: Provide more binaries.

This fixes #86.
---

diff --git a/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm b/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
index 795c5f03b..80cc914d8 100644
--- a/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
+++ b/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = xorg-x11-xkb-utils
 PKG_VER        = 7.4
-PKG_REL        = 0
+PKG_REL        = 1
 
 PKG_MAINTAINER = Stefan Schantl <stefan.schantl@ipfire.org>
 PKG_GROUP      = X/Fonts
@@ -34,7 +34,8 @@ PKG_URL        = http://www.x.org/
 PKG_LICENSE    = MIT
 PKG_SUMMARY    = X.Org X11 xkb utilities.
 
-PKG_BUILD_DEPS+= bison libX11-devel libxkbfile-devel pkg-config
+PKG_BUILD_DEPS+= bison libX11-devel libXaw-devel libXt-devel libxkbfile-devel \
+	pkg-config
 
 define PKG_DESCRIPTION
 	X.Org X11 xkb utilities.
@@ -43,7 +44,11 @@ endef
 CFLAGS        += -DHAVE_STRCASECMP
 
 SRC_PACKAGES = \
-	xkbcomp-1.1.1
+	xkbcomp-1.1.1 \
+	xkbutils-1.0.3 \
+	xkbevd-1.1.1 \
+	xkbprint-1.0.1 \
+	setxkbmap-1.2.0
 
 PKG_OBJECTS += $(foreach package,$(SRC_PACKAGES),$(package).tar.bz2)
 
@@ -70,6 +75,10 @@ define MACRO_INSTALL
 
 endef
 
-STAGE_INSTALL = $(foreach package,$(SRC_PACKAGES),$(call MACRO_INSTALL,$(package)))
+define STAGE_INSTALL
+	$(foreach package,$(SRC_PACKAGES),$(call MACRO_INSTALL,$(package)))
+
+	mv $(BUILDROOT)/usr/man* $(BUILDROOT)/usr/share/man
+endef