From c0dfd29a30c9745a6616157b2c8fff0de40277d7 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Mon, 5 Mar 2007 00:32:10 +0000
Subject: [PATCH] Clifford Wolf: 	Added some descriptions to xorga
 packages 	Change xorg-update.sh script to be less agressive 	Added
 CORE flag to almost all xorg package 	(Crystal is DVD based already anyways)

diff -ruN package/xorg/appres/appres.desc package/xorg/appres/appres.desc

[2007020321063476050] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8231 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/xorg/appres/appres.desc               |   1 +
 package/xorg/beforelight/beforelight.desc     |   1 +
 package/xorg/editres/editres.desc             |   1 +
 .../font-arabic-misc/font-arabic-misc.desc    |   1 +
 .../font-cronyx-cyrillic.desc                 |   1 +
 .../font-daewoo-misc/font-daewoo-misc.desc    |   1 +
 package/xorg/font-dec-misc/font-dec-misc.desc |   1 +
 .../xorg/font-ibm-type1/font-ibm-type1.desc   |   1 +
 package/xorg/font-jis-misc/font-jis-misc.desc |   1 +
 .../xorg/font-micro-misc/font-micro-misc.desc |   1 +
 .../font-misc-cyrillic.desc                   |   1 +
 .../font-misc-ethiopic.desc                   |   1 +
 .../font-misc-meltho/font-misc-meltho.desc    |   1 +
 .../font-screen-cyrillic.desc                 |   1 +
 package/xorg/font-sun-misc/font-sun-misc.desc |   1 +
 .../font-winitzki-cyrillic.desc               |   1 +
 package/xorg/lbxproxy/lbxproxy.desc           |   1 +
 package/xorg/listres/listres.desc             |   1 +
 package/xorg/proxymngr/proxymngr.desc         |   1 +
 package/xorg/rstart/rstart.desc               |   1 +
 package/xorg/viewres/viewres.desc             |   1 +
 package/xorg/x11perf/x11perf.desc             |   1 +
 package/xorg/xbiff/xbiff.desc                 |   1 +
 package/xorg/xcalc/xcalc.desc                 |   1 +
 package/xorg/xclipboard/xclipboard.desc       |   1 +
 package/xorg/xclock/xclock.desc               |   1 +
 package/xorg/xconsole/xconsole.desc           |   1 +
 package/xorg/xedit/xedit.desc                 |   1 +
 package/xorg/xeyes/xeyes.desc                 |   1 +
 package/xorg/xfindproxy/xfindproxy.desc       |   1 +
 package/xorg/xfs/xfs.desc                     |   1 +
 package/xorg/xload/xload.desc                 |   1 +
 package/xorg/xlogo/xlogo.desc                 |   1 +
 package/xorg/xmag/xmag.desc                   |   1 +
 package/xorg/xman/xman.desc                   |   1 +
 package/xorg/xmh/xmh.desc                     |   1 +
 package/xorg/xmore/xmore.desc                 |   1 +
 package/xorg/xorg-update.sh                   | 123 ++++++------------
 package/xorg/xphelloworld/xphelloworld.desc   |   4 +
 package/xorg/xrx/xrx.desc                     |   1 +
 package/xorg/xsm/xsm.desc                     |  10 ++
 package/xorg/xwd/xwd.desc                     |   1 +
 package/xorg/xwud/xwud.desc                   |   1 +
 43 files changed, 93 insertions(+), 84 deletions(-)

diff --git a/package/xorg/appres/appres.desc b/package/xorg/appres/appres.desc
index e054af79b..b5d1b4c5d 100644
--- a/package/xorg/appres/appres.desc
+++ b/package/xorg/appres/appres.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/beforelight/beforelight.desc b/package/xorg/beforelight/beforelight.desc
index 568eb49dc..c85387fde 100644
--- a/package/xorg/beforelight/beforelight.desc
+++ b/package/xorg/beforelight/beforelight.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/editres/editres.desc b/package/xorg/editres/editres.desc
index 9b0abf7e3..3c76e7c88 100644
--- a/package/xorg/editres/editres.desc
+++ b/package/xorg/editres/editres.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/font-arabic-misc/font-arabic-misc.desc b/package/xorg/font-arabic-misc/font-arabic-misc.desc
index ab347461b..143441f33 100644
--- a/package/xorg/font-arabic-misc/font-arabic-misc.desc
+++ b/package/xorg/font-arabic-misc/font-arabic-misc.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11 extra/font
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/font-cronyx-cyrillic/font-cronyx-cyrillic.desc b/package/xorg/font-cronyx-cyrillic/font-cronyx-cyrillic.desc
index 90603b197..d45327522 100644
--- a/package/xorg/font-cronyx-cyrillic/font-cronyx-cyrillic.desc
+++ b/package/xorg/font-cronyx-cyrillic/font-cronyx-cyrillic.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11 extra/font
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/font-daewoo-misc/font-daewoo-misc.desc b/package/xorg/font-daewoo-misc/font-daewoo-misc.desc
index 808dd576b..97513ecaa 100644
--- a/package/xorg/font-daewoo-misc/font-daewoo-misc.desc
+++ b/package/xorg/font-daewoo-misc/font-daewoo-misc.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11 extra/font
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/font-dec-misc/font-dec-misc.desc b/package/xorg/font-dec-misc/font-dec-misc.desc
index 3fcd93407..8e7f2795d 100644
--- a/package/xorg/font-dec-misc/font-dec-misc.desc
+++ b/package/xorg/font-dec-misc/font-dec-misc.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11 extra/font
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/font-ibm-type1/font-ibm-type1.desc b/package/xorg/font-ibm-type1/font-ibm-type1.desc
index fcbdbb8ef..4f6a122ca 100644
--- a/package/xorg/font-ibm-type1/font-ibm-type1.desc
+++ b/package/xorg/font-ibm-type1/font-ibm-type1.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11 extra/font
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/font-jis-misc/font-jis-misc.desc b/package/xorg/font-jis-misc/font-jis-misc.desc
index 60238d8f5..859799a7c 100644
--- a/package/xorg/font-jis-misc/font-jis-misc.desc
+++ b/package/xorg/font-jis-misc/font-jis-misc.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11 extra/font
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/font-micro-misc/font-micro-misc.desc b/package/xorg/font-micro-misc/font-micro-misc.desc
index 85de7760a..7800656f9 100644
--- a/package/xorg/font-micro-misc/font-micro-misc.desc
+++ b/package/xorg/font-micro-misc/font-micro-misc.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11 extra/font
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/font-misc-cyrillic/font-misc-cyrillic.desc b/package/xorg/font-misc-cyrillic/font-misc-cyrillic.desc
index 9e22888bf..f341aa4a5 100644
--- a/package/xorg/font-misc-cyrillic/font-misc-cyrillic.desc
+++ b/package/xorg/font-misc-cyrillic/font-misc-cyrillic.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11 extra/font
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/font-misc-ethiopic/font-misc-ethiopic.desc b/package/xorg/font-misc-ethiopic/font-misc-ethiopic.desc
index ce6f299d5..e026d3884 100644
--- a/package/xorg/font-misc-ethiopic/font-misc-ethiopic.desc
+++ b/package/xorg/font-misc-ethiopic/font-misc-ethiopic.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11 extra/font
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/font-misc-meltho/font-misc-meltho.desc b/package/xorg/font-misc-meltho/font-misc-meltho.desc
index e187350b8..95907dd25 100644
--- a/package/xorg/font-misc-meltho/font-misc-meltho.desc
+++ b/package/xorg/font-misc-meltho/font-misc-meltho.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11 extra/font
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/font-screen-cyrillic/font-screen-cyrillic.desc b/package/xorg/font-screen-cyrillic/font-screen-cyrillic.desc
index a4404dcb8..5d668bdd7 100644
--- a/package/xorg/font-screen-cyrillic/font-screen-cyrillic.desc
+++ b/package/xorg/font-screen-cyrillic/font-screen-cyrillic.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11 extra/font
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/font-sun-misc/font-sun-misc.desc b/package/xorg/font-sun-misc/font-sun-misc.desc
index e1599c1ae..2107f4312 100644
--- a/package/xorg/font-sun-misc/font-sun-misc.desc
+++ b/package/xorg/font-sun-misc/font-sun-misc.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11 extra/font
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/font-winitzki-cyrillic/font-winitzki-cyrillic.desc b/package/xorg/font-winitzki-cyrillic/font-winitzki-cyrillic.desc
index 13b580530..018b730f7 100644
--- a/package/xorg/font-winitzki-cyrillic/font-winitzki-cyrillic.desc
+++ b/package/xorg/font-winitzki-cyrillic/font-winitzki-cyrillic.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11 extra/font
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/lbxproxy/lbxproxy.desc b/package/xorg/lbxproxy/lbxproxy.desc
index e336aed00..f07ff3301 100644
--- a/package/xorg/lbxproxy/lbxproxy.desc
+++ b/package/xorg/lbxproxy/lbxproxy.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/listres/listres.desc b/package/xorg/listres/listres.desc
index 11cd1fd4e..34c98e129 100644
--- a/package/xorg/listres/listres.desc
+++ b/package/xorg/listres/listres.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/proxymngr/proxymngr.desc b/package/xorg/proxymngr/proxymngr.desc
index 28d21d11d..72c729434 100644
--- a/package/xorg/proxymngr/proxymngr.desc
+++ b/package/xorg/proxymngr/proxymngr.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/rstart/rstart.desc b/package/xorg/rstart/rstart.desc
index 0bf1f1641..89f18fe3a 100644
--- a/package/xorg/rstart/rstart.desc
+++ b/package/xorg/rstart/rstart.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/viewres/viewres.desc b/package/xorg/viewres/viewres.desc
index 4d006b2d2..c8c98ca2f 100644
--- a/package/xorg/viewres/viewres.desc
+++ b/package/xorg/viewres/viewres.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/x11perf/x11perf.desc b/package/xorg/x11perf/x11perf.desc
index 09d18062e..aafcc3216 100644
--- a/package/xorg/x11perf/x11perf.desc
+++ b/package/xorg/x11perf/x11perf.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xbiff/xbiff.desc b/package/xorg/xbiff/xbiff.desc
index c7d9810e9..bf87eb9f1 100644
--- a/package/xorg/xbiff/xbiff.desc
+++ b/package/xorg/xbiff/xbiff.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xcalc/xcalc.desc b/package/xorg/xcalc/xcalc.desc
index a7506ff9d..ed92a72ab 100644
--- a/package/xorg/xcalc/xcalc.desc
+++ b/package/xorg/xcalc/xcalc.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xclipboard/xclipboard.desc b/package/xorg/xclipboard/xclipboard.desc
index 62b2950a7..8dd14fd79 100644
--- a/package/xorg/xclipboard/xclipboard.desc
+++ b/package/xorg/xclipboard/xclipboard.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xclock/xclock.desc b/package/xorg/xclock/xclock.desc
index fec340953..faf03651d 100644
--- a/package/xorg/xclock/xclock.desc
+++ b/package/xorg/xclock/xclock.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xconsole/xconsole.desc b/package/xorg/xconsole/xconsole.desc
index 82776dcb9..6491aadb7 100644
--- a/package/xorg/xconsole/xconsole.desc
+++ b/package/xorg/xconsole/xconsole.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xedit/xedit.desc b/package/xorg/xedit/xedit.desc
index 9f67c5c88..7142a0593 100644
--- a/package/xorg/xedit/xedit.desc
+++ b/package/xorg/xedit/xedit.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xeyes/xeyes.desc b/package/xorg/xeyes/xeyes.desc
index c2f9139fd..32d8ce65f 100644
--- a/package/xorg/xeyes/xeyes.desc
+++ b/package/xorg/xeyes/xeyes.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xfindproxy/xfindproxy.desc b/package/xorg/xfindproxy/xfindproxy.desc
index 46e38e0c3..6e88b3904 100644
--- a/package/xorg/xfindproxy/xfindproxy.desc
+++ b/package/xorg/xfindproxy/xfindproxy.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xfs/xfs.desc b/package/xorg/xfs/xfs.desc
index 454b13088..18fe68563 100644
--- a/package/xorg/xfs/xfs.desc
+++ b/package/xorg/xfs/xfs.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xload/xload.desc b/package/xorg/xload/xload.desc
index d86fc423e..1aded6700 100644
--- a/package/xorg/xload/xload.desc
+++ b/package/xorg/xload/xload.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xlogo/xlogo.desc b/package/xorg/xlogo/xlogo.desc
index 2e64f6dd8..141c97019 100644
--- a/package/xorg/xlogo/xlogo.desc
+++ b/package/xorg/xlogo/xlogo.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xmag/xmag.desc b/package/xorg/xmag/xmag.desc
index 09c4bac4f..37d8f98ee 100644
--- a/package/xorg/xmag/xmag.desc
+++ b/package/xorg/xmag/xmag.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xman/xman.desc b/package/xorg/xman/xman.desc
index 3f2882837..2ef6205e9 100644
--- a/package/xorg/xman/xman.desc
+++ b/package/xorg/xman/xman.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xmh/xmh.desc b/package/xorg/xmh/xmh.desc
index 885af8976..2938fe47e 100644
--- a/package/xorg/xmh/xmh.desc
+++ b/package/xorg/xmh/xmh.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xmore/xmore.desc b/package/xorg/xmore/xmore.desc
index 5fff792c2..76dfd2af8 100644
--- a/package/xorg/xmore/xmore.desc
+++ b/package/xorg/xmore/xmore.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xorg-update.sh b/package/xorg/xorg-update.sh
index 134699a6a..c4932636a 100644
--- a/package/xorg/xorg-update.sh
+++ b/package/xorg/xorg-update.sh
@@ -1,100 +1,55 @@
 #!/bin/bash
