Tue Jun 14 22:59:43 UTC 2011

7 files changed, 69 insertions, 53 deletions

diff --git a/extra/bochs/PKGBUILD b/extra/bochs/PKGBUILD
index 859c5d737..0e4920fe7 100644
--- a/extra/bochs/PKGBUILD
+++ b/extra/bochs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127306 2011-06-13 00:31:34Z kevin $
+# $Id: PKGBUILD 127309 2011-06-13 01:13:14Z kevin $
 #Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 
@@ -9,14 +9,12 @@ pkgdesc="A portable x86 PC emulation software package"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://bochs.sourceforge.net/"
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-2.4.5-fetchcode.patch)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 depends=('gcc-libs' 'libxrandr')
-# 'libxpm')
+sha256sums=('689dcc5fccfd70c8340a54986f0cb9c2824009ed602718802868333da9ac53b9')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  #patch -Np0 -i ${srcdir}/2.4.5-fetchcode.patch
   ./configure --prefix=/usr --enable-vbe --without-wx --enable-cpu-level=6 \
               --enable-fpu --enable-3dnow 
   make
@@ -27,5 +25,3 @@ package() {
   make prefix=${pkgdir}/usr install
   install -D -m 644 .bochsrc ${pkgdir}/etc/bochsrc-sample.txt
 }
-sha256sums=('689dcc5fccfd70c8340a54986f0cb9c2824009ed602718802868333da9ac53b9'
-            '3dba808614da7d0fa1a3d6ddaceabf027a873d1f45fb90ec43b8dce876baa8ff')
diff --git a/extra/icewm/PKGBUILD b/extra/icewm/PKGBUILD
index c8e7f282c..7c7951c04 100644
--- a/extra/icewm/PKGBUILD
+++ b/extra/icewm/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 63924 2010-01-19 03:33:08Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@gmx.net>
+# $Id: PKGBUILD 127320 2011-06-13 04:06:23Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=icewm
-pkgver=1.2.37
-pkgrel=3
+pkgver=1.3.7
+pkgrel=1
 pkgdesc="A Window Manager designed for speed, usability, and consistency"
 arch=('i686' 'x86_64')
 url="http://www.icewm.org/"
 license=('LGPL')
-depends=('gcc-libs' 'imlib' 'libxrandr' 'libxft' 'libsm' 'libxinerama' 'giflib')
-source=(http://downloads.sourceforge.net/sourceforge/icewm/${pkgname}-${pkgver}.tar.gz icewm.desktop)
-md5sums=('970a21588d26eb361020fd60a61a482c' 'a3ed467f0199792205b04272402a9945')
-sha1sums=('bee1ca66d2282888807551bc28a65b08e4108027' '7dcb1f2c89792a35b687182584ed9baa0d34cc80')
+depends=('libxrandr' 'libxft' 'libsm' 'libxinerama' 'gdk-pixbuf2')
+makedepends=('xorg-mkfontdir')
+source=(http://downloads.sourceforge.net/sourceforge/icewm/${pkgname}-${pkgver}.tar.gz)
+md5sums=('224695231aedb2b91db3254a13e1c8dd')
+sha1sums=('ce8d86190e275dc7db2d8c28472a579264120803')
 
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   ./configure --prefix=/usr --sysconfdir=/etc --with-imlib \
-     --enable-shaped-decorations --enable-gradients || return 1
-   make || return 1
-   make DESTDIR="${pkgdir}" install install-man install-docs || return 1
-   install -D -m644 "${srcdir}/icewm.desktop" "${pkgdir}/etc/X11/sessions/icewm.desktop" || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-shaped-decorations --enable-gradients
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install install-man install-docs install-desktop
 }
diff --git a/extra/indent/PKGBUILD b/extra/indent/PKGBUILD
index de378611e..8ac2de017 100644
--- a/extra/indent/PKGBUILD
+++ b/extra/indent/PKGBUILD
@@ -1,31 +1,33 @@
-# $Id: PKGBUILD 53903 2009-10-03 20:21:21Z eric $
+# $Id: PKGBUILD 127328 2011-06-13 05:26:28Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: aurelien <aurelien@archlinux.org>
 # Contributor: Herb Rose (hrose56@yahoo.com)
 
 pkgname=indent
-pkgver=2.2.10
-pkgrel=4
-pkgdesc="The GNU Pretty-printer"
+pkgver=2.2.11
+pkgrel=1
+pkgdesc="A tool to change the appearance of a C program by inserting or deleting whitespace"
 arch=('i686' 'x86_64')
 url="http://indent.isidore-it.eu/beautify.html"
-depends=('glibc' 'texinfo')
+depends=('glibc')
+makedepends=('texi2html')
 license=('GPL3')
 install=indent.install
-source=(http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz)
-md5sums=('be35ea62705733859fbf8caf816d8959')
-sha1sums=('20fa8a7a4af6670c3254c8b87020291c3db37ed1')
+source=(http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz indent-2.2.11-segfault.patch)
+md5sums=('98beafca62472805a3739d3867d5d70f'
+         'e5ded8513547ff4555dec2bb805dd2ab')
+sha1sums=('9b242528bbc4914464117c69ffae9df24d3fa4a7'
+          '31a6dcd5edcac4decac81dbb52bc9415b8b148e4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  # Fix doc install path
-  sed -i 's|^docdir = .*$|docdir = @docdir@|' doc/Makefile.in || return 1
-  
-  # Fix manpage installation
-  sed -i 's|\(info texinfo2man\)\.c  Makefile\.am|\1|' man/Makefile.in || return 1
-  rm man/indent.1
+  patch -p1 -i ../indent-2.2.11-segfault.patch
+  sed -i 's/-number/-number-sections/' doc/Makefile.in
+  ./configure --prefix=/usr
+  make
+}
 
-  ./configure --prefix=/usr --datadir=/usr/share --docdir=/usr/share/doc/indent || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" docdir=/usr/share/doc/indent install
 }
diff --git a/extra/indent/indent-2.2.11-segfault.patch b/extra/indent/indent-2.2.11-segfault.patch
new file mode 100644
index 000000000..e91922480
--- /dev/null
+++ b/extra/indent/indent-2.2.11-segfault.patch
@@ -0,0 +1,16 @@
+--- a/man/texinfo2man.c
++++ b/man/texinfo2man.c
+@@ -287,6 +287,13 @@
+    char buf[1024];
+    int line_no = 0;
+ 
++   if (argc != 3)
++   {
++      fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
++      fprintf(stderr, "  The man page will be written to stdout.\n");
++      return -1;
++   }
++
+    texinfoname = argv[2];
+ 
+    in = fopen (argv[2], "r");
diff --git a/extra/indent/indent.install b/extra/indent/indent.install
index c48622c55..c5a87a6d9 100644
--- a/extra/indent/indent.install
+++ b/extra/indent/indent.install
@@ -1,7 +1,8 @@
-info_dir=/usr/share/info
+info_dir=usr/share/info
 info_file=indent.info.gz
 
 post_install() {
+    [ -x usr/bin/install-info ] || return 0
     install-info ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
 }
 
@@ -10,5 +11,6 @@ post_upgrade() {
 }
 
 pre_remove() {
+    [ -x usr/bin/install-info ] || return 0
     install-info --delete ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
 }
diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD
index f33702fb4..7cdcf8bfa 100644
--- a/extra/lcms2/PKGBUILD
+++ b/extra/lcms2/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 111439 2011-02-26 20:12:41Z heftig $
+# $Id: PKGBUILD 127369 2011-06-13 20:26:40Z eric $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=lcms2
-pkgver=2.1
+pkgver=2.2
 pkgrel=1
 pkgdesc="Small-footprint color management engine, version 2"
 arch=(i686 x86_64)
-license=('custom')
+license=('MIT')
 depends=('libtiff>=3.9.4')
 url="http://www.littlecms.com"
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/lcms/$pkgname-$pkgver.tar.gz)
-md5sums=('08036edb115ad74456dfa20b1998b5f4')
+md5sums=('aaf33c7c25675e6163189ba488ae20f5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD
index 3961405be..76b468174 100644
--- a/extra/smartmontools/PKGBUILD
+++ b/extra/smartmontools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96222 2010-10-19 12:09:31Z giovanni $
+# $Id: PKGBUILD 127374 2011-06-14 00:06:39Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Jani Talikka <jani.talikka@gmail.com>
 # Contributor: Ralf Barth <archlinux.org@haggy.org>
 
 pkgname=smartmontools
-pkgver=5.40
+pkgver=5.41
 pkgrel=1
 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives."
 url="http://smartmontools.sourceforge.net"
@@ -17,25 +17,23 @@ backup=('etc/smartd.conf'
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \
         smartd.conf
         smartd.rc)
-md5sums=('0f0be0239914ad87830a4fff594bda5b'
+md5sums=('4577886bea79d4ff12bd9a7d323ce692'
          '28c1b80c41dac52d433961dcfb4f70e0'
          'fb30e07f87f2c1d99532e018291ad3e8')
 
-build()
-{
+build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --enable-drivedb
-  make || return 1
+  make
 }
 
-package()
-{
+package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR=${pkgdir}/ install || return 1
+  make DESTDIR=${pkgdir}/ install
   rm -rf ${pkgdir}/etc/rc.d
   install -Dm755 ${srcdir}/smartd.rc ${pkgdir}/etc/rc.d/smartd
   install -Dm644 ${srcdir}/smartd.conf ${pkgdir}/etc/conf.d/smartd