Fri Mar 23 00:01:14 UTC 2012

3 files changed, 41 insertions, 23 deletions

diff --git a/community-testing/cdemu-daemon/60-vhba.rules b/community-testing/cdemu-daemon/60-vhba.rules
index 5ee03c807..91de6f86a 100644
--- a/community-testing/cdemu-daemon/60-vhba.rules
+++ b/community-testing/cdemu-daemon/60-vhba.rules
@@ -1 +1 @@
-KERNEL=="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
+KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
diff --git a/community-testing/cdemu-daemon/PKGBUILD b/community-testing/cdemu-daemon/PKGBUILD
index 72b9963fa..b757373de 100644
--- a/community-testing/cdemu-daemon/PKGBUILD
+++ b/community-testing/cdemu-daemon/PKGBUILD
@@ -1,42 +1,58 @@
-# $Id: PKGBUILD 67378 2012-03-10 20:04:28Z bpiotrowski $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 68321 2012-03-21 15:58:26Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
 
 pkgname=cdemu-daemon
 pkgver=1.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="CD/DVD-ROM device emulator daemon"
 arch=('i686' 'x86_64')
-backup=('etc/conf.d/cdemud'
-	'etc/dbus-1/system.d/cdemud-dbus.conf')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
-depends=('glib2' 'dbus' 'dbus-glib' 'libdaemon' 'vhba-module' "libmirage=$pkgver" 'libao')
+depends=('dbus-glib' 'libdaemon' 'vhba-module'
+         'dbus' "libmirage=$pkgver" 'libao')
+optdepends=('alsa-lib: to enable the audio driver')
+backup=('etc/conf.d/cdemud'
+        'etc/dbus-1/system.d/cdemud-dbus.conf')
 install=cdemud.install
-source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2
-        cdemud.conf cdemud.rc 60-vhba.rules cdemu-daemon-system.patch)
+source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
+        'cdemud.conf'
+        'cdemud.rc'
+        '60-vhba.rules'
+        'cdemu-daemon-system.patch')
 md5sums=('5ba780caa26d855942512b5b3c22405a'
          'd65c30651389900c46e62a9e5559b9d5'
          'ef47f06a3d4e07885bfbb57d4d6d0be4'
-         'f551504552d7693ac79e8e0d302f62b9'
+         '549bd2d9696bd1884c8eed7193c00e21'
          'a3ae9c51c460d31a521dd00dd3f0a852')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
+
   patch -Np0 -i $srcdir/cdemu-daemon-system.patch
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname
+
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --libexecdir=/usr/lib/$pkgname
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  install -m 644 -D ../cdemud.conf $pkgdir/etc/conf.d/cdemud
-  install -m 755 -D ../cdemud.rc $pkgdir/etc/rc.d/cdemud
+  cd "$srcdir/$pkgname-$pkgver"
 
-  # Install udev rule for non-root mounting of iso's 
-  install -D -m 644 "${srcdir}/60-vhba.rules"  "$pkgdir/lib/udev/rules.d/60-vhba.rules"
+  make DESTDIR="$pkgdir" install
 
-  install -d "$pkgdir/usr/lib/modules-load.d"
-  echo "vhba" > "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
+  install -Dm644 "$srcdir/cdemud.conf" "$pkgdir/etc/conf.d/cdemud"
+  install -Dm755 "$srcdir/cdemud.rc" "$pkgdir/etc/rc.d/cdemud"
+
+  # install udev rule for non-root mounting of iso's
+  install -Dm644 "$srcdir/60-vhba.rules" \
+    "$pkgdir/lib/udev/rules.d/60-vhba.rules"
+
+  # should we really be doing this?
+  #install -d "$pkgdir/usr/lib/modules-load.d"
+  #echo "vhba" > "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/cdemu-daemon/cdemud.install b/community-testing/cdemu-daemon/cdemud.install
index 699b3f0e5..3550a5e59 100644
--- a/community-testing/cdemu-daemon/cdemud.install
+++ b/community-testing/cdemu-daemon/cdemud.install
@@ -1,9 +1,11 @@
 post_install () {
-  echo ">> Place 'cdemud' in DAEMONS= in /etc/rc.conf to enable cdemud on system boot."
-  echo ">> If the alsa-lib package is installed, cdemud can use the ALSA audio backend"
-  echo ">> (edit /etc/conf.d/cdemud to enable this)."
   groupadd cdemu
+  echo "  > Add yourself to the 'cdemu' group for non-root access"
+  echo "  > See /etc/conf.d/cdemud for further configuration"
 }
+
 post_remove() {
   groupdel cdemu
 }
+
+# vim:set ts=2 sw=2 et: