From be834a1587a6fb592cdd3d3205c1636547a7815d Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Mon, 5 Apr 2010 21:16:33 +0000 Subject: lcdproc: updated to 0.5.3 and added runit support. Needs testing. ref #673 --- abs/extra-testing/lcdproc/PKGBUILD | 20 ++++++++-------- abs/extra-testing/lcdproc/__changelog | 5 +++- abs/extra-testing/lcdproc/lcdd | 38 ------------------------------- abs/extra-testing/lcdproc/lcdproc.install | 7 ++++++ abs/extra-testing/lcdproc/run.lcdd | 8 +++++++ 5 files changed, 29 insertions(+), 49 deletions(-) delete mode 100755 abs/extra-testing/lcdproc/lcdd create mode 100644 abs/extra-testing/lcdproc/lcdproc.install create mode 100644 abs/extra-testing/lcdproc/run.lcdd diff --git a/abs/extra-testing/lcdproc/PKGBUILD b/abs/extra-testing/lcdproc/PKGBUILD index 7ee6e50..a16945e 100644 --- a/abs/extra-testing/lcdproc/PKGBUILD +++ b/abs/extra-testing/lcdproc/PKGBUILD @@ -1,29 +1,29 @@ # Contributor: Bernhard Walle pkgname=lcdproc -pkgver=0.5.2 -pkgrel=2 +pkgver=0.5.3 +pkgrel=1 pkgdesc="LCDproc is a utility to drive one or more LCD (and LCD-like) devices attached to a host." url="http://lcdproc.omnipotent.net/" license="GPL" depends=(libusb serdisplib libftdi autoconf automake lirc libnxml libmrss pkgconfig xosd) backup=(etc/LCDd.conf) arch=(i686 x86_64) +install=lcdproc.install source=(http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - lcdd + run.lcdd lcdproc-add-serdisplib ) -md5sums=('860f192d061d87dda6512b11b79daac2' - '56f52dcccd6e129a9cf84cd1a0452d56' - '274322642740ad323c43ec5d324519d4') build() { cd $startdir/src/$pkgname-$pkgver - patch -p1 < ../lcdproc-add-serdisplib +# patch -p1 < ../lcdproc-add-serdisplib autoreconf ./configure --prefix=/usr --sysconfdir=/etc --enable-libusb --enable-lcdproc-menus --enable-stat-smbfs --enable-drivers=all make make DESTDIR=$startdir/pkg install - sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" LCDd.conf > $startdir/pkg/etc/LCDd.conf - mkdir -p $startdir/pkg/etc/rc.d - install -m 755 $startdir/src/lcdd $startdir/pkg/etc/rc.d + sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" LCDd.conf > $pkgdir/etc/LCDd.conf + install -D -m 755 $startdir/src/run.lcdd $startdir/pkg/etc/sv/lcdd/run } +md5sums=('fe9a7c9d8f2c5e76250ce2ea8f644921' + '3c819fe53358ffb6d5e06f68dd8e367b' + '274322642740ad323c43ec5d324519d4') diff --git a/abs/extra-testing/lcdproc/__changelog b/abs/extra-testing/lcdproc/__changelog index 52c2d35..96fd954 100644 --- a/abs/extra-testing/lcdproc/__changelog +++ b/abs/extra-testing/lcdproc/__changelog @@ -1 +1,4 @@ -add xosd \ No newline at end of file +add xosd +# mihanson 2010-04-05 +updated to 0.5.3 +removed lcdproc-add-serdisplib as it does not appear to be needed anymore diff --git a/abs/extra-testing/lcdproc/lcdd b/abs/extra-testing/lcdproc/lcdd deleted file mode 100755 index a124c00..0000000 --- a/abs/extra-testing/lcdproc/lcdd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/LCDd` -case "$1" in - start) - stat_busy "Starting LCDd daemon" - [ -z "$PID" ] && /usr/sbin/LCDd -c /etc/LCDd.conf - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/lcdd.pid - add_daemon lcdd - stat_done - fi - ;; - stop) - stat_busy "Stopping LCDd daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/lcdd.pid - rm_daemon lcdd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/extra-testing/lcdproc/lcdproc.install b/abs/extra-testing/lcdproc/lcdproc.install new file mode 100644 index 0000000..bd3c85e --- /dev/null +++ b/abs/extra-testing/lcdproc/lcdproc.install @@ -0,0 +1,7 @@ +post_install() { + add_service.sh lcdd +} + +pre_remove() { + remove_service.sh lcdd +} diff --git a/abs/extra-testing/lcdproc/run.lcdd b/abs/extra-testing/lcdproc/run.lcdd new file mode 100644 index 0000000..5f4af8e --- /dev/null +++ b/abs/extra-testing/lcdproc/run.lcdd @@ -0,0 +1,8 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/LCDd` + stat_busy "Starting LCDd daemon" + [ -z "$PID" ] && exec /usr/sbin/LCDd -f -c /etc/LCDd.conf -- cgit v0.12 From 633bb83e698e5914fd38d72e6a17c7249445a3d4 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Mon, 5 Apr 2010 21:46:56 +0000 Subject: lcdproc: remove run file as it exists in runit-scripts. ref #673 --- abs/extra-testing/lcdproc/PKGBUILD | 4 +--- abs/extra-testing/lcdproc/run.lcdd | 8 -------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 abs/extra-testing/lcdproc/run.lcdd diff --git a/abs/extra-testing/lcdproc/PKGBUILD b/abs/extra-testing/lcdproc/PKGBUILD index a16945e..73a393b 100644 --- a/abs/extra-testing/lcdproc/PKGBUILD +++ b/abs/extra-testing/lcdproc/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: Bernhard Walle pkgname=lcdproc pkgver=0.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="LCDproc is a utility to drive one or more LCD (and LCD-like) devices attached to a host." url="http://lcdproc.omnipotent.net/" license="GPL" @@ -10,7 +10,6 @@ backup=(etc/LCDd.conf) arch=(i686 x86_64) install=lcdproc.install source=(http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - run.lcdd lcdproc-add-serdisplib ) @@ -25,5 +24,4 @@ build() { install -D -m 755 $startdir/src/run.lcdd $startdir/pkg/etc/sv/lcdd/run } md5sums=('fe9a7c9d8f2c5e76250ce2ea8f644921' - '3c819fe53358ffb6d5e06f68dd8e367b' '274322642740ad323c43ec5d324519d4') diff --git a/abs/extra-testing/lcdproc/run.lcdd b/abs/extra-testing/lcdproc/run.lcdd deleted file mode 100644 index 5f4af8e..0000000 --- a/abs/extra-testing/lcdproc/run.lcdd +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/LCDd` - stat_busy "Starting LCDd daemon" - [ -z "$PID" ] && exec /usr/sbin/LCDd -f -c /etc/LCDd.conf -- cgit v0.12