Wed Sep 21 23:14:42 UTC 2011

8 files changed, 82 insertions, 53 deletions

diff --git a/community/cdcd/PKGBUILD b/community/cdcd/PKGBUILD
index e840a3d38..f9d78ad68 100644
--- a/community/cdcd/PKGBUILD
+++ b/community/cdcd/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 52061 2009-09-14 22:50:09Z giovanni $
+# $Id: PKGBUILD 55773 2011-09-20 06:44:34Z andrea $
 # Maintainer: dorphell <dorphell@archlinux.org>
-#contributor Sarah Hay <sarahhay@mb.sympatico.ca>
+# Contributor Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=cdcd
 pkgver=0.6.6
-pkgrel=5
+pkgrel=6
 pkgdesc="A commandline cd-player"
 arch=('i686' 'x86_64')
 depends=('libcdaudio' 'readline')
-source=(http://downloads.sourceforge.net/sourceforge/libcdaudio/$pkgname-$pkgver.tar.gz
-        cdcd-0.6.6-x86_64.patch)
 url="http://libcdaudio.sourceforge.net/"
 license=('GPL2')
+install=cdcd.install
+source=("http://downloads.sourceforge.net/libcdaudio/$pkgname-$pkgver.tar.gz"
+        cdcd-0.6.6-x86_64.patch)
 md5sums=('dc17f2e275c7214cb693f6abb50f29fb'
          '7c39f01408fc084e2c62da4da324370e')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/cdcd-0.6.6-x86_64.patch
+  cd "${srcdir}"/$pkgname-$pkgver
+  patch -Np1 -i "${srcdir}"/cdcd-0.6.6-x86_64.patch
   ./configure --prefix=/usr
-  make || return 1
-  make prefix=$startdir/pkg/usr install
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make prefix="${pkgdir}"/usr install
 
-  install -dm755 ${pkgdir}/usr/share
-  mv ${pkgdir}/usr/{man,info} ${pkgdir}/usr/share
-  rm ${pkgdir}/usr/share/info/dir
+  install -dm755 "${pkgdir}"/usr/share
+  mv "${pkgdir}"/usr/{man,info} "${pkgdir}"/usr/share
+  rm "${pkgdir}"/usr/share/info/dir
 }
diff --git a/community/cdcd/cdcd.install b/community/cdcd/cdcd.install
new file mode 100644
index 000000000..e859c40b7
--- /dev/null
+++ b/community/cdcd/cdcd.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(cdcd.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 69c5e52cc..9cda3f411 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55591 2011-09-14 14:47:29Z spupykin $
+# $Id: PKGBUILD 55789 2011-09-20 16:59:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=0.9.4
-pkgrel=3
+pkgver=0.9.5
+pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -35,12 +35,12 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	openbsd-netcat-default.patch
 	unixperms.patch
 	yajl-2.x.patch)
