From 1b50e6f9b0cb87bc0e7170df54ce94aaded74b6d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 23 Aug 2014 18:51:07 +0200
Subject: [PATCH] Revert "toolchain: switch to pkgconf"

This reverts commit f2f5c320d8619bb36ddd04980430e0521cb00e87.
---
 .../devel/{pkgconf => pkg-config}/package.mk  | 25 +++++++++----------
 packages/virtual/toolchain/package.mk         |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)
 rename packages/devel/{pkgconf => pkg-config}/package.mk (59%)

diff --git a/packages/devel/pkgconf/package.mk b/packages/devel/pkg-config/package.mk
similarity index 59%
rename from packages/devel/pkgconf/package.mk
rename to packages/devel/pkg-config/package.mk
index 072446093b..4eff86271a 100644
--- a/packages/devel/pkgconf/package.mk
+++ b/packages/devel/pkg-config/package.mk
@@ -16,28 +16,27 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="pkgconf"
-PKG_VERSION="0.9.6"
+PKG_NAME="pkg-config"
+PKG_VERSION="0.28"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/pkgconf/pkgconf"
-PKG_URL="https://github.com/pkgconf/pkgconf/archive/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="ccache:host gettext:host automake:host"
+PKG_SITE="http://www.freedesktop.org/software/pkgconfig/"
+PKG_URL="http://pkgconfig.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_HOST="ccache:host gettext:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
-PKG_SHORTDESC="pkgconf: compiler and linker configuration for development frameworks"
-PKG_LONGDESC="pkgconf provides compiler and linker configuration for development frameworks"
-
-PKG_SOURCE_DIR="${PKG_NAME}-${PKG_NAME}-${PKG_VERSION}"
+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_AUTORECONF="no"
 
-pre_configure_host() {
-  sh autogen.sh
-}
+PKG_CONFIGURE_OPTS_HOST="--disable-silent-rules \
+                         --with-internal-glib --disable-dtrace \
+                         --with-gnu-ld"
 
 post_makeinstall_host() {
-  ln -sf pkgconf $ROOT/$TOOLCHAIN/bin/pkg-config
+  mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
+    cp ../pkg.m4 $SYSROOT_PREFIX/usr/share/aclocal
 }
diff --git a/packages/virtual/toolchain/package.mk b/packages/virtual/toolchain/package.mk
index 818b286b8a..47f618c363 100644
--- a/packages/virtual/toolchain/package.mk
+++ b/packages/virtual/toolchain/package.mk
@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="make:host xz:host sed:host pkgconf:host autoconf:host automake:host libtool:host intltool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host scons:host yasm:host nasm:host"
+PKG_DEPENDS_TARGET="make:host xz:host sed:host pkg-config:host autoconf:host automake:host libtool:host intltool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host scons:host yasm:host nasm:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain"