[arch-commits] Commit in figlet/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Bélanger]

    Date: Friday, April 3, 2009 @ 02:52:52
  Author: eric
Revision: 32962

Fixed svn conflict

Modified:
  figlet/repos/extra-x86_64/	(properties)
  figlet/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)


Property changes on: figlet/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /figlet/trunk:1
   + /figlet/trunk:1-32961

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-03 06:51:51 UTC (rev 32961)
+++ extra-x86_64/PKGBUILD	2009-04-03 06:52:52 UTC (rev 32962)
@@ -4,21 +4,23 @@
 
 pkgname=figlet
 pkgver=2.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="FIGlet is a program for making large letters out of ordinary text"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+url="http://www.figlet.org/"
+license=('custom:Academic')
 depends=('glibc')
-source=(ftp://ftp.figlet.org/pub/figlet/program/unix/$pkgname`echo $pkgver | sed 's/\.//g'`.tar.gz)
-url="http://www.figlet.org/"
-md5sums=('9fcf4f1651b8e6d3f56f1ef665285b2e')
+source=(ftp://ftp.figlet.org/pub/figlet/program/unix/$pkgname${pkgver//./}.tar.gz)
+md5sums=('5f84ad52d092d5db4ad5916df767646b')
 
 build() {
-  cd $startdir/src/$pkgname`echo $pkgver | sed 's/\.//g'`
+  cd $srcdir/$pkgname${pkgver//./}
   make DEFAULTFONTDIR=/usr/share/figlet/fonts all || return 1
-  mkdir -p $startdir/pkg/usr/{bin,man/man6,share/figlet/fonts}
+  install -d $pkgdir/usr/{bin,share/man/man6,share/figlet/fonts} || return 1
   make install \
-    DESTDIR=$startdir/pkg/usr/bin \
-    MANDIR=$startdir/pkg/usr/man/man6 \
-    DEFAULTFONTDIR=$startdir/pkg/usr/share/figlet/fonts
-  chmod 755 $startdir/pkg/usr/bin/{figlist,showfigfonts}
+    DESTDIR=$pkgdir/usr/bin \
+    MANDIR=$pkgdir/usr/share/man/man6 \
+    DEFAULTFONTDIR=$pkgdir/usr/share/figlet/fonts || return 1
+  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || return 1
+  chmod 755 $pkgdir/usr/bin/{figlist,showfigfonts}
 }