From 87e20a64534e8f58ca4a4f84000b629e48569a98 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Mon, 23 May 2011 22:47:30 +0000
Subject: Mon May 23 22:47:30 UTC 2011

---
 extra/xaw3d/PKGBUILD | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'extra/xaw3d')

diff --git a/extra/xaw3d/PKGBUILD b/extra/xaw3d/PKGBUILD
index 5cbb0e0a1..8854d9e98 100644
--- a/extra/xaw3d/PKGBUILD
+++ b/extra/xaw3d/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 38896 2009-05-10 18:12:17Z jgc $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# $Id: PKGBUILD 124576 2011-05-23 03:13:29Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xaw3d
 pkgver=1.5E
-pkgrel=2
+pkgrel=3
 pkgdesc="Three-D Athena widgets"
 arch=('i686' 'x86_64')
 url="http://directory.fsf.org/project/xaw3d/"
 license=('MIT')
 depends=('libxmu' 'libxpm')
 makedepends=('imake')
-options=('!makeflags' 'force')
+options=('!makeflags')
 source=(ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-${pkgver}.tar.gz
         Xaw3d-1.5E-xorg-imake.patch
 	Xaw3d-1.5-i18n.patch
@@ -33,17 +32,20 @@ md5sums=('29ecfdcd6bcf47f62ecfd672d31269a1'
 
 build() {
   cd "${srcdir}/xc/lib/Xaw3d"
-  patch -Np0 -i "${srcdir}/Xaw3d-1.5E-xorg-imake.patch" || return 1
-  patch -Np4 -i "${srcdir}/xaw3d.patch" || return 1
-  patch -Np4 -i "${srcdir}/Xaw3d-ia64.patch" || return 1
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5-i18n.patch" || return 1
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5-box.c.patch" || return 1
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5-debian-fixes.patch" || return 1
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5E-warnings.patch" || return 1
-
+  patch -Np0 -i "${srcdir}/Xaw3d-1.5E-xorg-imake.patch"
+  patch -Np4 -i "${srcdir}/xaw3d.patch"
+  patch -Np4 -i "${srcdir}/Xaw3d-ia64.patch"
+  patch -Np4 -i "${srcdir}/Xaw3d-1.5-i18n.patch"
+  patch -Np4 -i "${srcdir}/Xaw3d-1.5-box.c.patch"
+  patch -Np4 -i "${srcdir}/Xaw3d-1.5-debian-fixes.patch"
+  patch -Np4 -i "${srcdir}/Xaw3d-1.5E-warnings.patch"
   ln -s .. X11
-  xmkmf || return 1
+  xmkmf
   make CDEBUGFLAGS="${CFLAGS} -DARROW_SCROLLBAR"
-  make DESTDIR="${pkgdir}" SHLIBDIR=/usr/lib INCDIR=/usr/include install || return 1
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+}
+
+package() {
+  cd "${srcdir}/xc/lib/Xaw3d"
+  make DESTDIR="${pkgdir}" SHLIBDIR=/usr/lib INCDIR=/usr/include install
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-- 
cgit v1.2.3-54-g00ecf