Thu Dec 8 23:14:54 UTC 2011

26 files changed, 93 insertions, 73 deletions

diff --git a/community/confuse/PKGBUILD b/community/confuse/PKGBUILD
index 6f713df50..e423110d6 100755
--- a/community/confuse/PKGBUILD
+++ b/community/confuse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 17258 2010-05-22 14:32:23Z ibiru $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org>
diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD
index 42b0688a1..4cf31e845 100644
--- a/community/devil/PKGBUILD
+++ b/community/devil/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 57890 2011-11-04 08:33:14Z lcarlier $
-# Maintainer: damir <damir@archlinux.org>
+# $Id: PKGBUILD 60209 2011-12-07 16:29:05Z svenstaro $
+# Maintainer: Laurent Carlier <lordheavym@gmail.org>
+# Contributor: damir <damir@archlinux.org>
 # Contributor: TheHoff <forums>
 
 pkgname=devil
 pkgver=1.7.8
-pkgrel=8
+pkgrel=9
 pkgdesc="Library for reading several different image formats"
 arch=('i686' 'x86_64')
 url="http://openil.sourceforge.net/"
-depends=('allegro4' 'sdl' 'libpng' 'libmng' 'freeglut'
-         'jasper' 'lcms' 'openexr')
-makedepends=('bash')
-options=('!libtool' '!docs')
+depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr')
+install=devil.install
+options=('!libtool' '!docs' '!emptydirs')
 license=('GPL')
 source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz libpng14.patch)
 md5sums=('7918f215524589435e5ec2e8736d5e1d'
@@ -22,7 +22,7 @@ build() {
 
    patch -Np1 -i ${srcdir}/libpng14.patch
 
-   ./configure --prefix=/usr --enable-ILU --enable-ILUT --enable-opengl --enable-sdl
+   ./configure --prefix=/usr --enable-ILU
    make
 }
 
diff --git a/community/devil/devil.install b/community/devil/devil.install
new file mode 100644
index 000000000..8336ac3d1
--- /dev/null
+++ b/community/devil/devil.install
@@ -0,0 +1,11 @@
+infodir=usr/share/info
+
+post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info --delete $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null
+}
diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD
index 9dca2de4f..d37772530 100755
--- a/community/e-svn/PKGBUILD
+++ b/community/e-svn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58075 2011-11-06 10:13:58Z rvanharen $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD
index 7c8118bc1..3c42396b4 100755
--- a/community/e_dbus-svn/PKGBUILD
+++ b/community/e_dbus-svn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58073 2011-11-06 10:12:55Z rvanharen $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD
index c86eacb82..d5ee6b31c 100755
--- a/community/ecore-svn/PKGBUILD
+++ b/community/ecore-svn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58089 2011-11-06 13:31:05Z rvanharen $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD
index 369425178..4b8b9490d 100755
--- a/community/edje-svn/PKGBUILD
+++ b/community/edje-svn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58090 2011-11-06 13:31:38Z rvanharen $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD
index 7da79c631..e53fc77d4 100755
--- a/community/eet-svn/PKGBUILD
+++ b/community/eet-svn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58091 2011-11-06 13:32:00Z rvanharen $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD
index fa3d8cb5b..d8b0f9208 100755
--- a/community/efreet-svn/PKGBUILD
+++ b/community/efreet-svn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58071 2011-11-06 10:11:44Z rvanharen $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD
index 938434454..bab9bbd9b 100755
--- a/community/eina-svn/PKGBUILD
+++ b/community/eina-svn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58057 2011-11-06 10:03:11Z rvanharen $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD
index 081fcf857..1b110b70f 100755
--- a/community/embryo-svn/PKGBUILD
+++ b/community/embryo-svn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58067 2011-11-06 10:07:33Z rvanharen $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD
index b8e545dcc..8553e2ba5 100755
--- a/community/emesene/PKGBUILD
+++ b/community/emesene/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59461 2011-11-25 15:15:41Z jelle $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Claudio Riva <firetux83@gmail.com>
 
diff --git a/community/emprint-svn/PKGBUILD b/community/emprint-svn/PKGBUILD
index d428dfe0a..c32c6e363 100755
--- a/community/emprint-svn/PKGBUILD
+++ b/community/emprint-svn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 53118 2011-07-30 17:05:35Z rvanharen $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD
index 8f5405bac..a4cf223f7 100755
--- a/community/evas-svn/PKGBUILD
+++ b/community/evas-svn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58061 2011-11-06 10:05:15Z rvanharen $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD
index 4bb0100c0..9dc24f933 100755
--- a/community/fcron/PKGBUILD
+++ b/community/fcron/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 42747 2011-03-20 15:07:32Z ttopper $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Contributor: Giorgio Lando <lando at imap dot cc>
 # Contributor: Sergej Pupykin
 # Contributor: Thomas Bächler
diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD
index ea0ed67f0..b71ab6e15 100755
--- a/community/libfbclient/PKGBUILD
+++ b/community/libfbclient/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58848 2011-11-18 21:30:35Z lcarlier $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Carlier Laurent <lordheavym@gmail.com>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
diff --git a/community/libmilter/PKGBUILD b/community/libmilter/PKGBUILD
index 3154cc8b9..3d842fb77 100644
--- a/community/libmilter/PKGBUILD
+++ b/community/libmilter/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 56914 2011-10-16 12:39:57Z spupykin $
+# $Id: PKGBUILD 60205 2011-12-07 15:22:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: mutantmonkey <mutantmonkey@gmail.com>
 
 pkgname=libmilter
-pkgver=8.14.4
-pkgrel=3
+pkgver=8.14.5
+pkgrel=1
 pkgdesc="libmilter"
 arch=(i686 x86_64)
 url="http://www.postfix.org/MILTER_README.html"
 license=('custom:Sendmail open source license')
 source="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${pkgver}.tar.gz"
-md5sums=('1b23d5000c8e7bfe82ec1a27f2f5fdc5')
+md5sums=('02ccfc331cc81ed00ec8bb5ecfc69018')
 
 build(){
   cd "${srcdir}/sendmail-${pkgver}"
diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD
index c4cd987cd..b06b030e6 100755
--- a/community/pragha/PKGBUILD
+++ b/community/pragha/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58664 2011-11-17 11:39:42Z ttopper $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 # Contributor:  JerichoKru   <jerichokru(AT)htomail.com>
diff --git a/community/python-psycopg1/PKGBUILD b/community/python-psycopg1/PKGBUILD
index f5ad4cc39..99cafbacb 100755
--- a/community/python-psycopg1/PKGBUILD
+++ b/community/python-psycopg1/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 27290 2010-09-19 04:29:33Z ebelanger $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=python-psycopg1
diff --git a/community/python-pyro/PKGBUILD b/community/python-pyro/PKGBUILD
index d6dd0aa79..73e71f73c 100755
--- a/community/python-pyro/PKGBUILD
+++ b/community/python-pyro/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56634 2011-10-09 10:13:09Z angvp $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.br>
 pkgbase=python-pyro
diff --git a/community/python2-cheetah/PKGBUILD b/community/python2-cheetah/PKGBUILD
index 24ba9e35d..15d970e37 100755
--- a/community/python2-cheetah/PKGBUILD
+++ b/community/python2-cheetah/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56977 2011-10-17 13:24:23Z jelle $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Contributor: James Rayner <james@archlinux.org>
 # Contributor: Todd Maynard <arch@toddmaynard.com>
 
diff --git a/community/qstardict/PKGBUILD b/community/qstardict/PKGBUILD
index e265cc22b..8bcd24b0f 100755
--- a/community/qstardict/PKGBUILD
+++ b/community/qstardict/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 54585 2011-08-20 18:29:13Z jlichtblau $
+# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 7496a585b..ba1e4ef98 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59968 2011-12-02 21:01:02Z ibiru $
+# $Id: PKGBUILD 60207 2011-12-07 16:26:35Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
@@ -6,12 +6,12 @@
 pkgname=spring
 pkgver=0.84.0
 _pkgver=84.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64')
 url="http://springrts.com/"
 license=('GPL')
-depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis')
+depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl')
 makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2')
 optdepends=('python2: python-based bots'
             'java-runtime: java-based bots')
diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD
index e6e2387a5..70d7a4ca4 100644
--- a/community/sword/PKGBUILD
+++ b/community/sword/PKGBUILD
@@ -1,53 +1,57 @@
-# $Id: PKGBUILD 59377 2011-11-23 21:18:49Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 60193 2011-12-07 12:16:33Z arodseth $
+# Maintainer: Alexander Rødseth
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: TripleE <eric1548@yahoo.com>
-
 pkgname=sword
 pkgver=1.6.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Libraries for Bible programs"
-arch=('i686' 'x86_64')
-url="http://www.crosswire.org/sword/index.jsp"
+arch=('x86_64' 'i686')
+url="http://www.crosswire.org/sword/"
 license=('GPL')
 depends=('curl' 'clucene' 'swig')
 makedepends=('cmake')
 backup=('etc/sword.conf')
-source=("http://www.crosswire.org/ftpmirror/pub/${pkgname}/source/v1.6/${pkgname}-${pkgver}.tar.gz" curl.patch)
+source=("http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v1.6/$pkgname-$pkgver.tar.gz"
+        curl.patch)
 md5sums=('a7dc4456e20e915fec46d774b690e305'
          'e84a226ce3697af33b9fdd9a22884a2a')
 
 build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  patch -p1 -i $srcdir/curl.patch
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -p1 -i ../curl.patch
+
+  mkdir ../build
+  cd ../build
 
-  cd $srcdir
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake "../$pkgname-$pkgver" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
+
   make 
 }
 
 package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/build"
+
+  make DESTDIR="$pkgdir" install
 
-  # Ugly workarounds to fix a weird cmakelists.txt
-  install -d "${pkgdir}"/usr/lib/sword
-  mv "${pkgdir}"/usr/lib/1.6.2_icu_4.8* "${pkgdir}"/usr/lib/sword/
+  install -d "$pkgdir/usr/lib/sword"
+  mv "$pkgdir"/usr/lib/1.6.2_icu_4.8* "$pkgdir/usr/lib/sword/"
 
-  cd "${srcdir}"/${pkgname}-${pkgver}/locales.d/
+  cd "$srcdir/$pkgname-$pkgver/locales.d/"
   for file in *.conf; do
-    install -Dm644 $file "${pkgdir}"/usr/share/sword/locales.d/$file
+    install -Dm644 "$file" "$pkgdir/usr/share/sword/locales.d/$file"
   done
 
   cd ../include
-  install -d "${pkgdir}"/usr/include/sword
-  install -Dm644 canon_{catholic{,2},synodalp}.h "${pkgdir}"/usr/include/sword
+  install -d "$pkgdir/usr/include/sword"
+  install -Dm644 canon_{catholic{,2},synodalp}.h "$pkgdir/usr/include/sword"
 
   cd ../samples
-  install -Dm644 mods.d/globals.conf "${pkgdir}"/usr/share/sword/mods.d/globals.conf
-  install -Dm644 recommended/sword.conf "${pkgdir}"/etc/sword.conf
+  install -Dm644 mods.d/globals.conf "$pkgdir/usr/share/sword/mods.d/globals.conf"
+  install -Dm644 recommended/sword.conf "$pkgdir/etc/sword.conf"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/xiphos/PKGBUILD b/community/xiphos/PKGBUILD
index 0473d014b..1e6e80c69 100755
--- a/community/xiphos/PKGBUILD
+++ b/community/xiphos/PKGBUILD
@@ -1,31 +1,36 @@
-# $Id: PKGBUILD 49759 2011-06-20 22:11:59Z andrea $
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
+# $Id: PKGBUILD 60197 2011-12-07 12:42:03Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Andrea Scarpino
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: TripleE <eric1548@yahoo.com>
-
 pkgname=xiphos
 pkgver=3.1.4
-pkgrel=8
-pkgdesc="A Bible study tool for gtk"
-arch=('i686' 'x86_64')
-url="http://xiphos.org"
+pkgrel=9
+pkgdesc="Bible study tool for GTK+"
+arch=('x86_64' 'i686')
+url="http://xiphos.org/"
 license=('GPL')
-depends=('libgsf' 'libglade' 'gtkhtml' 'sword' 'hicolor-icon-theme')
+depends=('libgsf' 'libglade' 'gtkhtml' 'sword')
 makedepends=('gnome-doc-utils' 'intltool' 'python2')
 conflicts=('gnomesword')
 provides=('gnomesword')
 replaces=('gnomesword')
-install=$pkgname.install
+install=xiphos.install
 source=("http://downloads.sourceforge.net/gnomesword/$pkgname-$pkgver.tar.gz")
 md5sums=('4d6f7805c4c8185f5c4ac3bd95fc705a')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i '1s/python/python2/' waf
+  cd "$srcdir/$pkgname-$pkgver"
+
+  sed -i '0,/on/s//on2/' waf
   ./waf configure --prefix=/usr --enable-gtkhtml
   ./waf build --prefix=/usr 
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./waf install --destdir=$pkgdir
+  cd "$srcdir/$pkgname-$pkgver"
+
+  GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./waf install --destdir="$pkgdir"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/xiphos/xiphos.install b/community/xiphos/xiphos.install
index ada2ca2f2..048e77780 100644
--- a/community/xiphos/xiphos.install
+++ b/community/xiphos/xiphos.install
@@ -1,5 +1,3 @@
-pkgname=xiphos
-
 post_install() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
@@ -11,3 +9,5 @@ post_upgrade() {
 post_remove() {
   post_install
 }
+
+# vim:set ts=2 sw=2 et: