From 893163dfab775ed2e8ef2b04d7b1e035996750e5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 24 Mar 2009 05:37:30 +0100 Subject: [PATCH] font-bitstream-*: new deps style, set noarch. --HG-- extra : convert_revision : bc6b36a3e0c48eae3199007a28edabb6e380afb5 --- templates/font-bitstream-100dpi/template | 23 ++++++++++++++--------- templates/font-bitstream-75dpi/template | 23 ++++++++++++++--------- templates/font-bitstream-speedo/template | 22 +++++++++++++--------- templates/font-bitstream-type1/template | 22 +++++++++++++--------- 4 files changed, 54 insertions(+), 36 deletions(-) diff --git a/templates/font-bitstream-100dpi/template b/templates/font-bitstream-100dpi/template index 0ecdb0da3db..2cfbfb4cb53 100644 --- a/templates/font-bitstream-100dpi/template +++ b/templates/font-bitstream-100dpi/template @@ -1,21 +1,26 @@ # Template build file for 'font-bitstream-100dpi'. pkgname=font-bitstream-100dpi version=1.0.0 -distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" build_style=gnu_configure -make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard 100dpi Bitstream PCF fonts" maintainer="Juan RP " -checksum=ce7304b7d65d3bec9a75eafd07106858d06ced85 +checksum=0c705a74d7b52e41a1f1aa6732f0200877ba2d4303b79513a524e7cc1b30e2d2 long_desc=" - This are the PCF versions of the following Bitstream fonts for 100dpi displays: + This are the PCF versions of the following Bitstream fonts for + 100dpi displays: - Charter - Terminal This is from the modular Xorg project." -# Build fonts.dir and fonts.scale files after install. -fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/100dpi" -postinstall_helpers="mkfontxx-rebuild.sh" -ignore_files="fonts.scale fonts.dir" +Add_dependency full font-util + +noarch=yes +font_dirs="/usr/lib/X11/fonts/100dpi" +triggers="x11-fonts" + +post_install() +{ + rm -f ${DESTDIR}/${font_dirs}/fonts.* +} diff --git a/templates/font-bitstream-75dpi/template b/templates/font-bitstream-75dpi/template index 1ff5aaf7986..0785df644b3 100644 --- a/templates/font-bitstream-75dpi/template +++ b/templates/font-bitstream-75dpi/template @@ -1,21 +1,26 @@ # Template build file for 'font-bitstream-75dpi'. pkgname=font-bitstream-75dpi version=1.0.0 -distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" build_style=gnu_configure -make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard 100dpi Bitstream PCF fonts" maintainer="Juan RP " -checksum=b8218eb4bf25a5bda69a5034f8b582824b0b13f4 +checksum=2ddfeaccca97524e1b0f4fb37b2fd0f1338698e35f8b05b22b594fe29e201bfb long_desc=" - This are the PCF versions of the following Bitstream fonts for 75dpi displays: + These are the PCF versions of the following Bitstream fonts for + 75dpi displays: - Charter - Terminal This is from the modular Xorg project." -# Build fonts.dir and fonts.scale files after install. -fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/75dpi" -postinstall_helpers="mkfontxx-rebuild.sh" -ignore_files="fonts.scale fonts.dir" +Add_dependency full font-util + +noarch=yes +font_dirs="/usr/lib/X11/fonts/75pi" +triggers="x11-fonts" + +post_install() +{ + rm -f ${DESTDIR}/${font_dirs}/fonts.* +} diff --git a/templates/font-bitstream-speedo/template b/templates/font-bitstream-speedo/template index ca1d3103958..d32d3717b1a 100644 --- a/templates/font-bitstream-speedo/template +++ b/templates/font-bitstream-speedo/template @@ -1,20 +1,24 @@ # Template build file for 'font-bitstream-speedo'. pkgname=font-bitstream-speedo version=1.0.0 -distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" build_style=gnu_configure -make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard Speedo Bitstream PCF fonts" maintainer="Juan RP " -checksum=5b6a215a1e2f857fe48ea4e416260ddec92f3df7 +checksum=99ac01786ac400cc7407f1c427b92c5ff1ac5a31ce7d5907b7ad3c969214f6e6 long_desc=" - This are the PCF versions of the following Speedo Bitstream fonts: + These are the PCF versions of the following Speedo Bitstream fonts: - Speedo This is from the modular Xorg project." -# Build fonts.dir and fonts.scale files after install. -fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/Speedo" -postinstall_helpers="mkfontxx-rebuild.sh" -ignore_files="fonts.scale fonts.dir" +Add_dependency full font-util + +noarch=yes +font_dirs="/usr/lib/X11/fonts/Speedo" +triggers="x11-fonts" + +post_install() +{ + rm -f ${DESTDIR}/${font_dirs}/fonts.* +} diff --git a/templates/font-bitstream-type1/template b/templates/font-bitstream-type1/template index 7f258c68bf8..1d0b95994f2 100644 --- a/templates/font-bitstream-type1/template +++ b/templates/font-bitstream-type1/template @@ -1,20 +1,24 @@ # Template build file for 'font-bitstream-type1'. pkgname=font-bitstream-type1 version=1.0.0 -distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" build_style=gnu_configure -make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard Type1 Bitstream PCF fonts" maintainer="Juan RP " -checksum=7648f71312d2b79034ee00037a79dc0568450251 +checksum=4fce492dcf168837342ea1787ac35b53e4d30361239cba207c9520c42454d903 long_desc=" - This are the PCF versions of the following Type1 Bitstream fonts: + These are the PCF versions of the following Type1 Bitstream fonts: - Type1 This is from the modular Xorg project." -# Build fonts.dir and fonts.scale files after install. -fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/Type1" -postinstall_helpers="mkfontxx-rebuild.sh" -ignore_files="fonts.scale fonts.dir" +Add_dependency full font-util + +noarch=yes +font_dirs="/usr/lib/X11/fonts/Type1" +triggers="x11-fonts" + +post_install() +{ + rm -f ${DESTDIR}/${font_dirs}/fonts.* +}