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

7 files changed, 63 insertions, 13 deletions

diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index 8875c69..e939079 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -3,20 +3,22 @@
 
 pkgname=linhes-scripts
 pkgver=1
-pkgrel=15
+pkgrel=16
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
-depends=(xosd)
+depends=('xosd' 'cpulimit')
 url="http://linhes.org/"
 source=(ftp://ftp.knoppmyth.net/R6/sources/linhes-scripts.tar.bz2)
 
 build() {
   cd $startdir/src/
   mkdir -p $startdir/pkg/usr/LH/bin
-  install -D -m755 myt2* 770* idle.sh imp* myth* shoo* pau*sh mplayer* vdpau* screen* mplayer* $startdir/pkg/usr/LH/bin
+  install -D -m755 myt* 770* idle.sh imp* shoo* *commflag*sh mplayer* vdpau* screen* $startdir/pkg/usr/LH/bin
   mkdir -p $startdir/pkg/etc/sv/pause-mythcommflag/supervise
-  cp run $startdir/pkg/etc/sv/pause-mythcommflag/
+  cp run-pause-mythcommflag $startdir/pkg/etc/sv/pause-mythcommflag/run
+  mkdir -p $startdir/pkg/etc/sv/limit-mythcommflag/supervise
+  cp run-limit-mythcommflag $startdir/pkg/etc/sv/limit-mythcommflag/run
   mkdir -p $startdir/pkg/etc/logrotate.d/
   cp pause_mythcommflag $startdir/pkg/etc/logrotate.d/
 }
diff --git a/abs/core-testing/perl_modules/perl-proc-daemon/PKGBUILD b/abs/core-testing/perl_modules/perl-proc-daemon/PKGBUILD
new file mode 100644
index 0000000..f5df566
--- /dev/null
+++ b/abs/core-testing/perl_modules/perl-proc-daemon/PKGBUILD
@@ -0,0 +1,23 @@
+# Contributor: xduugu
+
+pkgname=perl-proc-daemon
+pkgver=0.03
+pkgrel=1
+pkgdesc="run Perl program as a daemon process"
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/~EHOOD/Proc-Daemon"
+license=('GPL' 'PerlArtistic')
+depends=('perl')
+options=('!emptydirs')
+source=(http://www.cpan.org/authors/id/E/EH/EHOOD/Proc-Daemon-$pkgver.tar.gz) 
+md5sums=('6e1b83ac0f0add22f63597733f38c973')
+sha1sums=('25df5ee454527772ff95bc44980101a6766edb8a')
+
+build() {
+  cd  "$srcdir/Proc-Daemon-$pkgver"
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 
+  make || return 1
+  make install DESTDIR="$pkgdir/" || return 1
+  find "$pkgdir" -name '.packlist' -delete
+  find "$pkgdir" -name '*.pod' -delete
+}
diff --git a/abs/core-testing/perl_modules/perl-proc-pid-file/PKGBUILD b/abs/core-testing/perl_modules/perl-proc-pid-file/PKGBUILD
new file mode 100644
index 0000000..ad69d71
--- /dev/null
+++ b/abs/core-testing/perl_modules/perl-proc-pid-file/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# Maintainer: Cecil H. Watson <knoppmyth@gmail.com>
+
+pkgname=perl-proc-pid-file
+_realname=Proc-PID-File
+pkgver=1.24
+pkgrel=1
+pkgdesc="Proc::PID::File a module to manage process idfiles"
+arch=(i686 x86_64)
+license=('PerlArtistic')
+url="http://search.cpan.org/dist/${_realname}/"
+depends=('perlxml' 'perl>=5.10.0')
+options=('!emptydirs')
+source=(ftp://ftp.cpan.org/pub/CPAN/authors/id/E/EC/ECALDER/${_realname}-${pkgver}.tar.gz)
+md5sums=('90b636492ae72def975a9ef9cac90fda')
+
+build() {
+  cd ${startdir}/src/${_realname}-${pkgver}
+  perl Makefile.PL INSTALLDIRS=vendor || return 1
+  make  || return 1
+  make DESTDIR=${startdir}/pkg install || return 1
+
+  find ${startdir}/pkg -name '.packlist' -delete
+  find ${startdir}/pkg -name 'perllocal.pod' -delete
+}
diff --git a/abs/core-testing/system-templates/PKGBUILD b/abs/core-testing/system-templates/PKGBUILD
index 60637bc..b911335 100755
--- a/abs/core-testing/system-templates/PKGBUILD
+++ b/abs/core-testing/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=system-templates
 pkgver=1.0
-pkgrel=26
+pkgrel=27
 conflicts=( )
 pkgdesc="Templates used for system configuration"
 depends=()
diff --git a/abs/core-testing/system-templates/templates/xorg/xorg.conf.via b/abs/core-testing/system-templates/templates/xorg/xorg.conf.via
index 22c8a8e..91c517f 100644
--- a/abs/core-testing/system-templates/templates/xorg/xorg.conf.via
+++ b/abs/core-testing/system-templates/templates/xorg/xorg.conf.via
@@ -51,7 +51,7 @@ EndSection
 
 Section "Device"
     Identifier     "Device0"
-    Driver         "via"
+    Driver         "openchrome"
     VendorName     "via"
     Option "DPI" "100 x 100"
 
diff --git a/abs/extra-testing/mythexport/PKGBUILD b/abs/extra-testing/mythexport/PKGBUILD
index 65cde0b..3cd04f3 100644
--- a/abs/extra-testing/mythexport/PKGBUILD
+++ b/abs/extra-testing/mythexport/PKGBUILD
@@ -2,16 +2,16 @@
 # Maintainer: Cecil Watson<knoppmyth@gmail.com>
 
 pkgname=mythexport
-pkgver=1.0.6
-pkgrel=6
+pkgver=2.0.71
+pkgrel=5
 pkgdesc="Script to export recordings for portable devices."
 arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('atomicparsley' 'perl-config-simple' 'perl-net-upnp')
+license=('GPL3')
+depends=('atomicparsley' 'perl-config-simple' 'perl-net-upnp' 'perl-proc-daemon' 'perl-proc-pid-file')
 url="http://linhes.org/"
 source=(ftp://ftp.knoppmyth.net/R6/sources/mythexport.tar.bz2)
+install=mythexport.install
 
 build() {
-  cd $startdir/src/
-  cp -a etc usr $startdir/pkg
+  cp -a mythexport/* $startdir/pkg
 }
diff --git a/abs/extra-testing/mythexport/mythexport.install b/abs/extra-testing/mythexport/mythexport.install
index a0a2e1b..edd60f5 100644
--- a/abs/extra-testing/mythexport/mythexport.install
+++ b/abs/extra-testing/mythexport/mythexport.install
@@ -1,5 +1,5 @@
 # arg 1:  the new package version
-post_install() {a
+post_install() {
 	mysql -u root mythconverg < /usr/share/mythtv/mythexport.sql
 	ln -s /usr/share/mythtv/mythexport /data/srv/httpd/htdocs/
 	ln -s /myth/archive /usr/share/mythtv/mythexport/video