From 35f577d69272f307483fd3dc9ddfe6137ff503e3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 4 Feb 2011 14:14:25 +0100 Subject: [PATCH] font-cursor-misc: using 'fontrootdir=/usr/share/fonts', rework of build and install scripts Signed-off-by: Stephan Raue --- packages/x11/font/font-cursor-misc/build | 4 +-- packages/x11/font/font-cursor-misc/install | 30 ++++++++++++++++++++++ packages/x11/font/font-cursor-misc/meta | 4 +-- 3 files changed, 34 insertions(+), 4 deletions(-) create mode 100755 packages/x11/font/font-cursor-misc/install diff --git a/packages/x11/font/font-cursor-misc/build b/packages/x11/font/font-cursor-misc/build index 884e79c918..33f1669501 100755 --- a/packages/x11/font/font-cursor-misc/build +++ b/packages/x11/font/font-cursor-misc/build @@ -28,6 +28,6 @@ cd $PKG_BUILD --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --with-fontdir=$XORG_PATH_FONTS + --with-fontrootdir=/usr/share/fonts -make UTIL_DIR="`ls -d $ROOT/$BUILD/font-util*`" +make diff --git a/packages/x11/font/font-cursor-misc/install b/packages/x11/font/font-cursor-misc/install new file mode 100755 index 0000000000..d364f90bd1 --- /dev/null +++ b/packages/x11/font/font-cursor-misc/install @@ -0,0 +1,30 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +FONTDIR="$INSTALL/usr/share/fonts/misc" + +mkdir -p $FONTDIR + cp $PKG_BUILD/*.pcf.gz $FONTDIR + +mkfontdir $FONTDIR diff --git a/packages/x11/font/font-cursor-misc/meta b/packages/x11/font/font-cursor-misc/meta index 746757b523..a7c74c717d 100644 --- a/packages/x11/font/font-cursor-misc/meta +++ b/packages/x11/font/font-cursor-misc/meta @@ -25,8 +25,8 @@ 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="font-util" -PKG_BUILD_DEPENDS="toolchain util-macros font-util" +PKG_DEPENDS="font-util-host" +PKG_BUILD_DEPENDS="toolchain util-macros font-util-host" PKG_PRIORITY="optional" PKG_SECTION="x11/font" PKG_SHORTDESC="font-cursor-misc: X11 cursor fonts"