From e701828d0ad4e5b2476f6e88163f17eb182fcf96 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Mon, 31 Aug 2009 19:44:03 -0700
Subject: MythAppleTrailers:Fixes the URL change.

---
 abs/extra-testing/mythappletrailers/PKGBUILD       |   5 +-
 .../mythappletrailers/appletrailer.xml             | 306 ++++++++++-----------
 .../mythappletrailers/fix_aple_url.sh              |   3 +
 abs/extra-testing/mythappletrailers/trailers       |   2 +-
 4 files changed, 145 insertions(+), 171 deletions(-)
 create mode 100644 abs/extra-testing/mythappletrailers/fix_aple_url.sh

diff --git a/abs/extra-testing/mythappletrailers/PKGBUILD b/abs/extra-testing/mythappletrailers/PKGBUILD
index 7cb7f7a..fd9a6b8 100644
--- a/abs/extra-testing/mythappletrailers/PKGBUILD
+++ b/abs/extra-testing/mythappletrailers/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=mythappletrailers
 pkgver=0.04.3
-pkgrel=29
+pkgrel=30
 pkgdesc="Unofficial Add-on for MythTV to get Apple.com Movie Trailers."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -11,7 +11,7 @@ url="http://www.mythtv.org/wiki/index.php/Myth_Apple_Trailers"
 depends=('php' 'mythtv' 'mplayer-wrapper')
 install=mythappletrailers.install
 source=('myth_trailers_grabber' 'appletrailer.xml'
-	'trailers' 'loading.sh')
+'trailers' 'loading.sh' 'fix_aple_url.sh')
 
 build() {
   mkdir -p $startdir/pkg/usr/bin
@@ -26,4 +26,5 @@ build() {
   cp myth_trailers_grabber $startdir/pkg/usr/bin/
   cp loading.sh $startdir/pkg/usr/bin/
   cp trailers $startdir/pkg/etc/cron.daily/
+  install -m755 $srcdir/fix_aple_url.sh $pkgdir/usr/bin
 }
diff --git a/abs/extra-testing/mythappletrailers/appletrailer.xml b/abs/extra-testing/mythappletrailers/appletrailer.xml
index 11f5f9d..dc0c938 100644
--- a/abs/extra-testing/mythappletrailers/appletrailer.xml
+++ b/abs/extra-testing/mythappletrailers/appletrailer.xml
@@ -2,751 +2,721 @@
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>2012</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/2012/2012-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/2012/2012-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>500 Days of Summer</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/500daysofsummer/500daysofsummer-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/500daysofsummer/500daysofsummer-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>9</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/focus_features/9/9-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/focus_features/9/9-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Adam</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/adam/adam-tlra_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/adam/adam-tlra_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Alice In Wonderland</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/aliceinwonderland/aliceinwonderland-tsr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/aliceinwonderland/aliceinwonderland-tsr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Aliens In the Attic</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/aliensintheattic/aliensintheattic-tlrg_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/aliensintheattic/aliensintheattic-tlrg_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>All About Steve</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/allaboutsteve/allaboutsteve-tlrc_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/allaboutsteve/allaboutsteve-tlrc_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Alvin and the Chipmunks: the Squeakquel</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/alvinandthechipmunks2/alvinsqueekquel-tlrd_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/alvinandthechipmunks2/alvinsqueekquel-tlrd_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Amelia</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/amelia/amelia-tlra_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/amelia/amelia-tlra_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Amreeka</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/amreeka/amreeka_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Answer Man</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/theanswerman/theanswerman_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/theanswerman/theanswerman_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Armored</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/armored/armored-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/armored/armored-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Astro Boy</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/astroboy/astroboy-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/astroboy/astroboy-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Avatar</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/avatar/avatar2009aug0820a-tsr_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/avatar/avatar2009aug0820a-tsr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Bandslam</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/bandslam/bandslam-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/bandslam/bandslam-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Beyond a Reasonable Doubt</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/beyondareasonabledoubt/beyondareasonabledoubt_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/beyondareasonabledoubt/beyondareasonabledoubt_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Big Fan</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/bigfan/bigfan_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/bigfan/bigfan_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Blue Tooth Virgin</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/thebluetoothvirgin/thebluetoothvirgin_h640w.mov</action>
+		<text>The Blind Side</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/theblindside/theblindside-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Book of Eli</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/thebookofeli/thebookofeli-tlr1a_h640w.mov</action>
+		<text>The Blue Tooth Virgin</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/thebluetoothvirgin/thebluetoothvirgin_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Box</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/thebox/thebox-tlr1a_h640w.mov</action>
+		<text>The Book of Eli</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/thebookofeli/thebookofeli-tlr1a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Brüno</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/bruno/bruno-tlr_h640w.mov</action>
+		<text>The Box</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/thebox/thebox-tlr1a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Bright Star</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/brightstar/brightstar_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/brightstar/brightstar_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Brothers</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/brothers/brothers-tlr1a_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/brothers/brothers-tlr1a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Burning Plain</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/theburningplain/theburningplain_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/theburningplain/theburningplain_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Capitalism: a Love Story</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/untitledmichaelmooreproject/untitledmichaelmoore-tsr_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/capitalismalovestory/capitalismalovestory-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Carriers</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount_vantage/carriers/carriers-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount_vantage/carriers/carriers-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Casi Divas</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/casidivas/casidivas_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/casidivas/casidivas_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Cloudy With a Chance of Meatballs</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/cloudywithachanceofmeatballs/cloudywithachance-tlr3_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/cloudywithachanceofmeatballs/cloudywithachance-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Coco Before Chanel</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/cocobeforechanel/cocobeforechanel_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/cocobeforechanel/cocobeforechanel_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Cold Souls</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/samuel_goldwyn/coldsouls/coldsouls_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/samuel_goldwyn/coldsouls/coldsouls_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Collector</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/thecollector/thecollector_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/thecollector/thecollector_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Couples Retreat</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/couplesretreat/couplesretreat-tlr_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/couplesretreat/couplesretreat-tlr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Cove</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/thecove/thecove_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/thecove/thecove_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Damned United</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/thedamnedunited/thedamnedunited_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/thedamnedunited/thedamnedunited_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Daybreakers</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/daybreakers/daybreakers-tlr1c_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/daybreakers/daybreakers-tlr1c_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Despicable Me</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/despicableme/despicableme-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/despicableme/despicableme-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>District 9</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/district9/district9-tlr4_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/district9/district9-tlr4_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>An Education</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/aneducation/aneducation_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/aneducation/aneducation_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Extract</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/miramax/extract/extract-tsr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/miramax/extract/extract-inttlr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Fame</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/mgm/fame/fame-tlr4_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/mgm/fame/fame-tlr2r_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Fantastic Mr. Fox</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/fantasticmrfox/fantasticmrfox-tlra_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/fantasticmrfox/fantasticmrfox-tlra_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Final Destination</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/newline/thefinaldestination/thefinaldestination-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/newline/thefinaldestination/thefinaldestination-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Five Minutes of Heaven</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/ifc_films/fiveminutesofheaven/fiveminutesofheaven_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/ifc_films/fiveminutesofheaven/fiveminutesofheaven_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Funny People</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/funnypeople/funnypeople-tlr1r_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/funnypeople/funnypeople-tlr1r_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>G-Force</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/gforce/gforce-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/gforce/gforce-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>G.I. Joe: Rise of Cobra</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/gijoe/gijoetheriseofcobra-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/gijoe/gijoetheriseofcobra-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Gamer</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/gamer/gamer-tlr2a_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/gamer/gamer-tlr2a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Gentlemen Broncos</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/gentlemenbroncos/gentlemenbroncos_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Goods: Live Hard. Sell Hard.</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount_vantage/thegoods/thegoods-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/gentlemenbroncos/gentlemenbroncos_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Grace</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/grace/grace_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/grace/grace_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Halloween 2</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/weinstein/halloween2/halloweenii-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/weinstein/halloween2/halloweenii-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Hangover</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/thehangover/thehangover-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Harry Potter and the Half-Blood Prince</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/harrypotterandthehalfbloodprince/harrypotterhalfbloodprince-tlr4b_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Humpday</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/humpday/humpday_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/thehangover/thehangover-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Hurt Locker</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/thehurtlocker/thehurtlocker_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/thehurtlocker/thehurtlocker_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>I Can Do Bad All by Myself</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/icandobadallbymyself/icandobadallbymyself-tlr2a_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>I Love You Beth Cooper</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/iloveyoubethcooper/iloveyoubethcooper-tlra_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/icandobadallbymyself/icandobadallbymyself-tlr2a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>I Sell the Dead</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/ifc_films/isellthedead/isellthedead_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/ifc_films/isellthedead/isellthedead_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Ice Age: Dawn of the Dinosaurs</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/ice_age_iii/iceage3-tlrn_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/ice_age_iii/iceage3-tlrn_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>In the Loop</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/ifc_films/intheloop/intheloop_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/ifc_films/intheloop/intheloop_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Informant!</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/theinformant/theinformant-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/theinformant/theinformant-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Inglourious Basterds</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/weinstein/inglouriousbasterds/inglouriousbasterds-tlr4_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/weinstein/inglouriousbasterds/inglouriousbasterds-tlr4_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Invention of Lying</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/theinventionoflying/theinventionoflying-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/theinventionoflying/theinventionoflying-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>It Might Get Loud</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/itmightgetloud/itmightgetloud_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/itmightgetloud/itmightgetloud_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>It’s Complicated</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/itscomplicated/itscomplicated_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/itscomplicated/itscomplicated_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Jennifer’s Body</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/jennifersbody/jennifersbody-tlrc_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/jennifersbody/jennifersbody-tlrc_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Julie  Julia</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/julieandjulia/julieandjulia-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/julieandjulia/julieandjulia-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Last Airbender</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/thelastairbender/thelastairbender-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/thelastairbender/thelastairbender-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Law Abiding Citizen</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/lawabidingcitizen/lawabidingcitizen_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/lawabidingcitizen/lawabidingcitizen_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Legion</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/legion/legion-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/legion/legion-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Live Music</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/livemusic/livemusic_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/livemusic/livemusic_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Lorna’s Silence</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/lornassilence/lornassilence_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/lornassilence/lornassilence_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Love Happens</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/lovehappens/lovehappens-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/lovehappens/lovehappens-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Lovely Bones</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/thelovelybones/thelovelybones_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/thelovelybones/thelovelybones_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>The Men Who Stare At Goats</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/overture/themenwhostareatgoats/themenwhostareatgoats_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>More Than a Game</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/morethanagame/morethanagame-tlr1a_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/morethanagame/morethanagame-tlr1a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>My One and Only</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/myoneandonly/myoneandonly_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/myoneandonly/myoneandonly_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>New York, I Love You</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/newyorkiloveyou/newyorkiloveyou_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/newyorkiloveyou/newyorkiloveyou_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Night At the Museum: Battle of the Smithsonian</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/nightatthemuseum2/nightatthemuseum2-tlro_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/nightatthemuseum2/nightatthemuseum2-tlro_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Nine</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/weinstein/nine/nine-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/weinstein/nine/nine-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Ninja Assassin</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/ninjaassassin/ninjaassassin-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/ninjaassassin/ninjaassassin-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Oceans</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/oceans/oceans-tsr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/oceans/oceans-tsr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Old Dogs</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/olddogs/olddogs_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/olddogs/olddogs_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Ong Bak 2</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/ongbak2/ongbak2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/ongbak2/ongbak2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Orphan</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/orphan/orphan-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/orphan/orphan-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Other Man</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/theotherman/theotherman_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/theotherman/theotherman_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Pandorum</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/pandorum/pandorum-tl1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/pandorum/pandorum-tl1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Paper Heart</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/paperheart/paperheart_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/paperheart/paperheart_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Paris</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/ifc_films/paris/paris_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/ifc_films/paris/paris_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>A Perfect Getaway</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/aperfectgetaway/aperfectgetaway_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/aperfectgetaway/aperfectgetaway_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Planet 51</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/planet51/planet51-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/planet51/planet51-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Play the Game</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/playthegame/playthegame_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/playthegame/playthegame_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Ponyo</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/ponyo/ponyo_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/ponyo/ponyo_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Post Grad</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/postgrad/postgrad-tlra_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/postgrad/postgrad-tlra_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Precious</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/precious/precious-tlr2a_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/precious/precious-tlr2a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Princess and the Frog</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/princessandthefrog/princessandthefrog-tsr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/princessandthefrog/princessandthefrog-tsr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Proposal</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/touchstone/theproposal/theproposal-tlr3_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Public Enemies</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/publicenemies/publicenemies-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/touchstone/theproposal/theproposal-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Road</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/weinstein/theroad/theroad_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/weinstein/theroad/theroad_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Saw VI</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/saw6/sawvi_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/saw6/sawvi_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The September Issue</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/theseptemberissue/theseptemberissue_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/theseptemberissue/theseptemberissue_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Sherlock Holmes</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/sherlockholmes/sherlockholmes-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/sherlockholmes/sherlockholmes-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Shorts</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/shorts/shorts-tlr3_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/shorts/shorts-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Shrink</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/shrink/shrink-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/shrink/shrink-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Shutter Island</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/shutterisland/shutterisland-tlr1r_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/shutterisland/shutterisland-tlr1r2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Sorority Row</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/sororityrow/sororityrow-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Soul Power</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/soulpower/soulpower_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/sororityrow/sororityrow-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Spread</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/spread/spread_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/spread/spread_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>St. Trinian’s</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/sttrinians/sttrinians_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Star Trek</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/star_trek/startrek-tlr3_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/sttrinians/sttrinians_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Stepfather</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/thestepfather/thestepfather_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/thestepfather/thestepfather_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Surrogates</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/touchstone/surrogates/surrogates-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/touchstone/surrogates/surrogates-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Surviving Crooked Lake</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/survivingcrookedlake/survivingcrookedlake_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/survivingcrookedlake/survivingcrookedlake_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Taking Woodstock</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/focus_features/takingwoodstock/takingwoodstock-tlr_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/focus_features/takingwoodstock/takingwoodstock-tlr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Time Traveler’s Wife</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/newline/timetravelerswife/timetravelerswife-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/newline/timetravelerswife/timetravelerswife-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Toy Story 3</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/toystory3/toystory3-tsr_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/toystory3/toystory3-tsr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Twilight Saga: New Moon</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/newmoon/newmoon-tsr1_h640w.mov</action>
+		<text>Transformers: Revenge of the Fallen</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/transformers2/transformersrevengeofthefallen-tlr2r_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Ugly Truth</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/theuglytruth/theuglytruth-tlr2_h640w.mov</action>
+		<text>The Twilight Saga: New Moon</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/newmoon/newmoon-tsr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Walt  El Grupo</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/waltandelgrupo/waltandelgrupo_h640w.mov</action>
+		<text>The Ugly Truth</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/theuglytruth/theuglytruth-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Weather Girl</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/weathergirl/weathergirl_h640w.mov</action>
+		<text>Walt  El Grupo</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/waltandelgrupo/waltandelgrupo_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Where the Wild Things Are</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/wherethewildthingsare/wtwta-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/wherethewildthingsare/wtwta-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Whip It</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/whipit/whipit_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/whipit/whipit_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>White On Rice</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/whiteonrice/whiteonrice_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/whiteonrice/whiteonrice_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Whiteout</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/whiteout/whiteout-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/whiteout/whiteout-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>World’s Greatest Dad</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/worldsgreatestdad/worldsgreatestdad_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/worldsgreatestdad/worldsgreatestdad_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>X Games 3D: the Movie</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/xgames3d/xgames3d_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/xgames3d/xgames3d_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Zombieland</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/zombieland/zombieland-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/zombieland/zombieland-tlr1_h640w.mov</action>
 	</button>
 
 </mythmenu>
diff --git a/abs/extra-testing/mythappletrailers/fix_aple_url.sh b/abs/extra-testing/mythappletrailers/fix_aple_url.sh
new file mode 100644
index 0000000..a08be65
--- /dev/null
+++ b/abs/extra-testing/mythappletrailers/fix_aple_url.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+cat /home/mythtv/appletrailer.xml | sed -e 's|http:/\/\movies.apple|http:\/\/apple|g' > /tmp/appletrailer.xml
+mv /tmp/appletrailer.xml /home/mythtv
diff --git a/abs/extra-testing/mythappletrailers/trailers b/abs/extra-testing/mythappletrailers/trailers
index aa705c9..241a60a 100755
--- a/abs/extra-testing/mythappletrailers/trailers
+++ b/abs/extra-testing/mythappletrailers/trailers
@@ -1,2 +1,2 @@
 #!/bin/sh
-su mythtv -c '/usr/bin/php -q /usr/bin/myth_trailers_grabber > /home/mythtv/appletrailer.xml' 2>/dev/null
+su mythtv -c '/usr/bin/php -q /usr/bin/myth_trailers_grabber > /home/mythtv/appletrailer.xml && /usr/bin/fix_aple_url.sh' 2>/dev/null
-- 
cgit v0.12


From e3ae7b7fe750ebf74ca2e6749ecd9a284f9fdda8 Mon Sep 17 00:00:00 2001
From: Greg Frost <gregfrost1@bigpond.com>
Date: Fri, 4 Sep 2009 07:44:49 +0930
Subject: scanfw scte65scan: initial inclusion

---
 abs/extra-testing/rrdtool/PKGBUILD              |   2 +-
 abs/extra-testing/scanfw/PKGBUILD               |  23 +++++++++++++++++++++++
 abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz | Bin 0 -> 45883 bytes
 abs/extra-testing/scanfw/scanfw.install         |   5 +++++
 abs/extra-testing/scte65scan/PKGBUILD           |  23 +++++++++++++++++++++++
 5 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 abs/extra-testing/scanfw/PKGBUILD
 create mode 100644 abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz
 create mode 100644 abs/extra-testing/scanfw/scanfw.install
 create mode 100644 abs/extra-testing/scte65scan/PKGBUILD

diff --git a/abs/extra-testing/rrdtool/PKGBUILD b/abs/extra-testing/rrdtool/PKGBUILD
index e128f0e..9d67224 100644
--- a/abs/extra-testing/rrdtool/PKGBUILD
+++ b/abs/extra-testing/rrdtool/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=rrdtool
 pkgver=1.3.6
-pkgrel=5
+pkgrel=7
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64')
 url="http://www.rrdtool.org"
diff --git a/abs/extra-testing/scanfw/PKGBUILD b/abs/extra-testing/scanfw/PKGBUILD
new file mode 100644
index 0000000..21d4f29
--- /dev/null
+++ b/abs/extra-testing/scanfw/PKGBUILD
@@ -0,0 +1,23 @@
+# Contributor: Michael Hanson <hansonorders@verizon.net>
+pkgname=scanfw
+pkgver=98d.beta
+pkgrel=1
+pkgdesc="A CCI scanner for MythTV"
+arch=('i686')
+url="https://help.ubuntu.com/community/MythTV_Firewire/scanfw"
+license=('GPL2')
+depends=('libraw1394' 'libiec61883' 'libavc1394')
+install=scanfw.install
+source=($pkgname-$pkgver.tar.gz)
+md5sums=('8b1da4fca459062f366232a3de6c7775')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make || return 1
+  mkdir -p "$pkgdir"/usr/bin
+  mkdir -p "$pkgdir"/usr/share/doc/"$pkgname"
+  cp "$srcdir"/"$pkgname"-"$pkgver"/scanfw "$pkgdir"/usr/bin/ || return 1
+  cp "$srcdir"/"$pkgname"-"$pkgver"/mythtv.firewire.channels.pl "$pkgdir"/usr/bin/ || return 1
+  cp "$srcdir"/"$pkgname"-"$pkgver"/SCAN_TIPS "$pkgdir"/usr/share/doc/"$pkgname" || return 1
+  cp "$srcdir"/"$pkgname"-"$pkgver"/README "$pkgdir"/usr/share/doc/"$pkgname" || return 1
+}
diff --git a/abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz b/abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz
new file mode 100644
index 0000000..7bd0ee9
Binary files /dev/null and b/abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz differ
diff --git a/abs/extra-testing/scanfw/scanfw.install b/abs/extra-testing/scanfw/scanfw.install
new file mode 100644
index 0000000..d5695a9
--- /dev/null
+++ b/abs/extra-testing/scanfw/scanfw.install
@@ -0,0 +1,5 @@
+post_install() {
+   echo "==> Information on usage is in /usr/share/doc/scanfw/README."
+   echo "==> Scanning tips can be found in /usr/share/doc/scanfw/SCAN_TIPS."
+}
+
diff --git a/abs/extra-testing/scte65scan/PKGBUILD b/abs/extra-testing/scte65scan/PKGBUILD
new file mode 100644
index 0000000..221b7ba
--- /dev/null
+++ b/abs/extra-testing/scte65scan/PKGBUILD
@@ -0,0 +1,23 @@
+# Contributor: Michael Hanson <hansonorders@verizon.net>
+pkgname=scte65scan
+pkgver=0.2.1
+pkgrel=1
+pkgdesc="A reader and parser of SCTE-65 in-band SI data with HDHomerun support."
+arch=('i686')
+url="http://scte65scan.sourceforge.net/"
+license=('GPL')
+source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tgz http://download.silicondust.com/hdhomerun/libhdhomerun_20090830.tgz)
+md5sums=('1ab2d5f1895931c9c1192ee0dcc46f11'
+         '9c51200782c159703f3b32de24ae2608')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  tar zxf "$srcdir"/libhdhomerun_20090830.tgz
+  make -f Makefile.hdhr || return 1
+  mkdir -p "$pkgdir"/usr/bin || return 1
+  mkdir -p "$pkgdir"/usr/share/doc/"$pkgname" || return 1
+  cp "$srcdir"/"$pkgname"-"$pkgver"/scte65scan "$pkgdir"/usr/bin/ || return 1
+  cp "$srcdir"/"$pkgname"-"$pkgver"/Changelog "$pkgdir"/usr/share/doc/"$pkgname" || return 1
+  cp "$srcdir"/"$pkgname"-"$pkgver"/README "$pkgdir"/usr/share/doc/"$pkgname" || return 1
+  cp "$srcdir"/"$pkgname"-"$pkgver"/us-Cable-Standard-center-frequencies-QAM256 "$pkgdir"/usr/share/doc/"$pkgname" || return 1
+}
-- 
cgit v0.12


