Merge branch 'master' of ssh://gregfrost@knoppmyth.net/mount/repository/LinHES-PKGBUILD

6 files changed, 45 insertions, 42 deletions

diff --git a/abs/extra-testing/community/mythtv-contrib/PKGBUILD b/abs/extra-testing/community/mythtv-contrib/PKGBUILD
index e4a84f7..4e5bf12 100644
--- a/abs/extra-testing/community/mythtv-contrib/PKGBUILD
+++ b/abs/extra-testing/community/mythtv-contrib/PKGBUILD
@@ -1,8 +1,8 @@
 # Contributor: Michael Hanson <hansonorders@verizon.net>
 # Maintainer: Michael Hanson <hansonorders@verizon.net>
 pkgname=mythtv-contrib
-pkgver=0.22
-pkgrel=1
+pkgver=0.23
+pkgrel=2
 pkgdesc="User contributed scripts and utilities for mythtv."
 arch=('i686' 'x86_64')
 url="http://mythtv.org"
@@ -16,7 +16,7 @@ source=('http://www.pdp8.net/directv/directv.pl' \
         'mythchanger.10f.beta.tar')
 patches=('sa3250cmd_make.patch' '6200ch.c.r21651.patch'
          'mythchanger_make.patch')
-_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythtv/contrib
+_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-23-fixes/mythtv/contrib
 _svnver=23566
 _svnmod=contrib
 
