--- trunk/core/include/xorg.sminc	2009/05/02 14:32:32	1335
+++ 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,29 +87,50 @@
 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 ${PCAT} in
+	app-doc)	URISUBDIR="doc" ;;
+	media-fonts)	URISUBDIR="font" ;;
+	x11-apps)	URISUBDIR="app" ;;
+	x11-base)	URISUBDIR="xserver" ;;
+	x11-drivers)	URISUBDIR="driver" ;;
+	x11-libs)	URISUBDIR="lib" ;;
+	x11-misc)	case ${PNAME} in
+				xbitmaps|xkbdata) URISUBDIR="data" ;;
+				xkeyboard-config) URISUBDIR="data/xkeyboard-config" ;;
+				*)  URISUBDIR="util" ;;
+			esac
+			;;
+	x11-proto)	URISUBDIR="proto" ;;
+	x11-themes)	URISUBDIR="data" ;;
+	x11-wm)		URISUBDIR="app" ;;
+esac
+
 SRC_URI=(
-	${XORG_MIRROR}/individual/app/${SRCFILE}
-	${XORG_MIRROR}/individual/data/${SRCFILE}
-	${XORG_MIRROR}/individual/doc/${SRCFILE}
-	${XORG_MIRROR}/individual/driver/${SRCFILE}
-	${XORG_MIRROR}/individual/font/${SRCFILE}
-	${XORG_MIRROR}/individual/lib/${SRCFILE}
-	${XORG_MIRROR}/individual/proto/${SRCFILE}
-	${XORG_MIRROR}/individual/testdir/${SRCFILE}
-	${XORG_MIRROR}/individual/util/${SRCFILE}
-	${XORG_MIRROR}/individual/xserver/${SRCFILE}
+	${SRC_URI[*]}
+#	${XORG_MIRROR}/individual/app/${SRCFILE}
+#	${XORG_MIRROR}/individual/data/${SRCFILE}
+#	${XORG_MIRROR}/individual/doc/${SRCFILE}
+#	${XORG_MIRROR}/individual/driver/${SRCFILE}
+#	${XORG_MIRROR}/individual/font/${SRCFILE}
+#	${XORG_MIRROR}/individual/lib/${SRCFILE}
+#	${XORG_MIRROR}/individual/proto/${SRCFILE}
+#	${XORG_MIRROR}/individual/testdir/${SRCFILE}
+#	${XORG_MIRROR}/individual/util/${SRCFILE}
+#	${XORG_MIRROR}/individual/xserver/${SRCFILE}
+	${XORG_MIRROR}/individual/${URISUBDIR}/${SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
 )
 
 # add default deps
 DEPEND="${DEPEND}
-	>= sys-apps/man-1.6"
+	>= virtual/man"
 
 SDEPEND="${SDEPEND}
 	>= dev-util/pkgconfig-0.20