[arch-commits] Commit in artwiz-fonts/repos (3 files)

[Eric Bélanger]

    Date: Thursday, March 26, 2009 @ 02:08:53
  Author: eric
Revision: 31373

Fixed svn conflict

Modified:
  artwiz-fonts/repos/extra-x86_64/	(properties)
  artwiz-fonts/repos/extra-x86_64/PKGBUILD
  artwiz-fonts/repos/extra-x86_64/artwiz-fonts.install

----------------------+
 PKGBUILD             |   19 ++++++++++---------
 artwiz-fonts.install |    5 -----
 2 files changed, 10 insertions(+), 14 deletions(-)


Property changes on: artwiz-fonts/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /artwiz-fonts/trunk:1
   + /artwiz-fonts/trunk:1-31372

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-26 06:06:39 UTC (rev 31372)
+++ extra-x86_64/PKGBUILD	2009-03-26 06:08:53 UTC (rev 31373)
@@ -3,18 +3,19 @@
 
 pkgname=artwiz-fonts
 pkgver=1.3
-pkgrel=3
+pkgrel=4
 pkgdesc="This is set of (improved) artwiz fonts."
-arch=(i686 x86_64)
-url="http://fluxbox.sourceforge.net/artwiz-aleczapka/readme.htm"
-depends=(xorg-fonts-encodings xorg-font-utils fontconfig)
+arch=('i686' 'x86_64')
+url="http://artwizaleczapka.sourceforge.net/"
+license=('GPL2')
+depends=('xorg-fonts-encodings' 'xorg-font-utils' 'fontconfig')
 install=artwiz-fonts.install
-source=(http://dl.sourceforge.net/sourceforge/artwizaleczapka/artwiz-aleczapka-en-${pkgver}.tar.bz2)
+source=(http://downloads.sourceforge.net/sourceforge/artwizaleczapka/artwiz-aleczapka-en-${pkgver}.tar.bz2)
 md5sums=(6c6c704f2f08f9d6308d366423dfa90e)
 
 build() {
-    cd ${startdir}/src/artwiz-aleczapka-en-${pkgver}
-    mkdir -p ${startdir}/pkg/usr/share/fonts/artwiz-fonts
-    install -m644 *.pcf ${startdir}/pkg/usr/share/fonts/artwiz-fonts/
-    install -m644 fonts.alias ${startdir}/pkg/usr/share/fonts/artwiz-fonts/
+  cd ${srcdir}/artwiz-aleczapka-en-${pkgver}
+  install -d ${pkgdir}/usr/share/fonts/artwiz-fonts
+  install -m644 *.pcf ${pkgdir}/usr/share/fonts/artwiz-fonts/ || return 1
+  install -m644 fonts.alias ${pkgdir}/usr/share/fonts/artwiz-fonts/ || return 1
 }

Modified: extra-x86_64/artwiz-fonts.install
===================================================================
--- extra-x86_64/artwiz-fonts.install	2009-03-26 06:06:39 UTC (rev 31372)
+++ extra-x86_64/artwiz-fonts.install	2009-03-26 06:08:53 UTC (rev 31373)
@@ -13,8 +13,3 @@
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-
-$op $*