--- trunk/core/include/xorg.sminc	2009/05/02 14:32:32	1335
+++ trunk/core/include/xorg.sminc	2009/10/19 08:52:58	3227
@@ -93,17 +93,36 @@
 #XORG_MIRROR="http://ftp.x.org/pub"
 XORG_MIRROR="http://xorg.freedesktop.org/archive"
 
+# get the right subdir
+case ${PCATEGORIE} 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|xkeyboard-config) URISUBDIR="data" ;;
+				*)  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}
+#	${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}
 )