packages: sync remainder with .dev (mainly s/include/require/)

33 files changed, 109 insertions, 74 deletions

diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb
index f4322e06f1..34422da237 100644
--- a/packages/angstrom/angstrom-version.bb
+++ b/packages/angstrom/angstrom-version.bb
@@ -1,4 +1,4 @@
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PV = ${DISTRO_VERSION}
 
 do_compile() {
diff --git a/packages/autoconf/autoconf-2.59/sizeof_types.patch b/packages/autoconf/autoconf-2.59/sizeof_types.patch
index 9a6e47453e..30fd5c1926 100644
--- a/packages/autoconf/autoconf-2.59/sizeof_types.patch
+++ b/packages/autoconf/autoconf-2.59/sizeof_types.patch
@@ -3,15 +3,38 @@
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
 #
 
---- autoconf-2.59/lib/autoconf/types.m4~sizeof_types.patch	2003-05-22 08:05:14.000000000 -0400
-+++ autoconf-2.59/lib/autoconf/types.m4	2004-05-29 01:31:24.828295015 -0400
-@@ -380,32 +380,38 @@
+Index: autoconf-2.59/lib/autoconf/types.m4
+===================================================================
+--- autoconf-2.59.orig/lib/autoconf/types.m4	2003-05-22 14:05:14.000000000 +0200
++++ autoconf-2.59/lib/autoconf/types.m4	2006-08-06 02:05:02.000000000 +0200
+@@ -380,26 +380,66 @@
  # Generic checks.  #
  # ---------------- #
  
++# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60
++# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH )
++# ------------------------------------------------------------------------
++# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.)
++AC_DEFUN([AC_CHECK_TARGET_TOOL],
++[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl
++AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4])
++if test -z "$ac_cv_prog_$1"; then
++  if test "$build" = "$target"; then
++    ac_ct_$1=$$1
++    AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4])
++    $1=ac_ct_$1
++  else
++    $1="$3"
++  fi
++else
++  $1="$ac_cv_prog_$1"
++fi
++])# AC_CHECK_TARGET_TOOL
++
++
 +AC_DEFUN([AC_PROG_SIZE],
 +[
-+  AC_CHECK_TOOL(SIZE, size, :)
++  AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH])
 +])
  
  # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES])
@@ -35,14 +58,25 @@
 -		  [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
 +[
 +if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
-+		   [static const $1 x[[256]];])],
-+		   [
-+		     AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
-+		   ],
-+		   [
-+		     AS_TR_SH([ac_cv_sizeof_$1])=0
-+		   ])
++	if test "$cross_compiling" = yes; then
++	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
++			   [extern void dummy($1); static const $1 x[[256]]; dummy(x);])],
++			   [
++			     AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
++			   ],
++			   [
++			     AS_TR_SH([ac_cv_sizeof_$1])=0
++			   ])
++	else
++		# The cast to unsigned long works around a bug in the HP C Compiler
++		# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++		# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++		# This bug is HP SR number 8606223364.
++		_AC_COMPUTE_INT([(long) (sizeof ($1))],
++			[AS_TR_SH([ac_cv_sizeof_$1])],
++			[AC_INCLUDES_DEFAULT([$3])],
++			[AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
++	fi
  else
    AS_TR_SH([ac_cv_sizeof_$1])=0
 -fi])dnl
@@ -51,9 +85,3 @@
  AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]),
  		   [The size of a `$1', as computed by sizeof.])
  ])# AC_CHECK_SIZEOF
- 
--
--
- # ---------------- #
- # Generic checks.  #
- # ---------------- #
diff --git a/packages/autoconf/autoconf-native_2.59.bb b/packages/autoconf/autoconf-native_2.59.bb
index 21a2002453..92a9257797 100644
--- a/packages/autoconf/autoconf-native_2.59.bb
+++ b/packages/autoconf/autoconf-native_2.59.bb
@@ -1,8 +1,7 @@
 SECTION = "devel"
-include autoconf_${PV}.bb
+require autoconf_${PV}.bb
 DEPENDS = "m4-native gnu-config-native"
 RDEPENDS_${PN} = "m4-native gnu-config-native"
-RRECOMMENDS_${PN} = "automake-native"
 
 S = "${WORKDIR}/autoconf-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}"
diff --git a/packages/autoconf/autoconf_2.59.bb b/packages/autoconf/autoconf_2.59.bb
index 3cc962da01..3a5c220a48 100644
--- a/packages/autoconf/autoconf_2.59.bb
+++ b/packages/autoconf/autoconf_2.59.bb
@@ -5,8 +5,7 @@ HOMEPAGE = "http://www.gnu.org/software/autoconf/"
 SECTION = "devel"
 DEPENDS += "m4-native"
 RDEPENDS_${PN} = "m4 gnu-config"
-RRECOMMENDS_${PN} = "automake"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
 	   file://program_prefix.patch;patch=1 \
diff --git a/packages/automake/automake-native_1.8.2.bb b/packages/automake/automake-native_1.8.2.bb
index 6e36766445..9a8b1726a8 100644
--- a/packages/automake/automake-native_1.8.2.bb
+++ b/packages/automake/automake-native_1.8.2.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-include automake_${PV}.bb
+require automake_${PV}.bb
 S = "${WORKDIR}/automake-${PV}"
 DEPENDS = "autoconf-native"
 RDEPENDS_${PN} = "autoconf-native perl-native-runtime"
diff --git a/packages/automake/automake-native_1.8.4.bb b/packages/automake/automake-native_1.8.4.bb
index 6e36766445..9a8b1726a8 100644
--- a/packages/automake/automake-native_1.8.4.bb
+++ b/packages/automake/automake-native_1.8.4.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-include automake_${PV}.bb
+require automake_${PV}.bb
 S = "${WORKDIR}/automake-${PV}"
 DEPENDS = "autoconf-native"
 RDEPENDS_${PN} = "autoconf-native perl-native-runtime"
diff --git a/packages/automake/automake-native_1.9.2.bb b/packages/automake/automake-native_1.9.2.bb
index 536f41570f..2ecb0eaa1e 100644
--- a/packages/automake/automake-native_1.9.2.bb
+++ b/packages/automake/automake-native_1.9.2.bb
@@ -1,2 +1,2 @@
 PV := "${PV}"
-include automake-native.inc
+require automake-native.inc
diff --git a/packages/automake/automake-native_1.9.3.bb b/packages/automake/automake-native_1.9.3.bb
index 39544b7c1d..92c861f49c 100644
--- a/packages/automake/automake-native_1.9.3.bb
+++ b/packages/automake/automake-native_1.9.3.bb
@@ -1,3 +1,3 @@
 PV := "${PV}"
 
-include automake-native.inc
+require automake-native.inc
diff --git a/packages/automake/automake_1.7.7.bb b/packages/automake/automake_1.7.7.bb
index 7483868ee4..4c00ea0891 100644
--- a/packages/automake/automake_1.7.7.bb
+++ b/packages/automake/automake_1.7.7.bb
@@ -8,7 +8,7 @@ inherit autotools
 
 FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
 
-include automake.inc
+require automake.inc
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
diff --git a/packages/automake/automake_1.8.2.bb b/packages/automake/automake_1.8.2.bb
index 9921a8d6a4..30002191f5 100644
--- a/packages/automake/automake_1.8.2.bb
+++ b/packages/automake/automake_1.8.2.bb
@@ -12,7 +12,7 @@ inherit autotools
 
 FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
 
-include automake.inc
+require automake.inc
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
diff --git a/packages/automake/automake_1.8.4.bb b/packages/automake/automake_1.8.4.bb
index 493d2cc907..d10ff553df 100644
--- a/packages/automake/automake_1.8.4.bb
+++ b/packages/automake/automake_1.8.4.bb
@@ -12,7 +12,7 @@ inherit autotools
 
 FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
 
-include automake.inc
+require automake.inc
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
diff --git a/packages/automake/automake_1.9.2.bb b/packages/automake/automake_1.9.2.bb
index 4027862768..19d5d56979 100644
--- a/packages/automake/automake_1.9.2.bb
+++ b/packages/automake/automake_1.9.2.bb
@@ -13,7 +13,7 @@ inherit autotools
 
 FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
 
-include automake.inc
+require automake.inc
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
diff --git a/packages/automake/automake_1.9.3.bb b/packages/automake/automake_1.9.3.bb
index fb75b83b68..52f9b981aa 100644
--- a/packages/automake/automake_1.9.3.bb
+++ b/packages/automake/automake_1.9.3.bb
@@ -14,7 +14,7 @@ inherit autotools
 export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}"
 FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
 
-include automake.inc
+require automake.inc
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
diff --git a/packages/bison/bison-native_2.0.bb b/packages/bison/bison-native_2.0.bb
index 57065cd502..db2b0b9683 100644
--- a/packages/bison/bison-native_2.0.bb
+++ b/packages/bison/bison-native_2.0.bb
@@ -1,4 +1,4 @@
-include bison_${PV}.bb
+require bison_${PV}.bb
 SECTION = "devel"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}"
 S = "${WORKDIR}/bison-${PV}"
diff --git a/packages/bitbake/bitbake.inc b/packages/bitbake/bitbake.inc
index e454db2f40..1c5c7ad2a6 100644
--- a/packages/bitbake/bitbake.inc
+++ b/packages/bitbake/bitbake.inc
@@ -9,4 +9,3 @@ HOMEPAGE = "http://developer.berlios.de/projects/bitbake/"
 LICENSE = "GPL MIT"
 SECTION = "devel"
 SUMMARY = "BitBake build tool"
-PACKAGE_ARCH = "all"
diff --git a/packages/bitbake/bitbake_1.0.bb b/packages/bitbake/bitbake_1.0.bb
deleted file mode 100644
index 9f8f054355..0000000000
--- a/packages/bitbake/bitbake_1.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-include bitbake.inc
-
-# We don't need a toolchain...
-INHIBIT_DEFAULT_DEPS = "1"
-
-SRC_URI = "svn://svn.berlios.de/bitbake/tags;module=bitbake-${PV}"
-S = "${WORKDIR}/bitbake-${PV}"
-
-inherit distutils
-
-include bitbake-package.inc
diff --git a/packages/bitbake/bitbake_1.1.bb b/packages/bitbake/bitbake_1.1.bb
deleted file mode 100644
index 9f8f054355..0000000000
--- a/packages/bitbake/bitbake_1.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-include bitbake.inc
-
-# We don't need a toolchain...
-INHIBIT_DEFAULT_DEPS = "1"
-
-SRC_URI = "svn://svn.berlios.de/bitbake/tags;module=bitbake-${PV}"
-S = "${WORKDIR}/bitbake-${PV}"
-
-inherit distutils
-
-include bitbake-package.inc
diff --git a/packages/bitbake/bitbake_1.6.0.bb b/packages/bitbake/bitbake_1.6.0.bb
new file mode 100644
index 0000000000..4289c49a04
--- /dev/null
+++ b/packages/bitbake/bitbake_1.6.0.bb
@@ -0,0 +1,16 @@
+require bitbake.inc
+
+PR = "r1"
+
+# We don't need a toolchain...
+INHIBIT_DEFAULT_DEPS = "1"
+
+SRC_URI = "http://download.berlios.de/bitbake/bitbake-${PV}.tar.gz"
+
+S = "${WORKDIR}/bitbake-${PV}"
+
+inherit distutils
+
+require bitbake-package.inc
+
+RDEPENDS += "python-shell python-lang python-textutils  python-pickle"
diff --git a/packages/bitbake/bitbake_svn.bb b/packages/bitbake/bitbake_svn.bb
index a4ff2ae540..1df6dacbed 100644
--- a/packages/bitbake/bitbake_svn.bb
+++ b/packages/bitbake/bitbake_svn.bb
@@ -1,4 +1,4 @@
-include bitbake.inc
+require bitbake.inc
 
 # Don't use the tip of svn by default
 DEFAULT_PREFERENCE = "-1"
@@ -13,4 +13,4 @@ S = "${WORKDIR}/bitbake"
 
 inherit distutils
 
-include bitbake-package.inc
+require bitbake-package.inc
diff --git a/packages/file/file-native_4.16.bb b/packages/file/file-native_4.16.bb
index 3228ed683c..63554b01fb 100644
--- a/packages/file/file-native_4.16.bb
+++ b/packages/file/file-native_4.16.bb
@@ -1,4 +1,4 @@
-include file_${PV}.bb
+require file_${PV}.bb
 inherit native
 
 # avoid dependency loop
diff --git a/packages/flex/flex-native_2.5.31.bb b/packages/flex/flex-native_2.5.31.bb
index ff8a42772b..1e9354afde 100644
--- a/packages/flex/flex-native_2.5.31.bb
+++ b/packages/flex/flex-native_2.5.31.bb
@@ -1,4 +1,4 @@
-include flex.inc
+require flex.inc
 inherit native
 PR = "r2"
 
diff --git a/packages/flex/flex_2.5.31.bb b/packages/flex/flex_2.5.31.bb
index b96c645136..3062e2d8dc 100644
--- a/packages/flex/flex_2.5.31.bb
+++ b/packages/flex/flex_2.5.31.bb
@@ -1,4 +1,4 @@
-include flex.inc
+require flex.inc
 PR = "r4"
 
 SRC_URI += "file://include.patch;patch=1"
diff --git a/packages/gettext/gettext-native_0.14.1.bb b/packages/gettext/gettext-native_0.14.1.bb
index 07c9361a19..6203b1f9d7 100644
--- a/packages/gettext/gettext-native_0.14.1.bb
+++ b/packages/gettext/gettext-native_0.14.1.bb
@@ -1,4 +1,4 @@
-include gettext_${PV}.bb
+require gettext_${PV}.bb
 S = "${WORKDIR}/gettext-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
 inherit native
diff --git a/packages/glibc/glibc-initial_2.4.bb b/packages/glibc/glibc-initial_2.4.bb
index 422e8b7110..70c7e161a4 100644
--- a/packages/glibc/glibc-initial_2.4.bb
+++ b/packages/glibc/glibc-initial_2.4.bb
@@ -1,5 +1,5 @@
 SECTION = "libs"
-include glibc_${PV}.bb
+require glibc_${PV}.bb
 
 DEPENDS = "linux-libc-headers"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
diff --git a/packages/glibc/glibc-intermediate_2.4.bb b/packages/glibc/glibc-intermediate_2.4.bb
index f2c5744cca..1d1b168696 100644
--- a/packages/glibc/glibc-intermediate_2.4.bb
+++ b/packages/glibc/glibc-intermediate_2.4.bb
@@ -1,5 +1,5 @@
 SECTION = "libs"
-include glibc_${PV}.bb
+require glibc_${PV}.bb
 
 EXCLUDE_FROM_SHLIBS = "1"
 
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index 2cc568df6f..4d6d8a94c5 100644
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -198,4 +198,4 @@ do_stage() {
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
-include glibc-package.bbclass
+require glibc-package.bbclass
diff --git a/packages/gmp/gmp-native_4.1.2.bb b/packages/gmp/gmp-native_4.1.2.bb
index 9a35da292b..c3d36e0fdb 100644
--- a/packages/gmp/gmp-native_4.1.2.bb
+++ b/packages/gmp/gmp-native_4.1.2.bb
@@ -1,7 +1,23 @@
-include gmp_${PV}.bb
+require gmp_${PV}.bb
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gmp-${PV}"
 S = "${WORKDIR}/gmp-${PV}"
 
 inherit native
 
+# darwin 'hacks'
+EXTRA_OECONF_build-darwin = " --enable-shared "
+OLD_STAGING := "${STAGING_BINDIR}"
+OLD_TARGET  := "${TARGET_SYS}"
+OLD_HOST    := "${HOST_SYS}"
+OLD_BUILD   := "${BUILD_SYS}"
+
+PATH_prepend_build-darwin = "${OLD_STAGING}/${OLD_HOST}:${OLD_STAGING}:"
+
+TARGET_SYS_build-darwin   = "none-apple-darwin"
+HOST_SYS_build-darwin     = "none-apple-darwin"
+BUILD_SYS_build-darwin    = "none-apple-darwin"
+
+do_compile_append_build-darwin() {
+    oe_runmake check
+}
diff --git a/packages/gnu-config/gnu-config-native_20050701.bb b/packages/gnu-config/gnu-config-native_20050701.bb
index 74f6fe4b91..43df124f7f 100644
--- a/packages/gnu-config/gnu-config-native_20050701.bb
+++ b/packages/gnu-config/gnu-config-native_20050701.bb
@@ -1,13 +1,13 @@
 SECTION = "base"
-include gnu-config_${PV}.bb
+require gnu-config_${PV}.bb
 
 inherit native
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gnu-config"
 
 do_stage () {
-	install -d ${STAGING_DATADIR}/gnu-config
-	install -d ${STAGING_BINDIR}
+	install -d ${STAGING_DATADIR}/gnu-config/
+	install -d ${STAGING_BINDIR}/
 	cat ${WORKDIR}/gnu-configize.in | \
 		sed -e 's,@gnu-configdir@,${STAGING_DATADIR}/gnu-config,' \
 		    -e 's,@autom4te_perllibdir@,${STAGING_DATADIR}/autoconf,' > ${STAGING_BINDIR}/gnu-configize
diff --git a/packages/m4/m4-native_1.4.2.bb b/packages/m4/m4-native_1.4.2.bb
index 67fe36c7a1..8beb8748e3 100644
--- a/packages/m4/m4-native_1.4.2.bb
+++ b/packages/m4/m4-native_1.4.2.bb
@@ -1,4 +1,4 @@
-include m4_${PV}.bb
+require m4_${PV}.bb
 
 inherit native
 
diff --git a/packages/mpfr/mpfr-native_2.1.1.bb b/packages/mpfr/mpfr-native_2.1.1.bb
index 119249895d..01ba37c8bf 100644
--- a/packages/mpfr/mpfr-native_2.1.1.bb
+++ b/packages/mpfr/mpfr-native_2.1.1.bb
@@ -1,4 +1,4 @@
-include mpfr_${PV}.bb
+require mpfr_${PV}.bb
 inherit native
 DEPENDS = "gmp-native"
 
diff --git a/packages/ncurses/ncurses-native_5.4.bb b/packages/ncurses/ncurses-native_5.4.bb
index 26d0897c9f..19e379a15c 100644
--- a/packages/ncurses/ncurses-native_5.4.bb
+++ b/packages/ncurses/ncurses-native_5.4.bb
@@ -1,5 +1,5 @@
 SECTION = "libs"
-include ncurses_${PV}.bb
+require ncurses_${PV}.bb
 inherit native
 EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
 DEPENDS = ""
diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb
index 5b03eaaeed..63272b4779 100644
--- a/packages/ncurses/ncurses_5.4.bb
+++ b/packages/ncurses/ncurses_5.4.bb
@@ -4,4 +4,4 @@ SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
 	   file://visibility.patch;patch=1"
 S = "${WORKDIR}/ncurses-${PV}"
 
-include ncurses.inc
+require ncurses.inc
diff --git a/packages/pkgconfig/pkgconfig-native_0.15.0.bb b/packages/pkgconfig/pkgconfig-native_0.15.0.bb
index d8e47c5d09..daab8ab422 100644
--- a/packages/pkgconfig/pkgconfig-native_0.15.0.bb
+++ b/packages/pkgconfig/pkgconfig-native_0.15.0.bb
@@ -1,5 +1,5 @@
 SECTION = "console/utils"
-include pkgconfig_${PV}.bb
+require pkgconfig_${PV}.bb
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
 
 S = "${WORKDIR}/pkgconfig-${PV}"