From 0e45138d9c2a281d5595d5c8bdebdcc2dcb27763 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 1 Aug 2013 14:06:55 +0200 Subject: [PATCH] font-util: change to new package format Signed-off-by: Stephan Raue --- packages/x11/font/encodings/package.mk | 2 +- packages/x11/font/font-cursor-misc/package.mk | 4 +- packages/x11/font/font-util-host/build | 38 ------------------- packages/x11/font/font-util-host/meta | 36 ------------------ packages/x11/font/font-util/build | 34 ----------------- packages/x11/font/font-util/install | 26 ------------- .../x11/font/font-util/{meta => package.mk} | 11 +++++- 7 files changed, 12 insertions(+), 139 deletions(-) delete mode 100755 packages/x11/font/font-util-host/build delete mode 100644 packages/x11/font/font-util-host/meta delete mode 100755 packages/x11/font/font-util/build delete mode 100755 packages/x11/font/font-util/install rename packages/x11/font/font-util/{meta => package.mk} (86%) diff --git a/packages/x11/font/encodings/package.mk b/packages/x11/font/encodings/package.mk index b7e8968a03..0daf8931dd 100644 --- a/packages/x11/font/encodings/package.mk +++ b/packages/x11/font/encodings/package.mk @@ -26,7 +26,7 @@ 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_TARGET="toolchain util-macros font-util-host" +PKG_BUILD_DEPENDS_TARGET="toolchain util-macros font-util:host" PKG_PRIORITY="optional" PKG_SECTION="x11/font" PKG_SHORTDESC="encodings: X font encodings" diff --git a/packages/x11/font/font-cursor-misc/package.mk b/packages/x11/font/font-cursor-misc/package.mk index b17506d055..add3d47499 100644 --- a/packages/x11/font/font-cursor-misc/package.mk +++ b/packages/x11/font/font-cursor-misc/package.mk @@ -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-host" -PKG_BUILD_DEPENDS_TARGET="toolchain util-macros font-util-host" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS_TARGET="toolchain util-macros font-util:host" PKG_PRIORITY="optional" PKG_SECTION="x11/font" PKG_SHORTDESC="font-cursor-misc: X11 cursor fonts" diff --git a/packages/x11/font/font-util-host/build b/packages/x11/font/font-util-host/build deleted file mode 100755 index cc5d8b058d..0000000000 --- a/packages/x11/font/font-util-host/build +++ /dev/null @@ -1,38 +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 - -$SCRIPTS/unpack font-util - -FONT_UTIL_DIR=`ls -d $BUILD/font-util-[0-9]*` - -setup_toolchain host - -cd $FONT_UTIL_DIR -mkdir -p .objdir-host && cd .objdir-host -../configure --host=$HOST_NAME \ - --build=$HOST_NAME \ - --prefix=$ROOT/$TOOLCHAIN - -make -make install diff --git a/packages/x11/font/font-util-host/meta b/packages/x11/font/font-util-host/meta deleted file mode 100644 index dfda44170f..0000000000 --- a/packages/x11/font/font-util-host/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="font-util-host" -PKG_VERSION="" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.X.org" -PKG_URL="" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain util-macros" -PKG_PRIORITY="optional" -PKG_SECTION="x11/font" -PKG_SHORTDESC="font-util: X.org font utilities" -PKG_LONGDESC="X.org font utilities." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/x11/font/font-util/build b/packages/x11/font/font-util/build deleted file mode 100755 index 76393a3816..0000000000 --- a/packages/x11/font/font-util/build +++ /dev/null @@ -1,34 +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 -mkdir -p .objdir-target && cd .objdir-target - -../configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --with-mapdir=/usr/share/fonts/util - -make -$MAKEINSTALL diff --git a/packages/x11/font/font-util/install b/packages/x11/font/font-util/install deleted file mode 100755 index 06fdba6ace..0000000000 --- a/packages/x11/font/font-util/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/share/fonts/util - cp $PKG_BUILD/map-* $INSTALL/usr/share/fonts/util diff --git a/packages/x11/font/font-util/meta b/packages/x11/font/font-util/package.mk similarity index 86% rename from packages/x11/font/font-util/meta rename to packages/x11/font/font-util/package.mk index 8f2a7d8667..7137ef6cdf 100644 --- a/packages/x11/font/font-util/meta +++ b/packages/x11/font/font-util/package.mk @@ -26,11 +26,18 @@ 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_BUILD_DEPENDS_HOST="toolchain util-macros" PKG_PRIORITY="optional" PKG_SECTION="x11/font" PKG_SHORTDESC="font-util: X.org font utilities" PKG_LONGDESC="X.org font utilities." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="yes" + +PKG_CONFIGURE_OPTS_TARGET="--with-mapdir=/usr/share/fonts/util" + +post_makeinstall_target() { + rm -rf $INSTALL/usr/bin +}