[arch-commits] Commit in xaw3d/trunk (ChangeLog PKGBUILD)

[Eric Bélanger]

    Date: Sunday, May 22, 2011 @ 23:13:29
  Author: eric
Revision: 124576

upgpkg: xaw3d 1.5E-3
Rebuilt with latest gcc, Removed force option, Removed ChangeLog

Modified:
  xaw3d/trunk/PKGBUILD
Deleted:
  xaw3d/trunk/ChangeLog

-----------+
 ChangeLog |   15 ---------------
 PKGBUILD  |   32 +++++++++++++++++---------------
 2 files changed, 17 insertions(+), 30 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-05-23 01:24:01 UTC (rev 124575)
+++ ChangeLog	2011-05-23 03:13:29 UTC (rev 124576)
@@ -1,15 +0,0 @@
-2009-05-10  Jan de Groot  <jgc at archlinux.org>
-
-	* xaw3d 1.5E-2
-	* Build without libxp (requires latest imake)
-	* Simplify PKGBUILD a bit
-	* Add extra patches from Fedora
-	* Fix URL
-
-2008-12-14  Eric Belanger  <eric at archlinux.org>
-
-	* xaw3d 1.5E-1
-	* Upstream update
-	* Updated url
-	* Added misc. patches
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-23 01:24:01 UTC (rev 124575)
+++ PKGBUILD	2011-05-23 03:13:29 UTC (rev 124576)
@@ -1,17 +1,16 @@
 # $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Judd Vinet <jvinet at zeroflux.org>
+# Maintainer: Eric Bélanger <eric at 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 @@
 
 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"
+}