From 2a472e2be1a6972d21ff35445b018e5150ba2cce Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 16 Nov 2010 21:26:51 +0100
Subject: [PATCH] font-bitstream-type1: add metafile support, thanks to cowbalt

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/font/font-bitstream-type1/build   |  7 ++-----
 packages/x11/font/font-bitstream-type1/install |  2 +-
 packages/x11/font/font-bitstream-type1/meta    | 14 ++++++++++++++
 packages/x11/font/font-bitstream-type1/url     |  1 -
 4 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 packages/x11/font/font-bitstream-type1/meta
 delete mode 100644 packages/x11/font/font-bitstream-type1/url

diff --git a/packages/x11/font/font-bitstream-type1/build b/packages/x11/font/font-bitstream-type1/build
index eb1cf414d1..024bfa5a6a 100755
--- a/packages/x11/font/font-bitstream-type1/build
+++ b/packages/x11/font/font-bitstream-type1/build
@@ -2,8 +2,6 @@
 
 . config/options $1
 
-$SCRIPTS/build toolchain
-
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -12,11 +10,10 @@ cd $PKG_BUILD
             --localstatedir=/var \
             --with-fontdir=$XORG_PATH_FONTS
 
-$MAKE
+make
 
 mkdir -p fonts
-  cp *.afm fonts
-  cp *.pfb fonts
+  cp *.afm *.pfb fonts
 
 cd fonts
   mkfontdir
diff --git a/packages/x11/font/font-bitstream-type1/install b/packages/x11/font/font-bitstream-type1/install
index 177c5d2709..15f67fb940 100755
--- a/packages/x11/font/font-bitstream-type1/install
+++ b/packages/x11/font/font-bitstream-type1/install
@@ -3,4 +3,4 @@
 . config/options $1
 
 mkdir -p $INSTALL/$XORG_PATH_FONTS/Type1
-cp $PKG_BUILD/fonts/* $INSTALL/$XORG_PATH_FONTS/Type1
+  cp $PKG_BUILD/fonts/* $INSTALL/$XORG_PATH_FONTS/Type1
diff --git a/packages/x11/font/font-bitstream-type1/meta b/packages/x11/font/font-bitstream-type1/meta
new file mode 100644
index 0000000000..d8d264009b
--- /dev/null
+++ b/packages/x11/font/font-bitstream-type1/meta
@@ -0,0 +1,14 @@
+PKG_NAME="font-bitstream-type1"
+PKG_VERSION="1.0.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.X.org"
+PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/font"
+PKG_SHORTDESC="font-bitstream-type1: Bitstream font family"
+PKG_LONGDESC="Bitstream font family."
+PKG_IS_ADDON="no"
diff --git a/packages/x11/font/font-bitstream-type1/url b/packages/x11/font/font-bitstream-type1/url
deleted file mode 100644
index f943fa16c3..0000000000
--- a/packages/x11/font/font-bitstream-type1/url
+++ /dev/null
@@ -1 +0,0 @@
-http://xorg.freedesktop.org/archive/individual/font/font-bitstream-type1-1.0.1.tar.bz2
\ No newline at end of file