[arch-commits] Commit in brltty/trunk (PKGBUILD brltty brltty.conf)

[Jan Steffens]

    Date: Tuesday, April 2, 2013 @ 11:49:34
  Author: heftig
Revision: 181187

4.5

Modified:
  brltty/trunk/PKGBUILD
Deleted:
  brltty/trunk/brltty
  brltty/trunk/brltty.conf

-------------+
 PKGBUILD    |   42 ++++++++++++++---------------------
 brltty      |   68 ----------------------------------------------------------
 brltty.conf |    2 -
 3 files changed, 17 insertions(+), 95 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-02 09:41:34 UTC (rev 181186)
+++ PKGBUILD	2013-04-02 09:49:34 UTC (rev 181187)
@@ -4,46 +4,38 @@
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=brltty
-pkgver=4.4
-pkgrel=4
+pkgver=4.5
+pkgrel=1
 pkgdesc="Braille display driver for Linux/Unix"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://mielke.cc/brltty"
-license=('GPL' 'LGPL')
-depends=('libxaw' 'at-spi2-core' 'gpm' 'icu>=51.1' 'tcl' 'atk' 'pyrex')
-makedepends=('bluez')
+license=(GPL LGPL)
+depends=(libxaw at-spi2-core gpm 'icu>=51.1' tcl atk cython)
+makedepends=(bluez)
 optdepends=('bluez: bluetooth support')
-backup=(etc/brltty.conf etc/conf.d/brltty.conf)
-options=('!makeflags' '!emptydirs')
+backup=(etc/brltty.conf)
+options=('!emptydirs')
 install=brltty.install
 source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
-        'brltty'
-        'brltty.conf'
-	     'brltty.service')
-md5sums=('8ebe96efe679f5f6ccff08928fec5b26'
-         '831ebaf0c56091702929c68805d20c4f'
-         'a8ab8b3dd059e96e1734bc9cdcf844fc'
+        brltty.service)
+md5sums=('7b52fa7746fed41ed344a1f75ce55951'
          '7acecd700b9f94d76fe4a6ad56cb0448')
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|/usr/bin/python|/usr/bin/python2|' Tables/latex-access.ctb
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --mandir=/usr/share/man \
-    --localstatedir=/var \
+    --with-tables-directory=/usr/share/brltty \
     --with-screen-driver=a2 \
     --enable-gpm \
     --disable-java-bindings \
-    PYTHON=/usr/bin/python2
+    --disable-static
 
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make INSTALL_ROOT="$pkgdir" install
-  install -D -m755 "$srcdir/brltty" "$pkgdir/etc/rc.d/brltty"
-  install -D -m644 "$srcdir/brltty.conf" "$pkgdir/etc/conf.d/brltty.conf"
-  install -D -m644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
-  install -D -m644 "$srcdir/brltty.service" "$pkgdir/usr/lib/systemd/system/brltty.service"
+  install -Dm644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
+  install -Dm644 ../brltty.service "$pkgdir/usr/lib/systemd/system/brltty.service"
 }

Deleted: brltty
===================================================================
--- brltty	2013-04-02 09:41:34 UTC (rev 181186)
+++ brltty	2013-04-02 09:49:34 UTC (rev 181187)
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=brltty
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name $brltty_args
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0

Deleted: brltty.conf
===================================================================
--- brltty.conf	2013-04-02 09:41:34 UTC (rev 181186)
+++ brltty.conf	2013-04-02 09:49:34 UTC (rev 181187)
@@ -1,2 +0,0 @@
-# Specify any arguments to pass to brltty here.
-brltty_args=""
\ No newline at end of file