[arch-commits] Commit in ttf-tibetan-machine/repos (3 files)

[Eric Bélanger]

    Date: Sunday, May 3, 2009 @ 20:32:21
  Author: eric
Revision: 37848

Fixed svn conflict

Modified:
  ttf-tibetan-machine/repos/extra-x86_64/	(properties)
  ttf-tibetan-machine/repos/extra-x86_64/PKGBUILD
  ttf-tibetan-machine/repos/extra-x86_64/ttf.install

-------------+
 PKGBUILD    |   10 +++++-----
 ttf.install |    9 ++-------
 2 files changed, 7 insertions(+), 12 deletions(-)


Property changes on: ttf-tibetan-machine/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /ttf-tibetan-machine/trunk:1-8797
   + /ttf-tibetan-machine/trunk:1-37847

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-04 00:30:02 UTC (rev 37847)
+++ extra-x86_64/PKGBUILD	2009-05-04 00:32:21 UTC (rev 37848)
@@ -3,20 +3,20 @@
 
 pkgname=ttf-tibetan-machine
 pkgver=20020930
-pkgrel=1
+pkgrel=2
 pkgdesc="Tibetan Machine TTFont"
 arch=(i686 x86_64)
 url="http://www.thdl.org/tools/fonts/tibfonts.php?l=uva10928423419921"
+license=('GPL2')
 depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
 install=ttf.install
-license=('GPL')
 source=("http://www.thdl.org/tools/dls/fonts/TibetanMachineUnicodeFont.zip")
 md5sums=('39d9f6bf83362d45ed5d8d5f7831d153')
 
 build() {
-  cd ${startdir}/src
-  mkdir -p ${startdir}/pkg/usr/share/fonts/TTF
-  install -m644 *.ttf ${startdir}/pkg/usr/share/fonts/TTF/
+  cd ${srcdir}
+  install -d ${pkgdir}/usr/share/fonts/TTF
+  install -m644 *.ttf ${pkgdir}/usr/share/fonts/TTF/
 }
 
 

Modified: extra-x86_64/ttf.install
===================================================================
--- extra-x86_64/ttf.install	2009-05-04 00:30:02 UTC (rev 37847)
+++ extra-x86_64/ttf.install	2009-05-04 00:32:21 UTC (rev 37848)
@@ -1,8 +1,8 @@
 post_install() {
   echo -n "Updating font cache... "
   fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/TTF
-  mkfontdir /usr/share/fonts/TTF
+  mkfontscale usr/share/fonts/TTF
+  mkfontdir usr/share/fonts/TTF
   echo "done."
 }
 
@@ -13,8 +13,3 @@
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-
-$op $*