9 files changed, 26 insertions, 39 deletions

diff --git a/meta/packages/xorg-util/gccmakedep_1.0.2.bb b/meta/packages/xorg-util/gccmakedep_1.0.2.bb
index e943b70aa5..061758e01a 100644
--- a/meta/packages/xorg-util/gccmakedep_1.0.2.bb
+++ b/meta/packages/xorg-util/gccmakedep_1.0.2.bb
@@ -1,7 +1,7 @@
 require xorg-util-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
+DESCRIPTION = "create dependencies in makefiles using ’gcc -M’"
+RDEPENDS = "gcc"
 
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-util/imake_1.0.2.bb b/meta/packages/xorg-util/imake_1.0.2.bb
index 62611cc899..deeb4477a1 100644
--- a/meta/packages/xorg-util/imake_1.0.2.bb
+++ b/meta/packages/xorg-util/imake_1.0.2.bb
@@ -1,7 +1,7 @@
 require xorg-util-common.inc
 
-DESCRIPTION = "imake utility"
-
-DEPENDS += " perl xproto"
+DESCRIPTION = "C preprocessor interface to the make utility"
+RDEPENDS = "perl xproto"
 
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-util/lndir_1.0.1.bb b/meta/packages/xorg-util/lndir_1.0.1.bb
index a071d28660..34309a6487 100644
--- a/meta/packages/xorg-util/lndir_1.0.1.bb
+++ b/meta/packages/xorg-util/lndir_1.0.1.bb
@@ -1,7 +1,5 @@
 require xorg-util-common.inc
 
-#DESCRIPTION = ""
-
-DEPENDS += " xproto"
-
+DESCRIPTION = "create a shadow directory of symbolic links to another directory tree"
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-util/makedepend-native_1.0.0.bb b/meta/packages/xorg-util/makedepend-native_1.0.0.bb
index 833d2daa92..554270e6e4 100644
--- a/meta/packages/xorg-util/makedepend-native_1.0.0.bb
+++ b/meta/packages/xorg-util/makedepend-native_1.0.0.bb
@@ -1,11 +1,8 @@
 require xorg-util-common.inc
 inherit native
 
-#DESCRIPTION = ""
+DESCRIPTION = "create dependencies in makefiles"
+PR = "r1"
+PE = "1"
 
 XORG_PN = "makedepend"
-S = "${WORKDIR}/makedepend-${PV}"
-
-DEPENDS += " util-macros-native xproto-native"
-
-PE = "1"
diff --git a/meta/packages/xorg-util/makedepend_1.0.0.bb b/meta/packages/xorg-util/makedepend_1.0.0.bb
index a071d28660..3605b51d49 100644
--- a/meta/packages/xorg-util/makedepend_1.0.0.bb
+++ b/meta/packages/xorg-util/makedepend_1.0.0.bb
@@ -1,7 +1,5 @@
 require xorg-util-common.inc
 
-#DESCRIPTION = ""
-
-DEPENDS += " xproto"
-
+DESCRIPTION = "create dependencies in makefiles"
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-util/util-macros-native_1.1.5.bb b/meta/packages/xorg-util/util-macros-native_1.1.5.bb
index 2728e83e18..c327f3f54e 100644
--- a/meta/packages/xorg-util/util-macros-native_1.1.5.bb
+++ b/meta/packages/xorg-util/util-macros-native_1.1.5.bb
@@ -1,12 +1,9 @@
-DESCRIPTION = "X autotools macros"
-SECTION = "x11/libs"
-LICENSE= "Xorg"
-PE = "1"
+require util-macros_${PV}.bb
 
-SRC_URI = "${XORG_MIRROR}/individual/util/util-macros-1.1.5.tar.bz2 \
-           file://unbreak_cross_compile.patch;patch=1 "
+inherit native
 
-S = "${WORKDIR}/util-macros-1.1.5"
+PR = "r1"
 
-inherit native autotools pkgconfig
+XORG_PN = "util-macros"
 
+S = "${WORKDIR}/util-macros-1.1.5"
diff --git a/meta/packages/xorg-util/util-macros_1.1.5.bb b/meta/packages/xorg-util/util-macros_1.1.5.bb
index 7fa9a07c05..22634bffd2 100644
--- a/meta/packages/xorg-util/util-macros_1.1.5.bb
+++ b/meta/packages/xorg-util/util-macros_1.1.5.bb
@@ -1,10 +1,7 @@
 require xorg-util-common.inc
 
 DESCRIPTION = "X autotools macros"
-
+PR = "r1"
 PE = "1"
 
-SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz \
-           file://unbreak_cross_compile.patch;patch=1 "
-S = "${WORKDIR}/${XORG_PN}-1.1.5"
-
+SRC_URI += "file://unbreak_cross_compile.patch;patch=1"
diff --git a/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb b/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb
index c0a3974d26..7c3fb8d7e9 100644
--- a/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb
+++ b/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb
@@ -1,8 +1,8 @@
 require xorg-util-common.inc
 
-#DESCRIPTION = ""
+DESCRIPTION = "X Window System CF files"
 
-#DEPENDS += " "
+PR = "r1"
 PE = "1"
 
 FILES_${PN} += " /usr/lib/X11/config"
diff --git a/meta/packages/xorg-util/xorg-util-common.inc b/meta/packages/xorg-util/xorg-util-common.inc
index 4dc547f105..56aae30725 100644
--- a/meta/packages/xorg-util/xorg-util-common.inc
+++ b/meta/packages/xorg-util/xorg-util-common.inc
@@ -2,14 +2,14 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/utils"
 LICENSE = "MIT-X"
 
-#DEPENDS = ""
 XORG_PN = "${PN}"
-XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}"
-SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/util/${XORG_PN}-${PV}.tar.gz"
+
+SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz"
+
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
 do_stage() {
-        autotools_stage_all
+        autotools_stage_all
 }