+#
+# Usage:
+# cd package/xorg && bash xorg-update.sh X11R7.1
 
-update=0
-[ "$2" == "-update" ] && update=1
+xver="$1"
+URL="ftp://ftp.gwdg.de/pub/x11/x.org/pub/$xver/src"
 
-xver="$1" # e.g. X11R7.1
-URL="ftp://ftp.gwdg.de/pub/x11/x.org/pub/$xver/src/"
+module_list=""
 
-top_prio="110.800"
-
-prio_to_num() {
-	echo ${1/.}
-}
-num_to_prio() {
-	echo "${1:0:3}.${1:3:3}"
-}
-prio_plus() {
-	num_to_prio $(( `prio_to_num $top_prio` + $1 ))
-}
-
-curl -l "$URL" |
-while read N ; do 
+while read N
+do
 	N="${N%?}"
+	[ "$N" == "update" ] && continue
+	[ "$N" == "deprecated" ] && continue
 	[ "$N" == "everything" ] && continue
-	echo "$URL$N/"
-	curl -l "$URL$N/" | 
-	while read P ; do 
+
+	echo "Checking $URL/$N/ .."
+
+	while read P
+	do 
 		P="${P%?}"
 		[[ "$P" = *bz2 ]] || continue
-		P="${P%.tar.bz2}"
-		pname="${P%%-$xver-*}"
-		lowpname="`echo $pname | tr '[A-Z]' '[a-z]'`"
-		pver="${P##*-$xver-}"
 
-		if [ "$update" = 0 ] ; then
-			rm -rf package/xorg/"$lowpname"
-			misc/archive/newpackage.sh package/xorg/"$lowpname" "$URL$N/$P.tar.bz2"
+		pname="`echo $P | tr '[A-Z]' '[a-z]'`"
+		pname="${pname%.tar.bz2}"
+		pver="${pname#*-x11r*-}"
+		pname="${pname%-x11r*}"
 
-			case "$lowpname" in
-			util-macros) 		delta=0 ;;
-			xorg-sgml-doctools) delta=1 ;;
-			xorg-docs) 		delta=2 ;;
-			*proto*|evieext)	delta=3 ;;
-			xtrans) 		delta=4 ;;
-			libxau) 		delta=5 ;;
-			libxdmcp) 		delta=6 ;;
-			libx11) 		delta=8 ;;
-			libxext) 		delta=10 ;;
-			libapplewm|libwindowswm|libdmx|libfontenc)
-						delta=12 ;;
-			libfs|libice|liblbxutil|liboldx)
-						delta=14 ;;
-			libsm)			delta=16 ;;
-			libxt)			delta=18 ;;
-			libxmu|libxpm)		delta=20 ;;
-			libxp|libxaw|libxfixes)	delta=22 ;;
-			libxrender)		delta=23 ;;
-			libxcomposite|libxdamage|libxcursor|libxevie|`
-			`libxfont|libxfontcache|libxft|libxi|libxinerama|libxkbfile|libxkbui)
-						delta=24 ;;
-			libxprintutil)		delta=25 ;;
-			libxprintapputil|libxrandr|libxres|libxscrnsaver|libxtrap|`
-			`libxtst|libxv|libxvmc|libxxf86dga|libxxf86misc|libxxf86vm)
-						delta=26 ;;
-			xbitmaps)		delta=28 ;;
-			# alls apps are delta=30, see below.
-			xorg-server) 		delta=32 ;;
-			xf86-input*) 		delta=34 ;;
-			xf86-video*) 		delta=36 ;;
-			xcursor-themes|xkbdata)	delta=50 ;;
-			font-util)		delta=55 ;;
-			font-*)			delta=60 ;;
-			xorg-cf-files|imake|makedepend|gccmakedep|lndir)
-						delta=70 ;;
-			*)			delta=99 ;;
-			esac
-			[ "$N" == "app" ] && delta=30 
+		if [ ! -f "$pname/$pname.desc" ]; then
+			echo "Not found: $pname/$pname.desc ($N) [$lowxver]"
+		else
+			if ! egrep -q "^\[V\] $pver( |\$)" "$pname/$pname.desc"; then
+				sed -i -e"s,\[V\].*,[V] $pver," "$pname/$pname.desc"
+			fi
+			if ! egrep -q "^\[D\] .* $P " "$pname/$pname.desc"; then
+				sed -i -e"s,\[D\].*,\[D\] 0 $P $URL/$N," "$pname/$pname.desc"
+			fi
 		fi
 
-		sed -i -e"s,\[V\].*,\[V\] $pver," package/xorg/"$lowpname"/"$lowpname".desc
+		module_list="$module_list $pname"
 
-		if [ "$update" = 0 ] ; then		
-		sed -i -e"s,\[P\] \(.*\) ...\....,\[P\] \1 `prio_plus $delta`," package/xorg/"$lowpname"/"$lowpname".desc
-		sed -i -e"s,\[U\].*,\[U\] http://www.x.org," package/xorg/"$lowpname"/"$lowpname".desc
-		sed -i -e"s,\[S\].*,\[S\] Stable," package/xorg/"$lowpname"/"$lowpname".desc
-		sed -i -e"s,\[L\].*,\[L\] OpenSource," package/xorg/"$lowpname"/"$lowpname".desc
-		sed -i -e"s,\[I\].*,\[I\] X.Org X11 $pname component," package/xorg/"$lowpname"/"$lowpname".desc
-		sed -i -e"s,\[C\].*,\[C\] base/x11\n\[F\] CORE," package/xorg/"$lowpname"/"$lowpname".desc
-		sed -i -e"s:\[T\].*:\[T\] The $pname component for the X.Org Foundation X11 Release 7 and above.:" package/xorg/"$lowpname"/"$lowpname".desc
-		sed -i -e"s:\[A\].*:\[A\] The X.Org Foundation {The X.Org Sourcecode}\n[A] The Open Group X Project Team {Original Sourcecode}:" package/xorg/"$lowpname"/"$lowpname".desc
-		else
-			sed -i -e"s,\[D\].*,\[D\] 0 $P.tar.bz2 $URL$N," package/xorg/"$lowpname"/"$lowpname".desc
-		fi
+	done < <( curl -s -S -l "$URL/$N/"; )
+done < <( curl -s -S -l "$URL/"; )
 
-		uniq -c package/xorg/"$lowpname"/"$lowpname".desc | cut -f8- -d" " > tmp.desc
-		mv tmp.desc package/xorg/"$lowpname"/"$lowpname".desc
+for pkg in *
+do
+	[ -d "$pkg" ] || continue
+	[ "$pkg" = "mesalib" ] && continue
 
-		echo '. "$base/package/xorg/xorg_config.sh"' > package/xorg/"$lowpname/$lowpname.conf"
-	done
+	if grep -qv " $pkg " <( echo "$module_list "; ); then
+		echo "Not found on FTP server: $pkg"
+	fi
 done
+
diff --git a/package/xorg/xphelloworld/xphelloworld.desc b/package/xorg/xphelloworld/xphelloworld.desc
index 2f2605419..aca0561b5 100644
--- a/package/xorg/xphelloworld/xphelloworld.desc
+++ b/package/xorg/xphelloworld/xphelloworld.desc
@@ -24,6 +24,9 @@
 [I] X.Org X11 xphelloworld component
 
 [T] The xphelloworld component for the X.Org Foundation X11 Release 7 and above.
+[T]
+[T] xphelloworld  is a utility for Xprint, the printing system for the
+[T] X Window system. It sends a test page to a printer.
 
 [U] http://www.x.org
 
@@ -32,6 +35,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+# Not flagging as CORE because it needs some other non-core packages
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xrx/xrx.desc b/package/xorg/xrx/xrx.desc
index 8dcbda0ce..7247242ec 100644
--- a/package/xorg/xrx/xrx.desc
+++ b/package/xorg/xrx/xrx.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xsm/xsm.desc b/package/xorg/xsm/xsm.desc
index 2af1d2ee1..3a955b425 100644
--- a/package/xorg/xsm/xsm.desc
+++ b/package/xorg/xsm/xsm.desc
@@ -24,6 +24,15 @@
 [I] X.Org X11 xsm component
 
 [T] The xsm component for the X.Org Foundation X11 Release 7 and above.
+[T]
+[T] xsm is a session manager. A session is a group of applications, each
+[T] of which has a particular state. xsm allows you to create arbitrary
+[T] sessions - for example, you might have a "light" session, a "development"
+[T] session, or an "xterminal" session. Each session can have its own set of
+[T] applications. Within a session, you can perform a "checkpoint" to save
+[T] application state, or a "shutdown" to save state and exit the session.
+[T] When you log back in to the system, you can load a specific session, and
+[T] you can delete sessions you no longer want to keep.
 
 [U] http://www.x.org
 
@@ -32,6 +41,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+# Not flagging as CORE because it needs some other non-core packages
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xwd/xwd.desc b/package/xorg/xwd/xwd.desc
index 1fe411b29..650f17add 100644
--- a/package/xorg/xwd/xwd.desc
+++ b/package/xorg/xwd/xwd.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable
diff --git a/package/xorg/xwud/xwud.desc b/package/xorg/xwud/xwud.desc
index d92e0dbc1..47eec38f0 100644
--- a/package/xorg/xwud/xwud.desc
+++ b/package/xorg/xwud/xwud.desc
@@ -32,6 +32,7 @@
 [M] The ROCK Linux Project
 
 [C] base/x11
+[F] CORE
 
 [L] OpenSource
 [S] Stable