From ac4712c7309eb92589350836870bd882233fc7cc Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 5 Sep 2009 12:19:49 -0700
Subject: PHP:Changes to php.ini for Zoneminder.

---
 abs/core-testing/php/PKGBUILD | 2 +-
 abs/core-testing/php/php.ini  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/abs/core-testing/php/PKGBUILD b/abs/core-testing/php/PKGBUILD
index c549d56..45cc17a 100644
--- a/abs/core-testing/php/PKGBUILD
+++ b/abs/core-testing/php/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=php
 pkgver=5.2.6
-pkgrel=20
+pkgrel=21
 _suhosinver=0.9.6.2
 pkgdesc='A high-level scripting language'
 arch=('i686' 'x86_64')
diff --git a/abs/core-testing/php/php.ini b/abs/core-testing/php/php.ini
index 21c3db1..8cbcd56 100644
--- a/abs/core-testing/php/php.ini
+++ b/abs/core-testing/php/php.ini
@@ -249,7 +249,7 @@ safe_mode_protected_env_vars = LD_LIBRARY_PATH
 ; and below.  This directive makes most sense if used in a per-directory
 ; or per-virtualhost web server configuration file. This directive is
 ; *NOT* affected by whether Safe Mode is turned On or Off.
-open_basedir = /data/srv/httpd/htdocs/:/home/:/tmp/:/usr/share/pear/:/data/srv/tmp:/usr/share/mythtv/mythweather/scripts/:/data/srv/httpd/htdocs/mythweb/data/video:/myth/ipodfeed:/data/srv/httpd/htdocs/archive
+open_basedir = /data/srv/httpd/htdocs/:/home/:/tmp/:/usr/share/pear/:/data/srv/tmp:/usr/share/mythtv/mythweather/scripts/:/data/srv/httpd/htdocs/mythweb/data/video:/myth/ipodfeed:/data/srv/httpd/htdocs/archive:/etc
 
 ; This directive allows you to disable certain functions for security reasons.
 ; It receives a comma-delimited list of function names. This directive is
