Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/pigeonhole/PKGBUILD
	community/pv/PKGBUILD
	community/python-gnupginterface/PKGBUILD
	community/tdl/PKGBUILD
	extra/clisp/PKGBUILD
	extra/expect/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hspell/PKGBUILD
	extra/id3lib/PKGBUILD
	extra/imake/PKGBUILD
	extra/libfontenc/PKGBUILD
	extra/libice/PKGBUILD
	extra/libsm/PKGBUILD
	extra/libspectre/PKGBUILD
	extra/libtasn1/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxaw/PKGBUILD
	extra/libxxf86dga/PKGBUILD
	extra/mp3splt/PKGBUILD
	extra/multitail/PKGBUILD
	extra/nss_ldap/PKGBUILD
	extra/pam_ldap/PKGBUILD
	extra/recode/PKGBUILD
	extra/ruby/PKGBUILD
	extra/squid/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/umfpack/PKGBUILD
	extra/xorg-xbacklight/PKGBUILD
	extra/xorg-xbiff/PKGBUILD
	extra/xorg-xcalc/PKGBUILD
	extra/xorg-xconsole/PKGBUILD
	extra/xorg-xedit/PKGBUILD
	extra/xorg-xeyes/PKGBUILD
	extra/xorg-xvinfo/PKGBUILD

1 files changed, 32 insertions, 25 deletions

diff --git a/extra/imake/PKGBUILD b/extra/imake/PKGBUILD
index a0196e69f..081ea2426 100644
--- a/extra/imake/PKGBUILD
+++ b/extra/imake/PKGBUILD
@@ -1,46 +1,53 @@
-# $Id: PKGBUILD 87585 2010-08-17 07:28:34Z jgc $
+# $Id: PKGBUILD 151214 2012-02-25 08:26:04Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=imake
-pkgver=1.0.3
-pkgrel=2
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X.Org imake program and related utilities"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=(glibc)
-makedepends=(pkgconfig xproto perl)
+depends=('glibc')
+makedepends=('pkgconfig' 'xproto' 'perl')
 optdepends=('perl: for mkhtmlindex')
-source=(http://xorg.freedesktop.org/releases/individual/util/imake-1.0.3.tar.bz2
-	http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2
-	http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.2.tar.bz2
-	http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.2.tar.bz2
-	http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.3.tar.bz2
-	linuxconfig.patch
-	xorg-cf-files-1.0.2-xprint.patch
-	LICENSE)
-md5sums=('ff553c4646edcc9e76b7308991ad421a'
+source=("http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2"
+        'http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2'
+        'http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.2.tar.bz2'
+        'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2'
+        'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.4.tar.bz2'
+        'linuxconfig.patch'
+        'LICENSE')
+md5sums=('48133c75bd77c127c7eff122e08ebbf6'
          'b533c0771dbbaf9b041ff35bb941d3a2'
          '619acbb2ed766d7762f02328513b1f72'
-         '62e58330fe8d1e3e28c7a45779833a48'
-         '10546b5ddda3cdda7950bb56bf98e0ea'
+         '4e6cb97bbecfbb34f3f644a75e513093'
+         '700c6d040d36a569e657a3ba5e1d8b24'
          'b3385d8efbbe7c7fc50ed3a96ce37a16'
-         '82356cfc8a761c85b0b37736fc91f604'
          'f5767133ef7a98a0bfa15139e0e3d32e')
 
 build() {
-  cd ${srcdir}/xorg-cf-files-1.0.3*
-  patch -Np1 -i "${srcdir}/linuxconfig.patch" || return 1
-  patch -Np1 -i "${srcdir}/xorg-cf-files-1.0.2-xprint.patch" || return 1
+  cd ${srcdir}/xorg-cf-files-1.0.4
+  patch -p1 -i "${srcdir}/linuxconfig.patch"
   cd "${srcdir}"
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
-      ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-      make || return 1
-      make DESTDIR="${pkgdir}" install || return 1
+      ./configure --prefix=/usr --mandir=/usr/share/man
+      make
       popd
     fi
   done
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+}
+
+package() {
+  cd "${srcdir}"
+  for i in *; do
+    if [ -d "${i}" ]; then
+      pushd "${i}"
+      make DESTDIR="${pkgdir}" install
+      popd
+    fi
+  done
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }