diff --git a/packages/x11/font/font-misc-misc/build b/packages/x11/font/font-misc-misc/build deleted file mode 100755 index 85e3b3c071..0000000000 --- a/packages/x11/font/font-misc-misc/build +++ /dev/null @@ -1,52 +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 \ - --with-fontrootdir=/usr/share/fonts \ - --disable-silent-rules \ - --enable-iso8859-1 \ - --enable-iso8859-2 \ - --disable-iso8859-3 \ - --disable-iso8859-4 \ - --enable-iso8859-5 \ - --disable-iso8859-6 \ - --enable-iso8859-7 \ - --enable-iso8859-8 \ - --enable-iso8859-9 \ - --disable-iso8859-10 \ - --disable-iso8859-11 \ - --disable-iso8859-12 \ - --disable-iso8859-13 \ - --enable-iso8859-14 \ - --enable-iso8859-15 \ - --disable-iso8859-16 \ - --disable-koi8-r \ - --disable-jisx0201 \ - -make UTIL_DIR="$SYSROOT_PREFIX/usr/share/fonts/util/" diff --git a/packages/x11/font/font-misc-misc/config/fonts.alias b/packages/x11/font/font-misc-misc/config/fonts.alias deleted file mode 100644 index fd8becb875..0000000000 --- a/packages/x11/font/font-misc-misc/config/fonts.alias +++ /dev/null @@ -1 +0,0 @@ -fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 diff --git a/packages/x11/font/font-misc-misc/install b/packages/x11/font/font-misc-misc/install deleted file mode 100755 index 1a9a38a7f4..0000000000 --- a/packages/x11/font/font-misc-misc/install +++ /dev/null @@ -1,30 +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 - -FONTDIR="$INSTALL/usr/share/fonts/misc" - -mkdir -p $FONTDIR - cp $PKG_BUILD/6x13-ISO8859-1.pcf.gz $FONTDIR - -mkfontdir $FONTDIR diff --git a/packages/x11/font/font-misc-misc/meta b/packages/x11/font/font-misc-misc/package.mk similarity index 53% rename from packages/x11/font/font-misc-misc/meta rename to packages/x11/font/font-misc-misc/package.mk index 7d07e28f1c..e7672d112b 100644 --- a/packages/x11/font/font-misc-misc/meta +++ b/packages/x11/font/font-misc-misc/package.mk @@ -26,11 +26,40 @@ 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 font-cursor-misc" -PKG_BUILD_DEPENDS="toolchain util-macros font-util font-cursor-misc" +PKG_BUILD_DEPENDS_TARGET="toolchain util-macros font-util font-cursor-misc" PKG_PRIORITY="optional" PKG_SECTION="x11/font" PKG_SHORTDESC="font-misc-misc: A misc. public domain font" PKG_LONGDESC="A misc. public domain font." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="yes" + +PKG_CONFIGURE_OPTS_TARGET="--with-fontrootdir=/usr/share/fonts \ + --disable-silent-rules \ + --enable-iso8859-1 \ + --enable-iso8859-2 \ + --disable-iso8859-3 \ + --disable-iso8859-4 \ + --enable-iso8859-5 \ + --disable-iso8859-6 \ + --enable-iso8859-7 \ + --enable-iso8859-8 \ + --enable-iso8859-9 \ + --disable-iso8859-10 \ + --disable-iso8859-11 \ + --disable-iso8859-12 \ + --disable-iso8859-13 \ + --enable-iso8859-14 \ + --enable-iso8859-15 \ + --disable-iso8859-16 \ + --disable-koi8-r \ + --disable-jisx0201" + +PKG_MAKE_OPTS_TARGET="UTIL_DIR=$SYSROOT_PREFIX/usr/share/fonts/util/" + +makeinstall_target() { + mkdir -p $INSTALL/usr/share/fonts/misc + cp 6x13-ISO8859-1.pcf.gz $INSTALL/usr/share/fonts/misc + mkfontdir $INSTALL/usr/share/fonts/misc +}