[arch-commits] Commit in imake/trunk (PKGBUILD xorg-cf-files-1.0.2-xprint.patch)

[Pierre Schmitz]

    Date: Saturday, February 25, 2012 @ 03:24:24
  Author: pierre
Revision: 151212

upgpkg: imake 1.0.4-1

upstream update

Modified:
  imake/trunk/PKGBUILD
Deleted:
  imake/trunk/xorg-cf-files-1.0.2-xprint.patch

----------------------------------+
 PKGBUILD                         |   55 ++++++++++++++++++++-----------------
 xorg-cf-files-1.0.2-xprint.patch |   39 --------------------------
 2 files changed, 31 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-25 08:23:20 UTC (rev 151211)
+++ PKGBUILD	2012-02-25 08:24:24 UTC (rev 151212)
@@ -2,45 +2,52 @@
 # Maintainer: Jan de Groot <jgc at 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)
+arch=('i686' 'x86_64')
 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"
+}

Deleted: xorg-cf-files-1.0.2-xprint.patch
===================================================================
--- xorg-cf-files-1.0.2-xprint.patch	2012-02-25 08:23:20 UTC (rev 151211)
+++ xorg-cf-files-1.0.2-xprint.patch	2012-02-25 08:24:24 UTC (rev 151212)
@@ -1,39 +0,0 @@
---- xorg-cf-files-1.0.3/X11.tmpl.xprint	2005-10-01 12:45:48.000000000 -0400
-+++ xorg-cf-files-1.0.3/X11.tmpl	2006-04-25 20:24:02.000000000 -0400
-@@ -3920,21 +3920,13 @@
- #endif
- 
- #ifndef ExtraXawReqs
--# if BuildXaw
--#  define ExtraXawReqs $(XPLIB)
--# else
--#  define ExtraXawReqs /**/
--# endif
-+# define ExtraXawReqs /**/
- #endif
- 
- EXTRAXAWREQS = ExtraXawReqs
- 
- #ifndef ExtraXawClientDepLibs
--# if BuildXaw
--#  define ExtraXawClientDepLibs $(DEPXPLIB)
--# else
--#  define ExtraXawClientDepLibs /**/
--# endif
-+# define ExtraXawClientDepLibs /**/
- #endif
- 
- EXTRAXAWCLIENTDEPLIBS = ExtraXawClientDepLibs
-@@ -3944,11 +3936,7 @@
- #endif
- 
- #ifndef ExtraXawClientLibs
--# if BuildXaw
--#  define ExtraXawClientLibs $(XPLIB)
--# else
--#  define ExtraXawClientLibs /**/
--# endif
-+# define ExtraXawClientLibs /**/
- #endif
- 
- EXTRAXAWCLIENTLIBS = ExtraXawClientLibs