From b59c0f3dc005c45644b07604d8632cdad9f48e6e Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 9 Jan 2014 23:41:03 +0100
Subject: [PATCH] autoconf-2.68: convert to new package format, move package

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../meta => devel/autoconf-2.68/package.mk}   | 36 +++++++++++--
 packages/devel/eglibc/package.mk              |  2 +-
 .../devel/autotools/autoconf-2.68/build       | 50 -------------------
 3 files changed, 33 insertions(+), 55 deletions(-)
 rename packages/{toolchain/devel/autotools/autoconf-2.68/meta => devel/autoconf-2.68/package.mk} (65%)
 delete mode 100755 packages/toolchain/devel/autotools/autoconf-2.68/build

diff --git a/packages/toolchain/devel/autotools/autoconf-2.68/meta b/packages/devel/autoconf-2.68/package.mk
similarity index 65%
rename from packages/toolchain/devel/autotools/autoconf-2.68/meta
rename to packages/devel/autoconf-2.68/package.mk
index b9a13bf771..6e3f22047c 100644
--- a/packages/toolchain/devel/autotools/autoconf-2.68/meta
+++ b/packages/devel/autoconf-2.68/package.mk
@@ -18,18 +18,46 @@
 
 PKG_NAME="autoconf-2.68"
 PKG_VERSION="legacy"
+PKG_SOURCE_DIR="$PKG_NAME"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sources.redhat.com/autoconf/"
 PKG_URL="http://ftp.gnu.org/gnu/autoconf/$PKG_NAME.tar.bz2"
 PKG_SOURCE_DIR="$PKG_NAME"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache:host m4"
+PKG_DEPENDS_HOST=""
+PKG_BUILD_DEPENDS_HOST="ccache:host m4"
 PKG_PRIORITY="optional"
-PKG_SECTION="toolchain/devel"
+PKG_SECTION="devel"
 PKG_SHORTDESC="autoconf: A GNU tool for automatically configuring source code"
 PKG_LONGDESC="Autoconf is an extensible package of m4 macros that produce shell scripts to automatically configure software source code packages. These scripts can adapt the packages to many kinds of UNIX-like systems without manual user intervention. Autoconf creates a configuration script for a package from a template file that lists the operating system features that the package can use, in the form of m4 macro calls."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_HOST="EMACS=no \
+                         ac_cv_path_M4=$ROOT/$TOOLCHAIN/bin/m4 \
+                         ac_cv_prog_gnu_m4_gnu=no \
+                         --target=$TARGET_NAME \
+                         --program-suffix=-2.68"
+
+make_host() {
+ : # nothing todo
+}
+
+makeinstall_host() {
+  make install \
+       prefix=$ROOT/$TOOLCHAIN \
+       pkgdatadir=$ROOT/$TOOLCHAIN/share/$PKG_NAME \
+       pkgdatadir=$ROOT/$TOOLCHAIN/lib/$PKG_NAME \
+       pkgdatadir=$ROOT/$TOOLCHAIN/include/$PKG_NAME \
+       install
+
+  make clean
+  make install \
+       prefix=$SYSROOT_PREFIX/usr \
+       pkgdatadir=$SYSROOT_PREFIX/usr/share/$PKG_NAME \
+       pkgdatadir=$SYSROOT_PREFIX/usr/lib/$PKG_NAME \
+       pkgdatadir=$SYSROOT_PREFIX/usr/include/$PKG_NAME \
+       install
+}
diff --git a/packages/devel/eglibc/package.mk b/packages/devel/eglibc/package.mk
index 76d2a7aebb..dd27fe1f7a 100644
--- a/packages/devel/eglibc/package.mk
+++ b/packages/devel/eglibc/package.mk
@@ -25,7 +25,7 @@ PKG_SITE="http://www.eglibc.org/"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="timezone-data"
 PKG_DEPENDS_INIT=""
-PKG_BUILD_DEPENDS_TARGET="ccache:host autotools autoconf-2.68 linux:host gcc:bootstrap"
+PKG_BUILD_DEPENDS_TARGET="ccache:host autotools:host autoconf-2.68:host linux:host gcc:bootstrap"
 PKG_BUILD_DEPENDS_INIT="eglibc"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
diff --git a/packages/toolchain/devel/autotools/autoconf-2.68/build b/packages/toolchain/devel/autotools/autoconf-2.68/build
deleted file mode 100755
index 78ce68d43d..0000000000
--- a/packages/toolchain/devel/autotools/autoconf-2.68/build
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-setup_toolchain host
-
-cd $PKG_BUILD
-
-EMACS="no" \
-ac_cv_path_M4=$ROOT/$TOOLCHAIN/bin/m4 \
-ac_cv_prog_gnu_m4_gnu=no \
-./configure --host=$HOST_NAME \
-            --build=$HOST_NAME \
-            --target=$TARGET_NAME \
-            --prefix=$ROOT/$TOOLCHAIN \
-            --program-suffix="-2.68" \
-
-make install \
-     prefix=$ROOT/$TOOLCHAIN \
-     pkgdatadir=$ROOT/$TOOLCHAIN/share/$PKG_NAME \
-     pkgdatadir=$ROOT/$TOOLCHAIN/lib/$PKG_NAME \
-     pkgdatadir=$ROOT/$TOOLCHAIN/include/$PKG_NAME \
-     install
-
-make clean
-make install \
-     prefix=$SYSROOT_PREFIX/usr \
-     pkgdatadir=$SYSROOT_PREFIX/usr/share/$PKG_NAME \
-     pkgdatadir=$SYSROOT_PREFIX/usr/lib/$PKG_NAME \
-     pkgdatadir=$SYSROOT_PREFIX/usr/include/$PKG_NAME \
-     install
-