--- trunk/core/include/xorg.sminc	2009/10/19 08:52:58	3227
+++ trunk/include/xorg.sminc	2012/01/14 01:48:34	9880
@@ -1,4 +1,4 @@
-# $Header: /magellan-cvs/smage/include/xorg.sminc,v 1.18 2008/02/16 11:26:47 niro Exp $
+# $Id$
 # xorg global smage2 functions
 
 # must: X11_dir (defaults to /usr in sminc)
@@ -87,14 +87,14 @@
 INHERITS="${INHERITS} xorg"
 
 # pkg setup
-SRCFILE="${PNAME}-${PVER}.tar.bz2"
-SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"
+: ${SRCFILE="${PNAME}-${PVER}.tar.bz2"}
+: ${SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"}
 
 #XORG_MIRROR="http://ftp.x.org/pub"
 XORG_MIRROR="http://xorg.freedesktop.org/archive"
 
 # get the right subdir
-case ${PCATEGORIE} in
+case ${PCAT} in
 	app-doc)	URISUBDIR="doc" ;;
 	media-fonts)	URISUBDIR="font" ;;
 	x11-apps)	URISUBDIR="app" ;;
@@ -102,7 +102,8 @@
 	x11-drivers)	URISUBDIR="driver" ;;
 	x11-libs)	URISUBDIR="lib" ;;
 	x11-misc)	case ${PNAME} in
-				xbitmaps|xkbdata|xkeyboard-config) URISUBDIR="data" ;;
+				xbitmaps|xkbdata) URISUBDIR="data" ;;
+				xkeyboard-config) URISUBDIR="data/xkeyboard-config" ;;
 				*)  URISUBDIR="util" ;;
 			esac
 			;;
@@ -112,6 +113,7 @@
 esac
 
 SRC_URI=(
+	${SRC_URI[*]}
 #	${XORG_MIRROR}/individual/app/${SRCFILE}
 #	${XORG_MIRROR}/individual/data/${SRCFILE}
 #	${XORG_MIRROR}/individual/doc/${SRCFILE}
@@ -128,7 +130,7 @@
 
 # add default deps
 DEPEND="${DEPEND}
-	>= sys-apps/man-1.6"
+	>= virtual/man"
 
 SDEPEND="${SDEPEND}
 	>= dev-util/pkgconfig-0.20