Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg73.git;a=commitdiff;h=1d83fe1a7d0bc0e77d7f9dbd9611dc5cc4335da9

commit 1d83fe1a7d0bc0e77d7f9dbd9611dc5cc4335da9
Author: crazy <[EMAIL PROTECTED]>
Date:   Sat Jan 19 14:34:40 2008 +0100

font-bh-ttf-1.0.0-2-i686
* fixed scriptlet issues

diff --git a/source/x11/font-bh-ttf/FrugalBuild 
b/source/x11/font-bh-ttf/FrugalBuild
index 74b18fd..dadb6b7 100644
--- a/source/x11/font-bh-ttf/FrugalBuild
+++ b/source/x11/font-bh-ttf/FrugalBuild
@@ -3,16 +3,14 @@

pkgname=font-bh-ttf
pkgver=1.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="X.Org Bigelow & Holmes TTF Fontset"
url="http://xorg.freedesktop.org";
groups=('x11' 'xorg-core' 'xorg-fonts')
archs=('i686' 'x86_64')
depends=('mkfontscale' 'mkfontdir' 'fontconfig' 'ttmkfdir')
-_F_xorg_nr=0
Finclude xorg
source=([EMAIL PROTECTED] mkfontscale-fix.patch)
-install=$pkgname.install

build() {
Fcd
@@ -22,8 +20,5 @@ build() {
Fmakeinstall
}

-# optimalization OK
-
-# vim: ft=sh
sha1sums=('c39ba9c60468c1ab1a2efadb84b46df4a94f215e' \
'd3bcecf7965972e08ed772cd43ac9be8db68a279')
diff --git a/source/x11/font-bh-ttf/font-bh-ttf.install 
b/source/x11/font-bh-ttf/font-bh-ttf.install
index d89c044..f97a925 100644
--- a/source/x11/font-bh-ttf/font-bh-ttf.install
+++ b/source/x11/font-bh-ttf/font-bh-ttf.install
@@ -1,33 +1,20 @@
post_install()
{
-       echo -n "updating fonts scale... "
-       mkfontscale /usr/lib/X11/fonts/TTF
-       echo "done."
-       echo -n "updating fonts dir... "
-       mkfontdir /usr/lib/X11/fonts/TTF
-       echo "done."
-       echo -n "updating fonts cache... "
-       fc-cache /usr/lib/X11/fonts/TTF
-       echo "done."
-       echo -n "running ttmkfdir... "
-       /usr/bin/ttmkfdir -d /usr/lib/X11/fonts/TTF/
+       echo -n "updating fonts cache..."
+       mkfontscale /usr/lib/X11/fonts/misc
+       mkfontdir /usr/lib/X11/fonts/misc
+       /usr/bin/fc-cache --force --system-only
echo "done."
}

+post_upgrade()
+{
+       post_install
+}
+
post_remove()
{
-       echo -n "updating fonts scale... "
-       mkfontscale /usr/lib/X11/fonts/TTF
-       echo "done."
-       echo -n "updating fonts dir... "
-       mkfontdir /usr/lib/X11/fonts/TTF
-       echo "done."
-       echo -n "updating fonts cache... "
-       fc-cache /usr/lib/X11/fonts/TTF
-       echo "done."
-       echo -n "running ttmkfdir... "
-       /usr/bin/ttmkfdir -d /usr/lib/X11/fonts/TTF/
-       echo "done."
+       post_install
}

op=$1
@@ -35,4 +22,3 @@ shift

$op $*

-# vim: ft=sh
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to