-- 
cgit v0.12


From 8151fa32c2bf2c112d9110ecf9232b0f7bab331d Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 5 Sep 2009 12:21:54 -0700
Subject: PHP:  Updated md5sum for php.ini.

---
 abs/core-testing/php/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/abs/core-testing/php/PKGBUILD b/abs/core-testing/php/PKGBUILD
index 45cc17a..978bf8c 100644
--- a/abs/core-testing/php/PKGBUILD
+++ b/abs/core-testing/php/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=php
 pkgver=5.2.6
-pkgrel=21
+pkgrel=22
 _suhosinver=0.9.6.2
 pkgdesc='A high-level scripting language'
 arch=('i686' 'x86_64')
@@ -44,7 +44,7 @@ source=("http://museum.php.net/php5/${pkgname}-${pkgver}.tar.bz2" \
         'php.ini' 'apache.conf' 'db-configure.patch')
 md5sums=('7380ffecebd95c6edb317ef861229ebd'
          'f2ec986341a314c271259dbe4d940858'
-         '160b4a4f6fba59e646c3b79e3cb0f134'
+         'fda535c2b333297972aad48ee9285b45'
          '96ca078be6729b665be8a865535a97bf'
          '74e5ce5a02488ec91b1c59f539e42936')
 
-- 
cgit v0.12


