From 67e157ee3cb6c4405a28419494465025f6b81549 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 1 Aug 2013 14:02:15 +0200 Subject: [PATCH] font-bitstream-type1: change to new package format Signed-off-by: Stephan Raue --- packages/x11/font/font-bitstream-type1/build | 33 ------------------- .../x11/font/font-bitstream-type1/install | 32 ------------------ .../font-bitstream-type1/{meta => package.mk} | 6 ++-- 3 files changed, 4 insertions(+), 67 deletions(-) delete mode 100755 packages/x11/font/font-bitstream-type1/build delete mode 100755 packages/x11/font/font-bitstream-type1/install rename packages/x11/font/font-bitstream-type1/{meta => package.mk} (92%) diff --git a/packages/x11/font/font-bitstream-type1/build b/packages/x11/font/font-bitstream-type1/build deleted file mode 100755 index d0dafa63bf..0000000000 --- a/packages/x11/font/font-bitstream-type1/build +++ /dev/null @@ -1,33 +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 - -make diff --git a/packages/x11/font/font-bitstream-type1/install b/packages/x11/font/font-bitstream-type1/install deleted file mode 100755 index 8b65c62422..0000000000 --- a/packages/x11/font/font-bitstream-type1/install +++ /dev/null @@ -1,32 +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/Type1" - -mkdir -p $FONTDIR - cp $PKG_BUILD/*.afm $FONTDIR - cp $PKG_BUILD/*.pfb $FONTDIR - -mkfontdir $FONTDIR -mkfontscale $FONTDIR diff --git a/packages/x11/font/font-bitstream-type1/meta b/packages/x11/font/font-bitstream-type1/package.mk similarity index 92% rename from packages/x11/font/font-bitstream-type1/meta rename to packages/x11/font/font-bitstream-type1/package.mk index 0be842e8bf..62b975e8ef 100644 --- a/packages/x11/font/font-bitstream-type1/meta +++ b/packages/x11/font/font-bitstream-type1/package.mk @@ -26,11 +26,13 @@ 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 util-macros" +PKG_BUILD_DEPENDS_TARGET="toolchain util-macros" PKG_PRIORITY="optional" PKG_SECTION="x11/font" PKG_SHORTDESC="font-bitstream-type1: Bitstream font family" PKG_LONGDESC="Bitstream font family." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="yes" + +PKG_CONFIGURE_OPTS_TARGET="--with-fontrootdir=/usr/share/fonts"