-md5sums=('86b411b11bd23d4af20611699f372af7'
+md5sums=('2b4aae1ff231bd31057ff40ab6eb4696'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '6f36bf189ef0e5847038787d13535420'
          'bc2971dacdbac967fc3474e50affc345'
-         'ee7052f3929d5d918236c646a59edebf'
+         '4a2659d0e06a7af742f71a0a36c7cea3'
          'db95aecdf2ccf3693fef5821cdcb7eba'
          '5745bb8d0b254abb7a3528c66e03b0f9')
 
diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch
index c7543c5a4..c884d2171 100644
--- a/community/libvirt/openbsd-netcat-default.patch
+++ b/community/libvirt/openbsd-netcat-default.patch
@@ -1,19 +1,19 @@
-diff -wbBur libvirt-0.9.4.org/src/qemu/qemu_migration.c libvirt-0.9.4/src/qemu/qemu_migration.c
---- libvirt-0.9.4.org/src/qemu/qemu_migration.c	2011-08-03 05:36:34.000000000 +0400
-+++ libvirt-0.9.4/src/qemu/qemu_migration.c	2011-08-03 13:29:56.000000000 +0400
-@@ -1612,7 +1612,7 @@
-         ret = qemuMonitorMigrateToUnix(priv->mon, background_flags,
-                                                unixfile);
-     } else if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) {
--        const char *args[] = { "nc", "-U", unixfile, NULL };
-+        const char *args[] = { "nc.openbsd", "-U", unixfile, NULL };
-         ret = qemuMonitorMigrateToCommand(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, args);
-     } else {
-         ret = -1;
-diff -wbBur libvirt-0.9.4.org/src/remote/remote_driver.c libvirt-0.9.4/src/remote/remote_driver.c
---- libvirt-0.9.4.org/src/remote/remote_driver.c	2011-07-29 09:14:03.000000000 +0400
-+++ libvirt-0.9.4/src/remote/remote_driver.c	2011-08-03 13:30:05.000000000 +0400
-@@ -588,7 +588,7 @@
+diff -wbBur libvirt-0.9.5/src/qemu/qemu_migration.c libvirt-0.9.5.my/src/qemu/qemu_migration.c
+--- libvirt-0.9.5/src/qemu/qemu_migration.c	2011-09-16 16:37:07.000000000 +0400
++++ libvirt-0.9.5.my/src/qemu/qemu_migration.c	2011-09-20 20:44:39.000000000 +0400
+@@ -1497,7 +1497,7 @@
+                                            spec->dest.unix_socket.file);
+         } else {
+             const char *args[] = {
+-                "nc", "-U", spec->dest.unix_socket.file, NULL
++                "nc.openbsd", "-U", spec->dest.unix_socket.file, NULL
+             };
+             ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args);
+         }
+diff -wbBur libvirt-0.9.5/src/remote/remote_driver.c libvirt-0.9.5.my/src/remote/remote_driver.c
+--- libvirt-0.9.5/src/remote/remote_driver.c	2011-09-20 07:00:44.000000000 +0400
++++ libvirt-0.9.5.my/src/remote/remote_driver.c	2011-09-20 20:44:43.000000000 +0400
+@@ -596,7 +596,7 @@
                                                  username,
                                                  !tty,
                                                  !verify,
@@ -22,10 +22,10 @@ diff -wbBur libvirt-0.9.4.org/src/remote/remote_driver.c libvirt-0.9.4/src/remot
                                                  keyfile,
                                                  sockname)))
              goto failed;