From 87af0223bb6bf389e73bd6d474b31b6a7177f86f Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 5 Sep 2009 14:08:49 -0700
Subject: Zoneminder:Changes needed to run on LinHES.

---
 abs/core-testing/zoneminder/PKGBUILD           | 16 ++++++------
 abs/core-testing/zoneminder/zm.conf.patch      |  4 +--
 abs/core-testing/zoneminder/zoneminder.install | 36 ++++----------------------
 3 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/abs/core-testing/zoneminder/PKGBUILD b/abs/core-testing/zoneminder/PKGBUILD
index 5071e81..91723cb 100644
--- a/abs/core-testing/zoneminder/PKGBUILD
+++ b/abs/core-testing/zoneminder/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=zoneminder
 pkgver=1.23.3
-pkgrel=7
+pkgrel=8
 pkgdesc="Capture, analyse, record and monitor video security cameras."
 arch=('i686')
 url="http://www.zoneminder.com"
@@ -30,7 +30,7 @@ source=(http://www2.zoneminder.com/downloads/ZoneMinder-$pkgver.tar.gz \
 noextract=()
 md5sums=('ee803f0f71d6e67adf602c3557fb6bc9'
          'af8631abe20cd7dcab1a023af7d4f3e8'
-         '246852035905589617b9e0dc63759d27'
+         '1a6c94411f8adb53a10dc7c19c3bbf02'
          '320dd41725945218de0672f899e1d739'
          '818cec2eba7e1efb3f5c410f6dd8d528'
          'f9720872736f26d17bc49d8725b75ae4'
@@ -51,11 +51,11 @@ build() {
 
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
-		--with-webuser=nobody  \
-		--with-webgroup=nobody \
+		--with-webuser=http  \
+		--with-webgroup=http \
 		--with-mysql=/usr  \
-		--with-webdir=/home/httpd/html/zm  \
-		--with-cgidir=/home/httpd/cgi-bin \
+		--with-webdir=/data/srv/httpd/htdocs/zm  \
+		--with-cgidir=/data/srv/httpd/htdocs/cgi-bin \
 		--bindir=/usr/lib/zm/bin
 
   patch -p1 < $startdir/src/Makefile.patch
@@ -71,9 +71,9 @@ build() {
   install -D -m 700 $startdir/src/zmeventdump  $startdir/pkg/etc/cron.hourly/zmeventdump
 
   tar -zxf $startdir/src/cambozola-0.50.tar.gz 
-  install -m 644  cambozola-0.50/dist/cambozola.jar $startdir/pkg/home/httpd/html/zm/cambozola.jar
+  install -m 644  cambozola-0.50/dist/cambozola.jar $startdir/pkg/data/srv/httpd/htdocs/zm/cambozola.jar
 
-  install $startdir/src/mootools.v1.11.js  $startdir/pkg/home/httpd/html/zm/mootools.js
+  install $startdir/src/mootools.v1.11.js  $startdir/pkg/data/srv/httpd/htdocs/zm/mootools.js
   install -D -m 700 $startdir/src/customdb $startdir/pkg/usr/lib/zm/upgrade/customdb
 	install -D  db/zm*.sql $startdir/pkg/usr/lib/zm/upgrade/
 
diff --git a/abs/core-testing/zoneminder/zm.conf.patch b/abs/core-testing/zoneminder/zm.conf.patch
index b3406a8..f7a9870 100644
--- a/abs/core-testing/zoneminder/zm.conf.patch
+++ b/abs/core-testing/zoneminder/zm.conf.patch
@@ -13,8 +13,8 @@
  
  # ZoneMinder database user
 -ZM_DB_USER=@ZM_DB_USER@
-+ZM_DB_USER=
++ZM_DB_USER=mythtv
  
  # ZoneMinder database password
 -ZM_DB_PASS=@ZM_DB_PASS@
-+ZM_DB_PASS=
++ZM_DB_PASS=mythtv
diff --git a/abs/core-testing/zoneminder/zoneminder.install b/abs/core-testing/zoneminder/zoneminder.install
index 27ba60a..c2ae861 100644
--- a/abs/core-testing/zoneminder/zoneminder.install
+++ b/abs/core-testing/zoneminder/zoneminder.install
@@ -7,46 +7,20 @@ pre_install() {
 
 ## arg 1:  the new package version
 post_install() {
-chown nobody.nobody /home/httpd/html/zm/events
-chown nobody.nobody /home/httpd/html/zm/images
-chown nobody.nobody /home/httpd/html/zm/temp
-chown nobody.nobody /etc/zm.conf
+chown http.http /data/srv/httpd/htdocs/zm/events
+chown http.http /data/srv/httpd/htdocs/zm/images
+chown http.http /data/srv/httpd/htdocs/zm/temp
+chown http.http /etc/zm.conf
 
 cat << EOF
 Note:
-==> Edit /etc/zm.conf to define a user and password for
+==> mythtv has been defined in /etc/zm.conf as user and password for
 ==> The zoneminder (zm) database
 ==> To initialize the ZoneMinder database run (as root)
 ==> /usr/lib/zm/bin/zminit
 
 EOF
 
-cat /etc/php/php.ini |grep "^extension=mysql.so" >/dev/null || cat << EOF
-==> You must edit /etc/php/php.ini and uncomment "extension=mysql.so"
-==> so php and MySQL can play together.
-
-EOF
-cat /etc/php/php.ini |grep "^short_open_tag = On" >/dev/null || cat << EOF
-==> You must edit /etc/php/php.ini and set short_open_tag = On
-==> or ZoneMinder will not work
-
-EOF
-
-
-cat /etc/php/php.ini |grep "^open_basedir.*/etc/" >/dev/null ||  cat << EOF
-==> You must edit /etc/php/php.ini and add to it open_basedir "/etc/" as such:
-==> open_basedir = /home/:/tmp/:/usr/share/pear/:/etc/
-==> Otherwise ZoneMinder will be unable to read /etc/zm.conf
-
-EOF
-
-cat /etc/httpd/conf/httpd.conf |grep "^LoadModule php" >/dev/null || cat << EOF
-Note:
-==> You must edit /etc/httpd/conf/httpd.conf and uncomment the line
-==> #LoadModule php5_module modules/libphp5.so
-
-EOF
-
 cat /etc/sysctl.conf |grep "kernel.shmall" >/dev/null || cat << EOF
 ==> To raise the limit on shared memory for zoneminder
 ==> add these lines to /etc/sysctl.conf
-- 
cgit v0.12


From 5651b03574d2dc2d117840022d01326885d7392f Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 5 Sep 2009 15:43:09 -0700
Subject: MythInstall:Added MythZoneMinder to list of installable software.

---
 abs/core-testing/mythinstall/PKGBUILD            |  2 +-
 abs/core-testing/mythinstall/installsettings.cpp | 13 +++++++++++++
 abs/core-testing/mythinstall/installsettings.h   |  1 +
 abs/core-testing/mythtv/stable/mythtv/PKGBUILD   |  2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/abs/core-testing/mythinstall/PKGBUILD b/abs/core-testing/mythinstall/PKGBUILD
index c614fac..5a936da 100644
--- a/abs/core-testing/mythinstall/PKGBUILD
+++ b/abs/core-testing/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jams
 pkgname=mythinstall
 pkgver=1
-pkgrel=10
+pkgrel=11
 pkgdesc="LinHES installer/systemconfig GUI."
 arch=i686
 depends=()
diff --git a/abs/core-testing/mythinstall/installsettings.cpp b/abs/core-testing/mythinstall/installsettings.cpp
index 3942460..0a6afb5 100755
--- a/abs/core-testing/mythinstall/installsettings.cpp
+++ b/abs/core-testing/mythinstall/installsettings.cpp
@@ -1344,6 +1344,16 @@ static HostCheckBox *HostXscreensaver()
 };
 
 
+static HostCheckBox *Hostpluginmythzoneminder()
+{
+    HostCheckBox *gc = new HostCheckBox("Hostpluginmythzoneminder");
+    gc->setLabel(QObject::tr("mythzoneminder"));
+    gc->setValue(false);
+    gc->setHelpText(QObject::tr("check to enable mythzoneminder"));
+    return gc;
+};
+
+
 // -------------End plugins--------------------------------
 
 
@@ -3923,6 +3933,7 @@ void writesettings ()
         hostparm.ThisHostpluginmythsmolt = gContext->GetSetting("Hostpluginmythsmolt");
         hostparm.ThisHostpluginmythvideo = gContext->GetSetting("Hostpluginmythvideo");
         hostparm.ThisHostpluginmythweather = gContext->GetSetting("Hostpluginmythweather");
+        hostparm.ThisHostpluginmythzoneminder = gContext->GetSetting("Hostpluginmythzoneminder");
         hostparm.ThisHostpluginmythgameFceu = gContext->GetSetting("HostpluginmythgameFceu");
         hostparm.ThisHostpluginmythgameZsnes = gContext->GetSetting("HostpluginmythgameZsnes");
         hostparm.ThisHostpluginmythgameMame = gContext->GetSetting("HostpluginmythgameMame");
@@ -4168,6 +4179,7 @@ void writesettings ()
         myfile << "mythsmolt=\"" + hostparm.ThisHostpluginmythsmolt + "\"\n";
         myfile << "mythvideo=\"" + hostparm.ThisHostpluginmythvideo + "\"\n";
         myfile << "mythweather=\"" + hostparm.ThisHostpluginmythweather + "\"\n";
+        myfile << "mythzoneminder=\"" + hostparm.ThisHostpluginmythzoneminder + "\"\n";
 
         myfile << "fceu=\"" + hostparm.ThisHostpluginmythgameFceu + "\"\n";
         myfile << "zsnes=\"" + hostparm.ThisHostpluginmythgameZsnes + "\"\n";
@@ -4427,6 +4439,7 @@ MythInstallSettings::MythInstallSettings()
                     GridShowPlugin2->addChild(Hostpluginmythphone());
                     GridShowPlugin2->addChild(Hostpluginmythsmolt());
                     GridShowPlugin2->addChild(Hostpluginmythweather());
+                    GridShowPlugin2->addChild(Hostpluginmythzoneminder());
 
                     ConfigurationGroup *GridShowPlugin4 = new GridConfigurationGroup(2);
                     GridShowPlugin4->addChild(Hostpluginmythappletrailers());
diff --git a/abs/core-testing/mythinstall/installsettings.h b/abs/core-testing/mythinstall/installsettings.h
index c140f3d..a177921 100755
--- a/abs/core-testing/mythinstall/installsettings.h
+++ b/abs/core-testing/mythinstall/installsettings.h
@@ -442,6 +442,7 @@ struct HostParms
         QString ThisHostpluginmythsmolt;
         QString ThisHostpluginmythvideo;
         QString ThisHostpluginmythweather;
+        QString ThisHostpluginmythzoneminder;
         QString ThisHostpluginmythgameFceu;
         QString ThisHostpluginmythgameZsnes;
         QString ThisHostpluginmythgameMame;
diff --git a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
index f6114c4..4b67da4 100644
--- a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=0.21
-pkgrel=81
+pkgrel=82
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg'
-- 
cgit v0.12


From a3bffeb6e46ffef4c418be6d52b6c5c4428f2745 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 5 Sep 2009 15:45:15 -0700
Subject: LinHES-config:Added mythzoneminder.

---
 abs/core-testing/LinHES-config/PKGBUILD       | 2 +-
 abs/core-testing/LinHES-config/mv_software.py | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index de4e94b..4d01bbe 100644
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.0
-pkgrel=90
+pkgrel=91
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
 pkgdesc="Install and configure your system"
 depends=(bc libstatgrab  mysql-python expect curl dnsutils parted 
diff --git a/abs/core-testing/LinHES-config/mv_software.py b/abs/core-testing/LinHES-config/mv_software.py
index 0a96bb3..55711da 100755
--- a/abs/core-testing/LinHES-config/mv_software.py
+++ b/abs/core-testing/LinHES-config/mv_software.py
@@ -15,7 +15,8 @@ def setup_software(systemconfig, data_config):
         postfix = "-svn"
 
       default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews",
-                          "mythgame", "mythflix", "mythweather" )
+                          "mythgame", "mythflix", "mythweather",
+			  "mythzoneminder" )
 
       default_installed=("mythcontrols", "mythgallery", "mythmovies",
                           "mythmusic", "mythsmolt", "mythvideo")
@@ -23,7 +24,8 @@ def setup_software(systemconfig, data_config):
     else:
       default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews",
                           "mythgame", "mythflix", "mythweather",
-                          "mythappletrailers", "mythstream", "mythvodka")
+                          "mythappletrailers", "mythstream", "mythvodka",
+			  "mythzoneminder" )
 
       default_installed=("mythcontrols", "mythgallery", "mythmovies",
                           "mythmusic", "mythsmolt", "mythvideo")
-- 
cgit v0.12


From afe6ac82a74d0e3a561dd52aaac6c9e4ac7e4ad8 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 5 Sep 2009 18:21:48 -0700
Subject: zoneminder:bumped to recompile for ffmpeg-svn.

---
 abs/core-testing/zoneminder/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abs/core-testing/zoneminder/PKGBUILD b/abs/core-testing/zoneminder/PKGBUILD
index 91723cb..fdb0dbc 100644
--- a/abs/core-testing/zoneminder/PKGBUILD
+++ b/abs/core-testing/zoneminder/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=zoneminder
 pkgver=1.23.3
-pkgrel=8
+pkgrel=9
 pkgdesc="Capture, analyse, record and monitor video security cameras."
 arch=('i686')
 url="http://www.zoneminder.com"
-- 
cgit v0.12


From 4c2bbdfa9aec057c1815345a2790d58318f80165 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 5 Sep 2009 20:42:14 -0700
Subject: ZoneMinder:Further enhancements to run on LinHES.

---
 abs/core-testing/zoneminder/PKGBUILD           | 7 +++++--
 abs/core-testing/zoneminder/run                | 6 ++++++
 abs/core-testing/zoneminder/zoneminder.install | 4 +++-
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100755 abs/core-testing/zoneminder/run

diff --git a/abs/core-testing/zoneminder/PKGBUILD b/abs/core-testing/zoneminder/PKGBUILD
index fdb0dbc..94a543a 100644
--- a/abs/core-testing/zoneminder/PKGBUILD
+++ b/abs/core-testing/zoneminder/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=zoneminder
 pkgver=1.23.3
-pkgrel=9
+pkgrel=10
 pkgdesc="Capture, analyse, record and monitor video security cameras."
 arch=('i686')
 url="http://www.zoneminder.com"
@@ -26,7 +26,8 @@ source=(http://www2.zoneminder.com/downloads/ZoneMinder-$pkgver.tar.gz \
 	customdb \
   mootools.v1.11.js \
   http://www.charliemouse.com:8080/code/cambozola/cambozola-0.50.tar.gz \
-  zmeventdump)
+  zmeventdump \
+  run)
 noextract=()
 md5sums=('ee803f0f71d6e67adf602c3557fb6bc9'
          'af8631abe20cd7dcab1a023af7d4f3e8'
@@ -84,6 +85,8 @@ build() {
     -o -name ".packlist"                \
     -o -name "*.bs"                     \
     |xargs -i rm -f {}
+    mkdir -p $pkgdir/etc/sv/zm
+    install -D -m 755 $srcdir/run $pkgdir/etc/sv/zm
 
 }
 
diff --git a/abs/core-testing/zoneminder/run b/abs/core-testing/zoneminder/run
new file mode 100755
index 0000000..e458bc8
--- /dev/null
+++ b/abs/core-testing/zoneminder/run
@@ -0,0 +1,6 @@
+#!/bin/bash
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting ZoneMinder"
+exec /etc/rc.d/zm start
diff --git a/abs/core-testing/zoneminder/zoneminder.install b/abs/core-testing/zoneminder/zoneminder.install
index c2ae861..1f3cfc0 100644
--- a/abs/core-testing/zoneminder/zoneminder.install
+++ b/abs/core-testing/zoneminder/zoneminder.install
@@ -52,7 +52,8 @@ post_upgrade() {
   # Reuse the old config
 [ -f /etc/zm.conf.pacnew ] && cat /etc/zm.conf | sed -e "s/^ZM_VERSION=.*$/ZM_VERSION=1.23.3/" > /tmp/zm.conf
 [ -f /etc/zm.conf.pacsave ] &&  cat /etc/zm.conf.pacsave | sed -e "s/^ZM_VERSION=.*$/ZM_VERSION=1.23.3/" > /tmp/zm.conf
-[ -f /tmp/zm.conf ] && mv -f /tmp/zm.conf /etc/zm.conf && chown -R nobody.nobody /etc/zm.conf
+[ -f /tmp/zm.conf ] && mv -f /tmp/zm.conf /etc/zm.conf && chown -R http.http /etc/zm.conf
+add_service.sh zm
 }
 ## arg 1:  the old package version
 pre_remove() {
@@ -62,6 +63,7 @@ pre_remove() {
 ## arg 1:  the old package version
 post_remove() {
   echo
+  remove_service.sh zm
 }
 
 # vim:set ts=2 sw=2 et:
-- 
cgit v0.12


From 4ce64b1d23306dae9301c7ff84eafeff4443fe27 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 5 Sep 2009 21:35:50 -0700
Subject: Local-website:Added zoneminder.

---
 abs/core-testing/local-website/PKGBUILD          |  2 +-
 abs/core-testing/local-website/htdocs/index.html | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/abs/core-testing/local-website/PKGBUILD b/abs/core-testing/local-website/PKGBUILD
index da53253..1f1faa9 100644
--- a/abs/core-testing/local-website/PKGBUILD
+++ b/abs/core-testing/local-website/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=local-website
 pkgver=2
-pkgrel=14
+pkgrel=15
 pkgdesc="Contents of http://localhost"
 arch=(i686 x86_64)
 license=('GPL')
diff --git a/abs/core-testing/local-website/htdocs/index.html b/abs/core-testing/local-website/htdocs/index.html
index 964ca9c..9c46aac 100644
--- a/abs/core-testing/local-website/htdocs/index.html
+++ b/abs/core-testing/local-website/htdocs/index.html
@@ -68,15 +68,14 @@
 	  </p>
 
 	  
-      <p><a href="foldingathome/"><b>My Folding Status</b></a>: <br>
+      <p><a href="http://fah-web.stanford.edu/cgi-bin/main.py?qtype=teampage&amp;teamnum=50975"><b>Folding@home</b></a>: <br>
 
-		&nbsp; &nbsp; Status of the folding@home work for the local user.
-	  </p>
+		&nbsp; &nbsp; KnoppMyth Team status for the folding@home effort.  Install via the Service Menu.
+		</p>
 
-	  
-      <p><a href="http://fah-web.stanford.edu/cgi-bin/main.py?qtype=teampage&amp;teamnum=50975"><b>Folding@home</b></a>: <br>
+      <p><a href="foldingathome/"><b>My Folding Status</b></a>: <br>
 
-		&nbsp; &nbsp; KnoppMyth Team status for the folding@home effort.
+		&nbsp; &nbsp; Status of the folding@home work for the local user.
 	  </p>
 
 	  
@@ -90,7 +89,7 @@
 &nbsp;&nbsp;&nbsp; FUPPES - Free UPnP Entertainment Service. &nbsp;A
 UPnP to be used inplace of the UPnP server that comes with MythTV.
 &nbsp;If the UPnP that comes with MythTV doesn't work for you, you can
-try FUPPES.</p><p><a style="font-weight: bold;" href="mediaserv.php"><span style="text-decoration: underline;">Mediaserv</span></a><br>
+try FUPPES.  Install via the Service Menu.</p><p><a style="font-weight: bold;" href="mediaserv.php"><span style="text-decoration: underline;">Mediaserv</span></a><br>
 &nbsp;&nbsp;&nbsp; Mediaserv - A on-demand transcoding server for
 videos. &nbsp;Mediaserv is designed to transcode video in a format
 playable on the Nokia Internet Tablets. &nbsp;However it works well at
@@ -101,7 +100,7 @@ TV recordings (pretty) and your video directory. &nbsp;Additionally if
 you want it to stream contents from a network share, it will! &nbsp;ln
 -s /path/to/share /myth/mediaserv/media/ </p><p><a href="rrd/index.html"><b>RRDTool</b></a>: <br>
 
-		&nbsp; &nbsp; Hardware status graphs.
+		&nbsp; &nbsp; Hardware status graphs.  Install via the Service Menu.
 	  </p>
 
 	  
@@ -109,6 +108,9 @@ you want it to stream contents from a network share, it will! &nbsp;ln
 
                 &nbsp; &nbsp; Your music must be encoded as MP3 in MythMusic for this to work.</p>
 	  
+      <p><a style="font-weight: bold;" href="zm/"><span style="text-decoration: underline;">ZoneMinder</span></a><br>
+      &nbsp;&nbsp;&nbsp; Video camera security software with motion detection.  Install via the Service Menu.
+      </p>
         </td>
 
       </tr>
-- 
cgit v0.12


From d750af1992378de933ba197a8e757b92d02c21af Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 5 Sep 2009 21:36:20 -0700
Subject: udev:modified usb-storage rule to cleanly unmount.

---
 abs/core-testing/udev/PKGBUILD          | 2 +-
 abs/core-testing/udev/usb-storage.rules | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/abs/core-testing/udev/PKGBUILD b/abs/core-testing/udev/PKGBUILD
index 1acfb02..c22b10b 100644
--- a/abs/core-testing/udev/PKGBUILD
+++ b/abs/core-testing/udev/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=udev
 pkgver=135
-pkgrel=6
+pkgrel=7
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
diff --git a/abs/core-testing/udev/usb-storage.rules b/abs/core-testing/udev/usb-storage.rules
index 86eca8e..a7e0726 100644
--- a/abs/core-testing/udev/usb-storage.rules
+++ b/abs/core-testing/udev/usb-storage.rules
@@ -1,4 +1,4 @@
 SUBSYSTEMS=="usb", KERNEL=="sd[b-z]", NAME="%k", SYMLINK+="usb-%k", GROUP="users", OPTIONS="last_rule"
 ACTION=="add", SUBSYSTEMS=="usb", KERNEL=="sd[b-z][0-9]", SYMLINK+="usb-%k", GROUP="users", NAME="%k"
 ACTION=="add", SUBSYSTEMS=="usb", KERNEL=="sd[b-z][0-9]", RUN+="/etc/udev/scripts/mount-usb mount %k", OPTIONS="last_rule"
-ACTION=="remove", SUBSYSTEMS=="usb", KERNEL=="sd[b-z][0-9]", RUN+="/etc/udev/scripts/mount-usb umount %k", OPTIONS="last_rule"#
+ACTION=="remove", SUBSYSTEMS=="block", RUN+="/etc/udev/scripts/mount-usb umount %k", OPTIONS="last_rule"#
-- 
cgit v0.12


From a570bbef2eb3d159de626060e39531c21d018f29 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 5 Sep 2009 23:46:59 -0700
Subject: fuppes:Added logrotation.

---
 abs/extra-testing/fuppes-svn/PKGBUILD  | 9 +++++----
 abs/extra-testing/fuppes-svn/fuppes.lr | 9 +++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 abs/extra-testing/fuppes-svn/fuppes.lr

diff --git a/abs/extra-testing/fuppes-svn/PKGBUILD b/abs/extra-testing/fuppes-svn/PKGBUILD
index d236fa9..79d11e2 100644
--- a/abs/extra-testing/fuppes-svn/PKGBUILD
+++ b/abs/extra-testing/fuppes-svn/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=fuppes-svn
 pkgver=636
-pkgrel=8
+pkgrel=9
 pkgdesc="A free, multiplatform Universal Plug and Play A/V MediaServer"
 arch=('i686' 'x86_64')
 url="http://fuppes.ulrich-voelkel.de/"
@@ -11,7 +11,7 @@ license=('GPL2')
 depends=('pcre' 'libxml2' 'sqlite3' 'gettext' 'taglib' 'imagemagick' 'ffmpeg' 'libmp4v2' 'lame' 'libvorbis' 'libmpcdec' 'flac' 'faad2' 'libmad')
 makdepends=('pkgconfig' 'autoconf' 'subversion')
 install=fuppes.install
-source=(fuppes-r634-archlinux.patch fuppes.diff fuppes.cfg run fuppes.ch)
+source=(fuppes-r634-archlinux.patch fuppes.diff fuppes.cfg run fuppes.ch fuppes.lr)
 md5sums=('5d9f6331cc91b64aab69449ce327b214' 'c495fa1bd9a870ae36820632434319ee' \
 	 'b0cef07d8e60d01c8146a69870672e1f' '3850001378088e5efac60487e5550d54' \
 	 '3c355b860f1b0d273f5aa8b2bea1bde6')
@@ -44,8 +44,9 @@ build()
 	mkdir -p $startdir/pkg/etc/fuppes
 	cp $startdir/src/fuppes.cfg $startdir/pkg/etc/fuppes
 	mkdir -p $startdir/pkg/etc/cron.hourly
-	mkdir -p $startdir/pkg/etc/sve/fuppes/supervise
+	mkdir -p $startdir/pkg/etc/logrotate.d/
+	mkdir -p $startdir/pkg/etc/sv/fuppes/supervise
 	install -D -m755 $startdir/src/fuppes.ch $startdir/pkg/etc/cron.hourly
 	install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/fuppes
+	install -D -m755 $startdir/src/fuppes.lr $startdir/pkg/etc/logrotate.d
 }
-
diff --git a/abs/extra-testing/fuppes-svn/fuppes.lr b/abs/extra-testing/fuppes-svn/fuppes.lr
new file mode 100644
index 0000000..ec2f88f
--- /dev/null
+++ b/abs/extra-testing/fuppes-svn/fuppes.lr
@@ -0,0 +1,9 @@
+/var/log/fuppes/fuppes.log {
+	copytruncate
+	daily
+	size 10M
+	missingok
+	rotate 7
+	compress
+	notifempty
+}
-- 
cgit v0.12


From e90eb9cd27994ab8ef1993355914e50ec61a7a71 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sun, 6 Sep 2009 03:14:40 -0700
Subject: mytharchive:bumped to compile latest.

---
 abs/core-testing/mythtv/stable/mytharchive/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abs/core-testing/mythtv/stable/mytharchive/PKGBUILD b/abs/core-testing/mythtv/stable/mytharchive/PKGBUILD
index 81465ec..f5c51f2 100644
--- a/abs/core-testing/mythtv/stable/mytharchive/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mytharchive/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=mytharchive
 pkgver=0.21
-pkgrel=8
+pkgrel=9
 pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows."
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
-- 
cgit v0.12


From ba38d110a556bc739c6306b4ecdb0c2765d15deb Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sun, 6 Sep 2009 03:14:58 -0700
Subject: Fuppes:bumped to compile latest.

---
 abs/extra-testing/fuppes-svn/PKGBUILD      |  6 ++--
 abs/extra-testing/fuppes-svn/PKGBUILD.orig | 52 ++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 abs/extra-testing/fuppes-svn/PKGBUILD.orig

diff --git a/abs/extra-testing/fuppes-svn/PKGBUILD b/abs/extra-testing/fuppes-svn/PKGBUILD
index 79d11e2..67936c0 100644
--- a/abs/extra-testing/fuppes-svn/PKGBUILD
+++ b/abs/extra-testing/fuppes-svn/PKGBUILD
@@ -24,13 +24,13 @@ build()
 	cd ${startdir}/src
 
 	msg "Getting sources..."
-	svn co -r 636 ${_svntrunk} ${_svnmod}
+	svn co ${_svntrunk} ${_svnmod}
 	msg "Done getting sources or failed to connect to server."
 
 	cd ${_svnmod}
 
-	patch -Np0 -i ../fuppes-r634-archlinux.patch
-	patch -Np0 -i ../fuppes.diff
+#	patch -Np0 -i ../fuppes-r634-archlinux.patch
+#	patch -Np0 -i ../fuppes.diff
 	autoreconf -vfi
 	
 	./configure --prefix=/usr \
diff --git a/abs/extra-testing/fuppes-svn/PKGBUILD.orig b/abs/extra-testing/fuppes-svn/PKGBUILD.orig
new file mode 100644
index 0000000..79d11e2
--- /dev/null
+++ b/abs/extra-testing/fuppes-svn/PKGBUILD.orig
@@ -0,0 +1,52 @@
+# Contributor: Andrew Krawchyk <krawch_a@denison.edu>
+# patch for svn r634: Ivan Yurasov <vd@vdk.su>
+
+pkgname=fuppes-svn
+pkgver=636
+pkgrel=9
+pkgdesc="A free, multiplatform Universal Plug and Play A/V MediaServer"
+arch=('i686' 'x86_64')
+url="http://fuppes.ulrich-voelkel.de/"
+license=('GPL2')
+depends=('pcre' 'libxml2' 'sqlite3' 'gettext' 'taglib' 'imagemagick' 'ffmpeg' 'libmp4v2' 'lame' 'libvorbis' 'libmpcdec' 'flac' 'faad2' 'libmad')
+makdepends=('pkgconfig' 'autoconf' 'subversion')
+install=fuppes.install
+source=(fuppes-r634-archlinux.patch fuppes.diff fuppes.cfg run fuppes.ch fuppes.lr)
+md5sums=('5d9f6331cc91b64aab69449ce327b214' 'c495fa1bd9a870ae36820632434319ee' \
+	 'b0cef07d8e60d01c8146a69870672e1f' '3850001378088e5efac60487e5550d54' \
+	 '3c355b860f1b0d273f5aa8b2bea1bde6')
+
+_svnmod="fuppes"
+_svntrunk="https://fuppes.svn.sourceforge.net/svnroot/fuppes/trunk"
+
+build()
+{
+	cd ${startdir}/src
+
+	msg "Getting sources..."
+	svn co -r 636 ${_svntrunk} ${_svnmod}
+	msg "Done getting sources or failed to connect to server."
+
+	cd ${_svnmod}
+
+	patch -Np0 -i ../fuppes-r634-archlinux.patch
+	patch -Np0 -i ../fuppes.diff
+	autoreconf -vfi
+	
+	./configure --prefix=/usr \
+	--enable-video-transcoding \
+	--disable-twolame || return 1
+	
+	make || return 1
+	make DESTDIR=$startdir/pkg install || return 1
+	mkdir -p $startdir/pkg/etc/sv/fuppes/supervise
+	install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/fuppes/
+	mkdir -p $startdir/pkg/etc/fuppes
+	cp $startdir/src/fuppes.cfg $startdir/pkg/etc/fuppes
+	mkdir -p $startdir/pkg/etc/cron.hourly
+	mkdir -p $startdir/pkg/etc/logrotate.d/
+	mkdir -p $startdir/pkg/etc/sv/fuppes/supervise
+	install -D -m755 $startdir/src/fuppes.ch $startdir/pkg/etc/cron.hourly
+	install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/fuppes
+	install -D -m755 $startdir/src/fuppes.lr $startdir/pkg/etc/logrotate.d
+}
-- 
cgit v0.12

