[arch-commits] Commit in xorg-fonts-100dpi/trunk (PKGBUILD)

[Allan McRae]

    Date: Friday, February 17, 2012 @ 06:05:09
  Author: allan
Revision: 150385

upgpkg: xorg-fonts-100dpi 1.0.1-4

signing rebuild

Modified:
  xorg-fonts-100dpi/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-17 10:44:15 UTC (rev 150384)
+++ PKGBUILD	2012-02-17 11:05:09 UTC (rev 150385)
@@ -3,9 +3,9 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-fonts-100dpi
 pkgver=1.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org 100dpi fonts"
-arch=(any)
+arch=('any')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig')
@@ -24,19 +24,27 @@
 
 build() {
   cd "${srcdir}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-
   for dir in font-*-100dpi*; do
     if [ -d "${dir}" ]; then
       pushd ${dir}
       ./configure --prefix=/usr \
           --with-fontdir=/usr/share/fonts/100dpi
-      make || return 1
-      make DESTDIR="${pkgdir}" install || return 1
-  
-      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}" || return 1
+      make
       popd
     fi
   done
+}
+
+package() {
+  cd "${srcdir}"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  for dir in font-*-100dpi*; do
+    if [ -d "${dir}" ]; then
+      pushd ${dir}
+      make DESTDIR="${pkgdir}" install
+      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}"
+      popd
+    fi
+  done
   rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.*
 }