From 9737df67058aa028cfd7017b2ddf94a4fc7d44ae Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 30 Jul 2013 08:38:10 +0200
Subject: [PATCH] libXfont: convert to new package format

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

diff --git a/packages/x11/lib/libXfont/build b/packages/x11/lib/libXfont/build
deleted file mode 100755
index a33ca70e63..0000000000
--- a/packages/x11/lib/libXfont/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 \
-            --disable-ipv6 \
-            --enable-freetype \
-            --enable-builtins \
-            --disable-pcfformat \
-            --disable-bdfformat \
-            --disable-snfformat \
-            --enable-fc \
-            --with-gnu-ld \
-            --without-xmlto
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libXfont/install b/packages/x11/lib/libXfont/install
deleted file mode 100755
index e14383416f..0000000000
--- a/packages/x11/lib/libXfont/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/libXfont.so* $INSTALL/usr/lib
diff --git a/packages/x11/lib/libXfont/meta b/packages/x11/lib/libXfont/package.mk
similarity index 73%
rename from packages/x11/lib/libXfont/meta
rename to packages/x11/lib/libXfont/package.mk
index be3793dea3..07f2324988 100644
--- a/packages/x11/lib/libXfont/meta
+++ b/packages/x11/lib/libXfont/package.mk
@@ -26,11 +26,22 @@ 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="freetype"
-PKG_BUILD_DEPENDS="toolchain util-macros fontcacheproto fontsproto xtrans freetype libfontenc"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros fontcacheproto fontsproto xtrans freetype libfontenc"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxfont: X font Library"
 PKG_LONGDESC="X font Library"
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-ipv6 \
+                           --enable-freetype \
+                           --enable-builtins \
+                           --disable-pcfformat \
+                           --disable-bdfformat \
+                           --disable-snfformat \
+                           --enable-fc \
+                           --with-gnu-ld \
+                           --without-xmlto"
+