-diff -wbBur libvirt-0.9.4.org/src/rpc/virnetsocket.c libvirt-0.9.4/src/rpc/virnetsocket.c
---- libvirt-0.9.4.org/src/rpc/virnetsocket.c	2011-08-01 05:32:35.000000000 +0400
-+++ libvirt-0.9.4/src/rpc/virnetsocket.c	2011-08-03 13:29:46.000000000 +0400
-@@ -629,7 +629,7 @@
+diff -wbBur libvirt-0.9.5/src/rpc/virnetsocket.c libvirt-0.9.5.my/src/rpc/virnetsocket.c
+--- libvirt-0.9.5/src/rpc/virnetsocket.c	2011-09-14 06:11:44.000000000 +0400
++++ libvirt-0.9.5.my/src/rpc/virnetsocket.c	2011-09-20 20:44:33.000000000 +0400
+@@ -633,7 +633,7 @@
      if (noVerify)
          virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
      virCommandAddArgList(cmd, nodename,
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index 590a0d6cc..b50277f48 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 33385 2010-11-24 11:34:08Z cbrannon $
+# $Id: PKGBUILD 55793 2011-09-20 21:39:14Z cbrannon $
 # Contributor: phrakture <aaronmgriffin--gmail--com>
 # Contributor: Fazlul Shahriar
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 pkgname=plan9port
-pkgver=20101110
+pkgver=20110920
 pkgrel=1
 pkgdesc="A port of many programs from Plan 9 to Unix-like operating systems"
 arch=('i686' 'x86_64')
 url="http://swtch.com/plan9port/"
 license=('custom')
-depends=(xorg-server sh fuse)
+depends=(xorg-server libxt libxext sh fuse)
 optdepends=('python2: for the codereview script')
 install=plan9.install
 source=(http://swtch.com/$pkgname/$pkgname-$pkgver.tgz plan9.sh)
@@ -48,5 +48,5 @@ build()
     rm -f $i
   done
 }
-md5sums=('c9942871a4008ecc297a27e8295fdcf0'
+md5sums=('ce91667f56c0f49849aae9c79a7cb58c'
          '9695eb15a247e23140e8a35ff52a5c20')
diff --git a/community/plan9port/plan9.install b/community/plan9port/plan9.install
index 23d047c8c..63b8dd0da 100644
--- a/community/plan9port/plan9.install
+++ b/community/plan9port/plan9.install
@@ -3,7 +3,7 @@ pre_install() {
 }
 
 post_install() {
-  echo "==> Decompressing man plan9 man pages"
+  echo "==> Decompressing plan9 man pages"
   for i in `find /opt/plan9/man -type f`; do
     if [ ${i##*.} = "gz" ]; then
 #      echo "    ${i%%.*}..."
diff --git a/community/pppd-ldap/PKGBUILD b/community/pppd-ldap/PKGBUILD
index 27c593d82..86e7ebea7 100644
--- a/community/pppd-ldap/PKGBUILD
+++ b/community/pppd-ldap/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 2636 2009-09-19 18:21:47Z ibiru $
+# $Id: PKGBUILD 55777 2011-09-20 06:52:16Z andrea $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=pppd-ldap
 pkgver=0.12b
-pkgrel=2
-pkgdesc="pppd ldap plugin"
+pkgrel=3
+pkgdesc="A plugin for PPPD which performs an LDAP-enabled version of pppd"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/pppd-ldap/"
 license=('GPL')
-depends=('ppp' 'libldap>=2.4.18')
-options=(docs)
-source=(http://downloads.sourceforge.net/sourceforge/pppd-ldap/pppd_ldap-$pkgver.tgz)
+depends=('ppp' 'libldap')
+options=('docs')
+source=("http://downloads.sourceforge.net/${pkgname}/pppd_ldap-$pkgver.tgz")
 md5sums=('4d13596297c2728f3cfe0a097c97d8fc')
 
 build() {
@@ -30,8 +31,11 @@ diff pppd_ldap-0.12b/utmplib.c pppd_ldap-0.12b.my/utmplib.c
 > 			buf = (char*)buf + rc;
 EOF
 
-  make CFLAGS="-I/usr/include/pppd -fPIC" || return 1
+  make CFLAGS="-I/usr/include/pppd -fPIC"
+}
 
-  install -D -m0755 pppd_ldap.so $pkgdir/usr/lib/pppd/2.4.4/pppd_ldap.so && \
+package() {
+  cd "$srcdir/pppd_ldap-$pkgver"
+  install -D -m0755 pppd_ldap.so $pkgdir/usr/lib/pppd/2.4.4/pppd_ldap.so
   install -D -m0755 README $pkgdir/usr/share/doc/pppd-ldap/README
 }
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index bc3845166..bc653c3c8 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 53780 2011-08-08 08:12:58Z spupykin $
+# $Id: PKGBUILD 55791 2011-09-20 17:02:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu>
 
 pkgname=tea
-pkgver=30.1.0
+pkgver=31.0.0
 pkgrel=1
 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell')
 install=tea.install
 source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2
         tea.desktop)
-md5sums=('1b6bdadf7cd323f059b0b7b4420e186b'
+md5sums=('53cb9b079e7ebaddcc41b27c684beaab'
          '377ace3363124f4c086de0babb820761')
 
 build() {