From 6a314fe6e35dead48c896d267b380d623be3a433 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 28 Dec 2013 22:41:25 +0100
Subject: [PATCH] fribidi: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/other/fribidi/build                | 43 ---------------------
 packages/other/fribidi/{meta => package.mk} | 25 +++++++++++-
 2 files changed, 23 insertions(+), 45 deletions(-)
 delete mode 100755 packages/other/fribidi/build
 rename packages/other/fribidi/{meta => package.mk} (68%)

diff --git a/packages/other/fribidi/build b/packages/other/fribidi/build
deleted file mode 100755
index 20a3c01d8c..0000000000
--- a/packages/other/fribidi/build
+++ /dev/null
@@ -1,43 +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
-
-CFLAGS="$CFLAGS -DFRIBIDI_CHUNK_SIZE=4080"
-CFLAGS="$CFLAGS -fPIC -DPIC"
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --disable-shared \
-            --enable-static \
-            --disable-debug \
-            --disable-deprecated \
-            --disable-silent-rules \
-            --enable-malloc \
-            --enable-charsets \
-            --with-gnu-ld \
-            --without-glib
-
-make
-
-$MAKEINSTALL
-cp -f $PKG_DIR/scripts/$1-config $ROOT/$TOOLCHAIN/bin/$1-config
diff --git a/packages/other/fribidi/meta b/packages/other/fribidi/package.mk
similarity index 68%
rename from packages/other/fribidi/meta
rename to packages/other/fribidi/package.mk
index 2fcb946f23..74930c30e4 100644
--- a/packages/other/fribidi/meta
+++ b/packages/other/fribidi/package.mk
@@ -24,11 +24,32 @@ PKG_LICENSE="LGPL"
 PKG_SITE="http://fribidi.org/"
 PKG_URL="http://fribidi.org/download/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="other"
 PKG_SHORTDESC="fribidi: The Bidirectional Algorithm library"
 PKG_LONGDESC="The library implements all of the algorithm as described in the Unicode Standard Annex #9, The Bidirectional Algorithm, http://www.unicode.org/unicode/reports/tr9/. FriBidi is exhautively tested against Bidi Reference Code, and due to our best knowledge, does not contain any conformance bugs."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
+                           --enable-static \
+                           --disable-debug \
+                           --disable-deprecated \
+                           --disable-silent-rules \
+                           --enable-malloc \
+                           --enable-charsets \
+                           --with-gnu-ld \
+                           --without-glib"
+
+export CFLAGS="$CFLAGS -DFRIBIDI_CHUNK_SIZE=4080"
+export CFLAGS="$CFLAGS -fPIC -DPIC"
+
+post_makeinstall_target() {
+  mkdir -p $ROOT/$TOOLCHAIN/bin
+    cp -f $PKG_DIR/scripts/fribidi-config $ROOT/$TOOLCHAIN/bin
+    chmod +x $ROOT/$TOOLCHAIN/bin/fribidi-config
+
+  rm -rf $INSTALL/usr/bin
+}