From c82ae337f811ef2186ed08fd1943c56d04b4cebc Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 17:45:23 +0200
Subject: [PATCH] libXi: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libXi/build                | 44 ---------------------
 packages/x11/lib/libXi/install              | 26 ------------
 packages/x11/lib/libXi/{meta => package.mk} | 14 ++++++-
 3 files changed, 12 insertions(+), 72 deletions(-)
 delete mode 100755 packages/x11/lib/libXi/build
 delete mode 100755 packages/x11/lib/libXi/install
 rename packages/x11/lib/libXi/{meta => package.mk} (75%)

diff --git a/packages/x11/lib/libXi/build b/packages/x11/lib/libXi/build
deleted file mode 100755
index 35a35e1f12..0000000000
--- a/packages/x11/lib/libXi/build
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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, or (at your option)
-#  any later version.
-#
-#  This Program 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.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --enable-malloc0returnsnull \
-            --disable-silent-rules \
-            --disable-docs \
-            --disable-specs \
-            --without-xmlto \
-            --without-fop \
-            --without-xsltproc \
-            --without-asciidoc \
-            --with-gnu-ld \
-
-make SUBDIRS="src"
-$MAKEINSTALL SUBDIRS="src"
diff --git a/packages/x11/lib/libXi/install b/packages/x11/lib/libXi/install
deleted file mode 100755
index 0235b93f17..0000000000
--- a/packages/x11/lib/libXi/install
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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, or (at your option)
-#  any later version.
-#
-#  This Program 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.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/.libs/libXi.so* $INSTALL/usr/lib
diff --git a/packages/x11/lib/libXi/meta b/packages/x11/lib/libXi/package.mk
similarity index 75%
rename from packages/x11/lib/libXi/meta
rename to packages/x11/lib/libXi/package.mk
index 04d287511b..5563a5e88c 100644
--- a/packages/x11/lib/libXi/meta
+++ b/packages/x11/lib/libXi/package.mk
@@ -26,11 +26,21 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libX11"
-PKG_BUILD_DEPENDS="toolchain util-macros libX11 inputproto"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros libX11 inputproto"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxi: X11 Input extension library"
 PKG_LONGDESC="LibXi provides an X Window System client interface to the XINPUT extension to the X protocol."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull \
+                           --disable-silent-rules \
+                           --disable-docs \
+                           --disable-specs \
+                           --without-xmlto \
+                           --without-fop \
+                           --without-xsltproc \
+                           --without-asciidoc \
+                           --with-gnu-ld"