From adde8228aef713dc9ec1a9bdcf1465e126ca42fc Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 8 Jan 2014 20:12:22 +0100
Subject: [PATCH] pkg-config: convert to new package format, move package

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

diff --git a/packages/toolchain/devel/pkg-config/meta b/packages/devel/pkg-config/package.mk
similarity index 81%
rename from packages/toolchain/devel/pkg-config/meta
rename to packages/devel/pkg-config/package.mk
index 82539294b1..b69b9fe6f5 100644
--- a/packages/toolchain/devel/pkg-config/meta
+++ b/packages/devel/pkg-config/package.mk
@@ -23,12 +23,21 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.freedesktop.org/software/pkgconfig/"
 PKG_URL="http://pkgconfig.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache:host gettext:host"
+PKG_DEPENDS_HOST=""
+PKG_BUILD_DEPENDS_HOST="ccache:host gettext:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="pkg-config: A library configuration management system"
 PKG_LONGDESC="pkg-config is a system for managing library compile/link flags that works with automake and autoconf. It replaces the ubiquitous *-config scripts you may have seen with a single tool."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_HOST="--disable-silent-rules \
+                         --with-internal-glib --disable-dtrace \
+                         --with-gnu-ld"
+
+post_makeinstall_host() {
+  mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
+    cp ../pkg.m4 $SYSROOT_PREFIX/usr/share/aclocal
+}
diff --git a/packages/toolchain/devel/pkg-config/build b/packages/toolchain/devel/pkg-config/build
deleted file mode 100755
index 3e73b30de1..0000000000
--- a/packages/toolchain/devel/pkg-config/build
+++ /dev/null
@@ -1,40 +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
-./configure --host=$HOST_NAME \
-            --build=$HOST_NAME \
-            --enable-shared \
-            --disable-static \
-            --disable-silent-rules \
-            --with-internal-glib --disable-dtrace \
-            --with-gnu-ld
-
-make
-
-mkdir -p $ROOT/$TOOLCHAIN/bin
-  cp pkg-config $ROOT/$TOOLCHAIN/bin
-
-mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
-  cp pkg.m4 $SYSROOT_PREFIX/usr/share/aclocal
diff --git a/packages/toolchain/meta b/packages/toolchain/meta
index a0c102c9b1..3bd22a353b 100644
--- a/packages/toolchain/meta
+++ b/packages/toolchain/meta
@@ -24,7 +24,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="make:host xz:host sed:host pkg-config autotools gcc:host bison:host flex:host cmake:host scons yasm nasm"
+PKG_BUILD_DEPENDS="make:host xz:host sed:host pkg-config:host autotools gcc:host bison:host flex:host cmake:host scons yasm nasm"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain"