[oe-commits] Koen Kooi : xorg-app: convert to new style staging

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 7d73b5d57a8744f495a5978c598e39b869614651
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7d73b5d57a8744f495a5978c598e39b869614651

Author: Koen Kooi <koen at openembedded.org>
Date:   Thu Apr 15 14:14:56 2010 +0200

xorg-app: convert to new style staging

---

 recipes/xorg-app/mkbold-mkitalic-native_0.11.bb |   14 +++++++-------
 recipes/xorg-app/xorg-app-common.inc            |    4 ----
 recipes/xorg-app/xterm_207.bb                   |    4 ----
 recipes/xorg-app/xterm_251.bb                   |    4 ----
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/recipes/xorg-app/mkbold-mkitalic-native_0.11.bb b/recipes/xorg-app/mkbold-mkitalic-native_0.11.bb
index 407804d..45fb3a2 100644
--- a/recipes/xorg-app/mkbold-mkitalic-native_0.11.bb
+++ b/recipes/xorg-app/mkbold-mkitalic-native_0.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "mkbold-mkitalic : make bold and italic fonts from normal fonts"
 HOMEPAGE = "http://hp.vector.co.jp/authors/VA013651/freeSoftware/mkbold-mkitalic.html"
 PRIORITY = "optional"
 LICENSE = "MIT/X"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://hp.vector.co.jp/authors/VA013651/lib/mkbold-mkitalic-${PV}.tar.bz2 \
            file://makebifonts"
@@ -11,12 +11,12 @@ S = "${WORKDIR}/mkbold-mkitalic-${PV}"
 
 inherit native
 
-do_stage() {
-	install -d ${STAGING_BINDIR_NATIVE}
-	install -m 755 mkbold ${STAGING_BINDIR_NATIVE}/
-	install -m 755 mkitalic ${STAGING_BINDIR_NATIVE}/
-	install -m 755 mkbolditalic ${STAGING_BINDIR_NATIVE}/
-	install -m 755 ${WORKDIR}/makebifonts ${STAGING_BINDIR_NATIVE}/
+do_install() {
+	install -d ${D}${bindir}
+	install -m 755 mkbold ${D}${bindir}/
+	install -m 755 mkitalic ${D}${bindir}/
+	install -m 755 mkbolditalic ${D}${bindir}/
+	install -m 755 ${WORKDIR}/makebifonts ${D}${bindir}/
 }
 
 
diff --git a/recipes/xorg-app/xorg-app-common.inc b/recipes/xorg-app/xorg-app-common.inc
index 02db754..74e400f 100644
--- a/recipes/xorg-app/xorg-app-common.inc
+++ b/recipes/xorg-app/xorg-app-common.inc
@@ -12,8 +12,4 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
-do_stage() {
-        autotools_stage_all
-}
-
 FILES_${PN} += "  /usr/lib/X11/${XORG_PN}"
diff --git a/recipes/xorg-app/xterm_207.bb b/recipes/xorg-app/xterm_207.bb
index cedc3c7..2fb9c02 100644
--- a/recipes/xorg-app/xterm_207.bb
+++ b/recipes/xorg-app/xterm_207.bb
@@ -23,9 +23,5 @@ do_configure() {
 	oe_runconf
 }
 
-do_stage() {
-	autotools_stage_all
-}
-
 SRC_URI[md5sum] = "3de8a3756c284a46a08c6d0308909486"
 SRC_URI[sha256sum] = "652f579171e6e8f73c13ab6b060d2447ae35ebfbd39a6002b7c05a1dfc0f7eb8"
diff --git a/recipes/xorg-app/xterm_251.bb b/recipes/xorg-app/xterm_251.bb
index 28384d8..e7016d3 100644
--- a/recipes/xorg-app/xterm_251.bb
+++ b/recipes/xorg-app/xterm_251.bb
@@ -23,9 +23,5 @@ do_configure() {
 	oe_runconf
 }
 
-do_stage() {
-	autotools_stage_all
-}
-
 SRC_URI[md5sum] = "343a4ce213f70c53cf65979f163bebc3"
 SRC_URI[sha256sum] = "2ff9a4ae66cf9a48829023d1d007b0e84ee9cc60feb48107f9c1ea9dd7570ce7"