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

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../meta => devel/autoconf/package.mk}        | 15 ++++++--
 .../toolchain/devel/autotools/autoconf/build  | 37 -------------------
 packages/toolchain/devel/autotools/package.mk |  2 +-
 3 files changed, 13 insertions(+), 41 deletions(-)
 rename packages/{toolchain/devel/autotools/autoconf/meta => devel/autoconf/package.mk} (83%)
 delete mode 100755 packages/toolchain/devel/autotools/autoconf/build

diff --git a/packages/toolchain/devel/autotools/autoconf/meta b/packages/devel/autoconf/package.mk
similarity index 83%
rename from packages/toolchain/devel/autotools/autoconf/meta
rename to packages/devel/autoconf/package.mk
index eb8cc4c3c1..d6f6f2e772 100644
--- a/packages/toolchain/devel/autotools/autoconf/meta
+++ b/packages/devel/autoconf/package.mk
@@ -23,12 +23,21 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sources.redhat.com/autoconf/"
 PKG_URL="http://ftp.gnu.org/gnu/autoconf/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache:host m4 gettext:host"
+PKG_DEPENDS_HOST=""
+PKG_BUILD_DEPENDS_HOST="ccache:host m4 gettext:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/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"
+
+post_makeinstall_host() {
+  make prefix=$SYSROOT_PREFIX/usr install
+}
diff --git a/packages/toolchain/devel/autotools/autoconf/build b/packages/toolchain/devel/autotools/autoconf/build
deleted file mode 100755
index 08c4b03267..0000000000
--- a/packages/toolchain/devel/autotools/autoconf/build
+++ /dev/null
@@ -1,37 +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 $BUILD/$PKG_NAME-$PKG_VERSION
-
-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 \
-
-make
-make install
-make prefix=$SYSROOT_PREFIX/usr install
diff --git a/packages/toolchain/devel/autotools/package.mk b/packages/toolchain/devel/autotools/package.mk
index a1b13ee5eb..39e33fdbfa 100644
--- a/packages/toolchain/devel/autotools/package.mk
+++ b/packages/toolchain/devel/autotools/package.mk
@@ -24,7 +24,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS_HOST=""
-PKG_BUILD_DEPENDS_HOST="ccache:host autoconf automake libtool:host intltool autoconf-archive:host"
+PKG_BUILD_DEPENDS_HOST="ccache:host autoconf:host automake libtool:host intltool autoconf-archive:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="autotools: Metapackage"