@@ -46,7 +46,7 @@ build() {
         cd $srcdir/contrib/channel_changers/dct-channel || return 1
         make || return 1
         install -D -m755 channel $startdir/pkg/usr/bin || return 1
-        install -D -m644 channel.1 $startdir/pkg/usr/man/man1 || return 1
+        install -D -m644 channel.1 $startdir/pkg/usr/man/man1/channel.1 || return 1
         install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.dct-channel
         install -D -m644 COPYING $startdir/pkg/usr/share/licenses/mythtv-contrib/COPYING.dct-channel
 
@@ -71,6 +71,7 @@ build() {
 
         cd $srcdir/contrib/development/tsc-calibrate || return 1
         gcc -o tsc-calibrate tsc-calibrate.c || return 1
+        install -D -m755 tsc-calibrate $startdir/pkg/usr/bin || return 1
 
         cd $srcdir/contrib/info/mythname || return 1
         install -D -m755 mythname.pl $startdir/pkg/usr/bin || return 1
diff --git a/abs/extra-testing/community/transmission-cli/PKGBUILD b/abs/extra-testing/community/transmission-cli/PKGBUILD
index 6cbe7e5..5a25df8 100644
--- a/abs/extra-testing/community/transmission-cli/PKGBUILD
+++ b/abs/extra-testing/community/transmission-cli/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=transmission-cli
 pkgver=1.92
-pkgrel=1
+pkgrel=3
 pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
@@ -15,9 +15,9 @@ replaces=('transmission')
 backup=('etc/conf.d/transmissiond')
 install=transmission-cli.install
 source=(http://mirrors.m0k.org/transmission/files/transmission-$pkgver.tar.bz2
-        run
-        finish
+        run.transmissiond
         transmission-cli.install
+        transmission.include
         transmissiond.conf)
 
 build() {
@@ -29,14 +29,13 @@ build() {
 
   mkdir -p -m744 "$pkgdir/etc/sv/transmissiond" || return 1
   mkdir -p -m777 "$pkgdir/myth/transmission" || return 1
-  install -D -m755 "$srcdir/run" "$pkgdir/etc/sv/transmissiond/run" || return 1
-  install -D -m755 "$srcdir/finish" "$pkgdir/etc/sv/transmissiond/finish" || return 1
+  install -D -m755 "$srcdir/run.transmissiond" "$pkgdir/etc/sv/transmissiond/run" || return 1
   install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond" || return 1
-
+  install -D -m644 "$srcdir/transmission.include" "$pkgdir/etc/transmission/transmission.include" || return 1
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" || return 1
 }
 md5sums=('561357621331f294c87f78e22783a283'
-         'fd5ec0a496b6833074fd125b1fb70e47'
-         'f0e4e06f7307c75ceda6ccd4e74975b5'
-         'f1a15f339515f522c5895e6f40491a46'
+         'b91534aaf2e403331c611c615ab2c03d'
+         'ff22c13dbd52565f9e88b1de22514eb9'
+         'b5a49ea375333cd0fee40f70dbac4c2e'
          'd05567c7a4f9df9f28602d1356d5c05c')
diff --git a/abs/extra-testing/community/transmission-cli/finish b/abs/extra-testing/community/transmission-cli/finish
deleted file mode 100755
index 7a09e4f..0000000
--- a/abs/extra-testing/community/transmission-cli/finish
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/transmissiond
-
-PID=`pidof -o %PPID /usr/bin/transmission-daemon`
-    stat_runit "Stopping Transmission Daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      rm_daemon transmissiond
-      stat_done
-    fi
diff --git a/abs/extra-testing/community/transmission-cli/run b/abs/extra-testing/community/transmission-cli/run.transmissiond
index 6bcab36..714c946 100755
--- a/abs/extra-testing/community/transmission-cli/run
+++ b/abs/extra-testing/community/transmission-cli/run.transmissiond
@@ -26,10 +26,4 @@ PID=`pidof -o %PPID /usr/bin/transmission-daemon`
              cd - 2>&1 >/dev/null
           fi
     stat_runit "Starting Transmission Daemon"
-    [ -z "$PID" ] && su -l -c "/usr/bin/nice -n 19 /usr/bin/transmission-daemon $TRANS_OPTS" $TRANS_USER 2>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      add_daemon transmissiond
-      stat_done
-    fi
+    [ -z "$PID" ] && exec su -l -c "/usr/bin/nice -n 19 /usr/bin/transmission-daemon $TRANS_OPTS" $TRANS_USER 2>/dev/null
diff --git a/abs/extra-testing/community/transmission-cli/transmission-cli.install b/abs/extra-testing/community/transmission-cli/transmission-cli.install
index d69601d..088ecc6 100644
--- a/abs/extra-testing/community/transmission-cli/transmission-cli.install
+++ b/abs/extra-testing/community/transmission-cli/transmission-cli.install
@@ -1,19 +1,28 @@
 post_install() {
+  /bin/echo 'include "/etc/transmission/transmission.include"' >> /etc/lighttpd/conf.include
+  killall -HUP lighttpd  
+
+  add_service.sh transmissiond
+
   cat << _EOF
 
-  If you want to run the Transmission daemon at boot,
-  run add_service.sh transmissiond as root.
-  
   You can edit the user and options in /etc/conf.d/transmissiond.
 
-  There is a lot of good information on setting up a web
-  interface proxy through lighttpd at:
-  http://mybookworld.wikidot.com/transmission
+  To access the web interface:
+  http://localhost/transmission
 
   Configuration file editing information can be found at:
   http://trac.transmissionbt.com/wiki/ConfigFiles
 
-
 _EOF
 
 }
+
+pre_upgrade() {
+  rm -f /usr/share/man/man1/transmission*
+
+}
+
+pre_remove() {
+  remove_service.sh transmissiond
+}
diff --git a/abs/extra-testing/community/transmission-cli/transmission.include b/abs/extra-testing/community/transmission-cli/transmission.include
new file mode 100644
index 0000000..5cbf399
--- /dev/null
+++ b/abs/extra-testing/community/transmission-cli/transmission.include
@@ -0,0 +1,15 @@
+#Redirect from /transmission to /transmission/web
+url.rewrite-once += ( "^/transmission[/]?$" => "/transmission/web" )
+$HTTP["url"] =~ "^/transmission/" {
+  #Serve static files from /usr/share/transmission
+  server.document-root = "/usr/share/"
+  #Forward RPC requests to the Transmission daemon
+  proxy.server = (
+    "/transmission/rpc" => (
+      (
+        "host" => "127.0.0.1",
+        "port" => 9091
+      )
+    )
+  )
+}