Sat Jun 25 23:07:08 UTC 2011

8 files changed, 79 insertions, 63 deletions

diff --git a/extra/catdoc/PKGBUILD b/extra/catdoc/PKGBUILD
index 2b46013c6..cf8523bff 100644
--- a/extra/catdoc/PKGBUILD
+++ b/extra/catdoc/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 31735 2009-03-28 03:50:45Z eric $
+# $Id: PKGBUILD 128489 2011-06-24 04:50:44Z eric $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Paulius Palevicius <paulius@birzai.com>
 
 pkgname=catdoc
 pkgver=0.94.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A convertor for Microsoft Word, Excel, PowerPoint and RTF Files to text"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.wagner.pp.ru/~vitus/software/catdoc/"
 license=('GPL')
 depends=('glibc')
@@ -16,9 +16,12 @@ source=(http://ftp.wagner.pp.ru/pub/catdoc/$pkgname-$pkgver.tar.gz)
 md5sums=('243e1680bb3e703616f5adecfee24491')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --with-wish=/usr/bin/wish || return 1
-  make || return 1
-  make installroot=$pkgdir mandir=/usr/share/man/man1 install || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr  --with-wish=/usr/bin/wish
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make installroot="$pkgdir" mandir=/usr/share/man/man1 install
 }
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/fortune-mod/PKGBUILD b/extra/fortune-mod/PKGBUILD
index 0737c5ab2..9cc9b6ac7 100644
--- a/extra/fortune-mod/PKGBUILD
+++ b/extra/fortune-mod/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 30775 2009-03-21 22:49:21Z eric $
+# $Id: PKGBUILD 128484 2011-06-24 04:37:24Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Dale Blount <archlinux@dale.us>
 
 pkgname=fortune-mod
 pkgver=1.99.1
-pkgrel=4
+pkgrel=5
 pkgdesc="The Fortune Cookie Program from BSD games"
 arch=('i686' 'x86_64')
 url="http://www.redellipse.net/code/fortune"
 license=('BSD')
 depends=('recode')
 source=(ftp://ftp.archlinux.org/other/fortune-mod/$pkgname-$pkgver.tar.gz LICENSE 01_all_fortune_all-fix.patch)
-md5sums=('f208805b3b712e32997d7667e0ec52d8' '0217481ae93971296cfb7872157cabb7'\
+md5sums=('f208805b3b712e32997d7667e0ec52d8'
+         '0217481ae93971296cfb7872157cabb7'
          'e85b073f16dc6f0e8f0ed90044797aa3')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p0 < ../01_all_fortune_all-fix.patch  || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p0 < ../01_all_fortune_all-fix.patch
   make REGEXDEFS='-DHAVE_REGEX_H -DPOSIX_REGEX -DHAVE_STDBOOL'  \
        COOKIEDIR=/usr/share/fortune  \
-       LOCALDIR=/usr/local/share/fortune || return 1
-  make COOKIEDIR=/usr/share/fortune fortune/fortune.man || return 1
-  make FORTDIR=$pkgdir/usr/bin  \
-       COOKIEDIR=$pkgdir/usr/share/fortune  \
-       BINDIR=$pkgdir/usr/sbin  \
-       BINMANDIR=$pkgdir/usr/share/man/man1  \
-       FORTMANDIR=$pkgdir/usr/share/man/man6 install || return 1
-  rm $pkgdir/usr/share/fortune/*.u8
-  rm $pkgdir/usr/share/fortune/off/*.u8
-  install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+       LOCALDIR=/usr/local/share/fortune all fortune/fortune.man
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make FORTDIR="$pkgdir"/usr/bin \
+       COOKIEDIR="$pkgdir"/usr/share/fortune \
+       BINDIR="$pkgdir"/usr/sbin \
+       BINMANDIR="$pkgdir"/usr/share/man/man1 \
+       FORTMANDIR="$pkgdir"/usr/share/man/man6 install
+  rm "$pkgdir"/usr/share/fortune/*.u8
+  rm "$pkgdir"/usr/share/fortune/off/*.u8
+  install -D -m644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/extra/gimp-dbp/PKGBUILD b/extra/gimp-dbp/PKGBUILD
index 9cec2e706..f09db2f20 100644
--- a/extra/gimp-dbp/PKGBUILD
+++ b/extra/gimp-dbp/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 37038 2009-04-30 05:11:53Z eric $
+# $Id: PKGBUILD 128499 2011-06-24 05:56:11Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gimp-dbp
-_srcname=dbp
 pkgver=1.1.9
-pkgrel=1
+pkgrel=2
 pkgdesc="David's batch processor for the GIMP"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gimp>=2.4')
+arch=('i686' 'x86_64')
 url="http://members.ozemail.com.au/~hodsond/dbp.html"
-source=(http://www.ozemail.com.au/~hodsond/${_srcname}Src-${pkgver//./-}.tgz)
+license=('GPL')
+depends=('gimp')
+source=(http://www.ozemail.com.au/~hodsond/dbpSrc-${pkgver//./-}.tgz)
 md5sums=('1106625707798ab8ea1317ac6bece1c5')
 
 build() {
-  cd ${srcdir}/${_srcname}-${pkgver}
- # Tweak Makefile -- remove auto-install
-  sed -i 's|^\tgimptool.*$||' Makefile || return 1
-  sed -i "s|<string>|<cstring>|" op.h || return 1
- #sed -i '/DISABLE_DEPRECATED/d' Makefile
- # create gimp-2.0 plugin and install it
-  make ${_srcname} || return 1
-  install -Dsm755 ${_srcname} ${pkgdir}/usr/lib/gimp/2.0/plug-ins/${_srcname} || return 1
+  cd "${srcdir}/dbp-${pkgver}"
+  sed -i "s|<string>|<cstring>|" op.h
+  make
+}
+
+package() {
+  cd "${srcdir}/dbp-${pkgver}"
+  install -D -m755 dbp "${pkgdir}/usr/lib/gimp/2.0/plug-ins/dbp"
 }
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 9ade982c2..1e814b88a 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 126447 2011-06-05 13:11:49Z andyrtr $
+# $Id: PKGBUILD 128504 2011-06-24 07:05:04Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=2.12.6.1
+pkgver=2.12.7
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ install=gnutls.install
 options=('!libtool' '!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'libgcrypt')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e724e37f96984f3b0a215c11f03729bd')
+md5sums=(4b48aa3119f549d30d550bf4162c721b'')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD
index fb95cc7b9..339906704 100644
--- a/extra/grantlee/PKGBUILD
+++ b/extra/grantlee/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 128623 2011-06-24 16:39:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=grantlee
-pkgver=0.1.8
+pkgver=0.1.9
 pkgrel=1
 pkgdesc="A string template engine based on the Django template system and written in Qt"
 arch=('i686' 'x86_64')
@@ -11,10 +11,10 @@ license=('LGPL3')
 depends=('qt')
 makedepends=('cmake')
 source=("http://downloads.grantlee.org/${pkgname}-${pkgver}.tar.gz")
-md5sums=('67c24d9eb6be66997ac5d0803bde06de')
+md5sums=('3d93b5312814ebee373fba5509d88bdb')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +24,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 } 
diff --git a/extra/hexedit/PKGBUILD b/extra/hexedit/PKGBUILD
index cbf963d64..bc2a5bfd0 100644
--- a/extra/hexedit/PKGBUILD
+++ b/extra/hexedit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 128432 2011-06-23 23:29:54Z dan $
+# $Id: PKGBUILD 128628 2011-06-24 17:38:13Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <pjmattal@elys.com>
 
 pkgname=hexedit
 pkgver=1.2.12
-pkgrel=3
+pkgrel=4
 pkgdesc="Hex Editor for Linux"
 arch=('i686' 'x86_64')
 url="http://merd.net/pixel/hexedit.html"
@@ -19,5 +19,9 @@ build() {
 
   ./configure
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
   make prefix="${pkgdir}/usr" install
 }
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index d7930f9f7..0d939ffd2 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126832 2011-06-07 15:43:55Z foutrelis $
+# $Id: PKGBUILD 128509 2011-06-24 07:30:26Z foutrelis $
 # Maintainer: Evangelos Foutras <foutrelis@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
 pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.8.0
+pkgver=2.9.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
@@ -18,7 +18,7 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
 options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
         nm09-more.patch)
-md5sums=('d1656c443a5d91f4aa0d95915f1f50c3'
+md5sums=('2cd285c7a40f93b7a51bfe733971d3a6'
          'a673659d86c7a65aa710f7c8c7feda82')
 
 build() {
diff --git a/extra/x2x/PKGBUILD b/extra/x2x/PKGBUILD
index bccbba6a4..8389e2ef8 100644
--- a/extra/x2x/PKGBUILD
+++ b/extra/x2x/PKGBUILD
@@ -1,23 +1,29 @@
-# $Id: PKGBUILD 36334 2009-04-21 02:04:21Z eric $
+# $Id: PKGBUILD 128494 2011-06-24 05:31:20Z eric $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
+
 pkgname=x2x
 pkgver=1.27
-pkgrel=5
+pkgrel=6
 pkgdesc="Control one X display from another"
-arch=(i686 x86_64)
-url="http://x2x.dottedmag.net/"
+arch=('i686' 'x86_64')
+url="https://github.com/dottedmag/x2x"
 license=('custom')
 depends=('libxtst')
 makedepends=('imake')
-source=(http://x2x.dottedmag.net/releases/$pkgname-$pkgver.tar.gz LICENSE)
-md5sums=('3d1bc863f3209ec37caf7f57bde7e8f0' '7ebc35f66a8ded9b8d8d7ca4131c7ae8')
+source=(https://github.com/downloads/dottedmag/x2x/$pkgname-$pkgver.tar.gz LICENSE)
+md5sums=('3d1bc863f3209ec37caf7f57bde7e8f0'
+         '7ebc35f66a8ded9b8d8d7ca4131c7ae8')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
   mv x2x.1 x2x.man 
-  xmkmf || return 1
-  make || return 1
-  make DESTDIR=$pkgdir MANPATH=/usr/share/man install install.man || return 1
-  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  xmkmf 
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" MANPATH=/usr/share/man install install.man
+  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }