xorg-util: Update for X11R7.0 and X11R7.1.

14 files changed, 101 insertions, 15 deletions

diff --git a/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb b/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..de3c2ee99a
--- /dev/null
+++ b/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-util-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb b/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..de3c2ee99a
--- /dev/null
+++ b/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-util-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-util/imake_X11R7.0-1.0.1.bb b/packages/xorg-util/imake_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..f6f5451846
--- /dev/null
+++ b/packages/xorg-util/imake_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-util-common.inc
+
+DESCRIPTION = "imake utility"
+
+DEPENDS += " perl xproto"
+
diff --git a/packages/xorg-util/imake_X11R7.1-1.0.2.bb b/packages/xorg-util/imake_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..f6f5451846
--- /dev/null
+++ b/packages/xorg-util/imake_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-util-common.inc
+
+DESCRIPTION = "imake utility"
+
+DEPENDS += " perl xproto"
+
diff --git a/packages/xorg-util/lndir_X11R7.0-1.0.1.bb b/packages/xorg-util/lndir_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..6738184b92
--- /dev/null
+++ b/packages/xorg-util/lndir_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-util-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto"
+
diff --git a/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb b/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..b3d52356ce
--- /dev/null
+++ b/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
+include xorg-util-common.inc
+inherit native
+
+#DESCRIPTION = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/makedepend-${PV}.tar.bz2"
+S="${WORKDIR}/makedepend-${PV}"
+
+DEPENDS += " util-macros-native xproto-native"
+
diff --git a/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb b/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..6738184b92
--- /dev/null
+++ b/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-util-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto"
+
diff --git a/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb b/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..8696ae62f8
--- /dev/null
+++ b/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "X autotools macros"
+SECTION = "x11/libs"
+LICENSE= "Xorg"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/util-macros-${PV}.tar.bz2"
+S = "${WORKDIR}/util-macros-${PV}"
+
+inherit native autotools pkgconfig
+
diff --git a/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb b/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..1506bd3cb2
--- /dev/null
+++ b/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "X autotools macros"
+SECTION = "x11/libs"
+LICENSE= "Xorg"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/util-macros-${PV}.tar.bz2"
+S = "${WORKDIR}/util-macros-${PV}"
+
+inherit native autotools pkgconfig
+
diff --git a/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb b/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb
index 6b009a7ea7..79e5dbaa08 100644
--- a/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb
+++ b/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb
@@ -1,10 +1,6 @@
-DESCRIPTION = "X autotools macros"
-SECTION = "x11/libs"
-LICENSE= "Xorg"
-#MAINTAINER = ""
+include xorg-util-common.inc
 
-XORG_PN = "${PN}"
+DESCRIPTION = "X autotools macros"
 
-include xorg-xlibs.inc
+#DEPENDS += " "
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-X11R7.0-${PV}.tar.bz2"
diff --git a/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb b/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb
index 76101b0345..79e5dbaa08 100644
--- a/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb
+++ b/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb
@@ -1,11 +1,6 @@
-DESCRIPTION = "X autotools macros"
-SECTION = "x11/libs"
-LICENSE= "Xorg"
-#MAINTAINER = ""
+include xorg-util-common.inc
 
-XORG_PN = "${PN}"
-XORG_RELEASE = "X11R7.1"
+DESCRIPTION = "X autotools macros"
 
-include xorg-xlibs.inc
+#DEPENDS += " "
 
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/${PN}-X11R7.1-${PV}.tar.bz2"
diff --git a/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb b/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..991fc05326
--- /dev/null
+++ b/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb
@@ -0,0 +1,7 @@
+include xorg-util-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+FILES_${PN} += " /usr/lib/X11/config"
diff --git a/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb b/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..991fc05326
--- /dev/null
+++ b/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb
@@ -0,0 +1,7 @@
+include xorg-util-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+FILES_${PN} += " /usr/lib/X11/config"
diff --git a/packages/xorg-util/xorg-util-common.inc b/packages/xorg-util/xorg-util-common.inc
new file mode 100644
index 0000000000..f00a29a21c
--- /dev/null
+++ b/packages/xorg-util/xorg-util-common.inc
@@ -0,0 +1,15 @@
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/utils"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+#DEPENDS = ""
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/util/${XORG_PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}