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

[Allan McRae]

    Date: Friday, February 17, 2012 @ 04:54:09
  Author: allan
Revision: 150375

upgpkg: xorg-fonts-type1 7.4-2

signing rebuild

Modified:
  xorg-fonts-type1/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-17 09:47:11 UTC (rev 150374)
+++ PKGBUILD	2012-02-17 09:54:09 UTC (rev 150375)
@@ -3,7 +3,7 @@
 
 pkgname=xorg-fonts-type1
 pkgver=7.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org Type1 fonts"
 arch=(any)
 license=('custom')
@@ -23,17 +23,27 @@
 
 build() {
   cd "${srcdir}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   for dir in *; do
     if [ -d "${dir}" ]; then
       pushd "${dir}"
       ./configure --prefix=/usr \
-		      --with-fontdir=/usr/share/fonts/Type1 || return 1
-      make || return 1
-      make DESTDIR="${pkgdir}" install || return 1
-      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-*}" || return 1
+        --with-fontdir=/usr/share/fonts/Type1
+      make
       popd
     fi
   done
+}
+
+package() {
+  cd "${srcdir}"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  for dir in *; do
+    if [ -d "${dir}" ]; then
+      pushd "${dir}"
+      make DESTDIR="${pkgdir}" install
+      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-*}"
+      popd
+    fi
+  done
   rm -f "${pkgdir}"/usr/share/fonts/Type1/fonts.*
 }