explicit_merge of '67a7cd199ed48c512b8405c701f22fe1fd94bd17'

              and 'd4bebe8bd4a495c716a9547b0a5aabad739ab5b8'
   using ancestor ''
        to branch 'org.openembedded.dev'

9 files changed, 23 insertions, 37 deletions

diff --git a/packages/libao/libao_0.8.6.bb b/packages/libao/libao_0.8.6.bb
index 62275f14fb..a293a44270 100644
--- a/packages/libao/libao_0.8.6.bb
+++ b/packages/libao/libao_0.8.6.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "A cross platform audio library"
 HOMEPAGE = "http://www.xiph.org/ao/"
 SECTION = "libs"
 PRIORITY = "optional"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz"
 
@@ -14,13 +14,7 @@ EXTRA_OECONF = "--disable-esd --disable-esdtest \
 		--disable-arts --disable-nas"
 
 do_stage() {
-	install -d ${STAGING_INCDIR}/ao
-	install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \
-			${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/
-
-	oe_libinstall -so -C src libao ${STAGING_LIBDIR}
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/
+	autotools_stage_all
 }
 
 FILES_${PN} += "${libdir}/ao/plugins-2/*.so"
diff --git a/packages/lzo/lzo_1.08.bb b/packages/lzo/lzo_1.08.bb
index 613340308e..7986650e78 100644
--- a/packages/lzo/lzo_1.08.bb
+++ b/packages/lzo/lzo_1.08.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/"
 LICENSE = "GPLv2"
 SECTION = "libs"
 PRIORITY = "optional"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz"
 
@@ -19,18 +19,5 @@ EXTRA_OECONF = "--enable-shared"
 #}
 
 do_stage() {
-	install -m 0644 include/lzo1.h ${STAGING_INCDIR}/lzo1.h
-	install -m 0644 include/lzo16bit.h ${STAGING_INCDIR}/lzo16bit.h
-	install -m 0644 include/lzo1a.h ${STAGING_INCDIR}/lzo1a.h
-	install -m 0644 include/lzo1b.h ${STAGING_INCDIR}/lzo1b.h
-	install -m 0644 include/lzo1c.h ${STAGING_INCDIR}/lzo1c.h
-	install -m 0644 include/lzo1f.h ${STAGING_INCDIR}/lzo1f.h
-	install -m 0644 include/lzo1x.h ${STAGING_INCDIR}/lzo1x.h
-	install -m 0644 include/lzo1y.h ${STAGING_INCDIR}/lzo1y.h
-	install -m 0644 include/lzo1z.h ${STAGING_INCDIR}/lzo1z.h
-	install -m 0644 include/lzo2a.h ${STAGING_INCDIR}/lzo2a.h
-	install -m 0644 include/lzoconf.h ${STAGING_INCDIR}/lzoconf.h
-	install -m 0644 include/lzoutil.h ${STAGING_INCDIR}/lzoutil.h
-
-        oe_libinstall -a -so -C src liblzo ${STAGING_LIBDIR}
+	autotools_stage_all
 }
diff --git a/packages/nail/nail_11.21.bb b/packages/nail/nail_11.21.bb
index 3162fb50b3..a4818c286a 100644
--- a/packages/nail/nail_11.21.bb
+++ b/packages/nail/nail_11.21.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 PRIORITY = "optional"
 MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 DEPENDS = "openssl"
-PR = "r1"
+PR = "r2"
 LICENSE = "GPL"
 
 SRC_URI = "http://optusnet.dl.sourceforge.net/sourceforge/nail/nail-11.21.tar.bz2 \
@@ -15,6 +15,8 @@ inherit autotools
 
 # EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes"
 
+INHIBIT_AUTO_STAGE = "1"
+
 do_install() {
  	install -d ${D}${bindir} ${D}${mandir} ${D}${sysconfdir}
  	install -m 0755 ${S}nail ${D}${bindir}/nail
diff --git a/packages/ncftp/ncftp_3.1.9.bb b/packages/ncftp/ncftp_3.1.9.bb
index 99673d8a97..d62b0ffeae 100644
--- a/packages/ncftp/ncftp_3.1.9.bb
+++ b/packages/ncftp/ncftp_3.1.9.bb
@@ -1,3 +1,4 @@
+PR = "r1"
 DESCRIPTION = "A sophisticated console ftp client"
 SECTION = "console/network"
 PRIORITY = "optional"
@@ -11,6 +12,8 @@ do_configure_prepend () {
 	install -m 0644 ${WORKDIR}/acinclude.m4 acinclude.m4
 }
 
+INHIBIT_AUTO_STAGE = "1"
+
 do_install () {
 	install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir}
 	oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \
diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb
index a95badd85f..0e2fefc51b 100644
--- a/packages/nfs-utils/nfs-utils_1.0.6.bb
+++ b/packages/nfs-utils/nfs-utils_1.0.6.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 SECTION = "console/networking"
 MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
 	file://acinclude-lossage.patch;patch=1 \
@@ -35,6 +35,8 @@ do_compile() {
 	oe_runmake 'BUILD=1'
 }
 
+INHIBIT_AUTO_STAGE = "1"
+
 do_install() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
diff --git a/packages/openobex/openobex_1.0.1.bb b/packages/openobex/openobex_1.0.1.bb
index c3b1562e8d..fd38d372f6 100644
--- a/packages/openobex/openobex_1.0.1.bb
+++ b/packages/openobex/openobex_1.0.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "The Openobex project aims to make an \
 open source implementation of the Object Exchange \
 (OBEX) protocol."
 SECTION = "libs"
-PR = "r2"
+PR = "r3"
 
 # put openobex-config into -dev package
 FILES_${PN} = "${libdir}/lib*.so.*"
@@ -15,10 +15,5 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
 inherit autotools binconfig
 
 do_stage () {
-	oe_libinstall -so -C src libopenobex ${STAGING_LIBDIR}
-	ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.0.so
-	install -d ${STAGING_INCDIR}/openobex
-	install -m 0644 src/obex_const.h src/obex.h ${STAGING_INCDIR}/openobex/
-	install -d ${STAGING_DIR}/aclocal
-	install -m 0644 m4macros/openobex.m4 ${STAGING_DATADIR}/aclocal/
+	autotools_stage_all
 }
diff --git a/packages/popt/popt_1.7.bb b/packages/popt/popt_1.7.bb
index 41af18ed58..e599c023dc 100644
--- a/packages/popt/popt_1.7.bb
+++ b/packages/popt/popt_1.7.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 DESCRIPTION = "The popt library exists essentially \
 for parsing command line options."
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \
 	   file://m4.patch;patch=1 \
@@ -11,6 +11,5 @@ SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \
 inherit autotools 
 
 do_stage () {
-	oe_libinstall -a -so libpopt ${STAGING_LIBDIR}
-	install -m 0644 popt.h ${STAGING_INCDIR}/
+	autotools_stage_all
 }
diff --git a/packages/puppy/puppy_1.11.bb b/packages/puppy/puppy_1.11.bb
index d82b673864..89c8dc4317 100644
--- a/packages/puppy/puppy_1.11.bb
+++ b/packages/puppy/puppy_1.11.bb
@@ -4,13 +4,15 @@ PRIORITY = "optional"
 MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 HOMEPAGE = "http://sf.net/projects/puppy/"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/puppy;module=puppy;tag=PUPPY_1_11"
 S = "${WORKDIR}/puppy"
 
 inherit autotools
 
+INHIBIT_AUTO_STAGE = "1"
+
 do_install() {
 	install -d ${D}${bindir}
 	install -m 0755 ${S}/puppy ${D}${bindir}/puppy
diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb
index acfa068cac..0f208da2df 100644
--- a/packages/ssmtp/ssmtp_2.61.bb
+++ b/packages/ssmtp/ssmtp_2.61.bb
@@ -3,7 +3,7 @@ MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 DEPENDS = "openssl"
 DESCRIPTION = "Extremely simple MTA to get mail off the system to a mail hub."
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \
            file://ldflags.patch;patch=1 \
@@ -20,6 +20,8 @@ do_compile () {
 	oe_runmake 'LDFLAGS=${LDFLAGS}'
 }
 
+INHIBIT_AUTO_STAGE = "1"
+
 do_install () {
 	oe_runmake 'prefix=${D}${prefix}' 'exec_prefix=${D}${exec_prefix}' \
 		   'bindir=${D}${bindir}' 'mandir=${D}${mandir}' \