Merge branch 'master' of mihanson@knoppmyth.net:LinHES-PKGBUILD

13 files changed, 158 insertions, 50 deletions

diff --git a/abs/core-testing/LinHES-system/LinHES-run b/abs/core-testing/LinHES-system/LinHES-run
index 8f235e8..f6451f5 100644
--- a/abs/core-testing/LinHES-system/LinHES-run
+++ b/abs/core-testing/LinHES-system/LinHES-run
@@ -1,4 +1,9 @@
 #!/bin/sh
+function msg(){
+    echo -e "$1"  | osd_cat --font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*" --shadow=3 --pos=middle --align=centre --offset=200 --color=yellow --delay=5 &
+
+}
+
 . /etc/profile
 . /etc/systemconfig
 idle=1
@@ -8,7 +13,7 @@ jitter=200
 #/usr/bin/tilda &
 
 #move mouse to corner
-xdotool mousemove -10 -10
+xdotool mousemove 0 0 
 /usr/X11R6/bin/unclutter -root -idle $idle -jitter $jitter -noevents  &
 if [ x"$Screensavertype" = "xgscreensaver" ]
 then
@@ -64,13 +69,14 @@ then
 	fi
 	sudo pacman -R myth2ipod myt2xvid3
 	sudo pacman -S --noconfirm myth2ipod myt2xvid3
-        sudo sv stop mythbackend
+    sudo sv stop mythbackend
 	cat /data/database/dvd_transcode_r6.sql | mysql -u root mythconverg
-        xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup
-        sudo sv start mythbackend
+    xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup
+    sudo sv start mythbackend
 	sudo chown -R mythtv.mythtv /home/mythtv
-        nice -n 19 mythfilldatabase --quiet &
-        rm ~/.configure
+    nice -n 19 mythfilldatabase --quiet &
+    msg "Guide data is being loaded. \n Until this completes\n some shows will appear as unknown \n in the program guide."
+    rm ~/.configure
     fi
 fi
 
diff --git a/abs/core-testing/LinHES-system/PKGBUILD b/abs/core-testing/LinHES-system/PKGBUILD
index f775314..c76205a 100644
--- a/abs/core-testing/LinHES-system/PKGBUILD
+++ b/abs/core-testing/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-system
 pkgver=1.1
-pkgrel=11
+pkgrel=25
 arch=('i686')
 MVDIR=$startdir/pkg/usr/LH
 BINDIR=$startdir/pkg/usr/bin
@@ -8,7 +8,7 @@ install=LinHES.install
 pkgdesc="scripts and things related to having a automated system"
 depends=(linhes-sounds xdotool)
 backup=(etc/modprobe.d/alsa-base)
-binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh LinHES-run firstboot.sh load-modules-mythvantage.sh unclutter-toggle.sh myth_mtc.lr smolt.cron "
+binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh LinHES-run firstboot.sh load-modules-mythvantage.sh unclutter-toggle.sh myth_mtc.lr smolt.cron mythfrontend-start"
 
 source=(LinHES-session LinHES-profile.sh $binfiles alsa-base)
 
@@ -41,32 +41,18 @@ mkdir $startdir/pkg/etc/logrotate.d
 cp $startdir/myth_mtc.lr $startdir/pkg/etc/logrotate.d
 }
 
-
-md5sums=('19934a456d0e112298b8aac3279f9a16'
-         '5881bdb43d578ec3a79d1f77ea58a3db'
-         'a875ee97f86e46f34a741c2bc455f894'
-         'cdcbc530224215f8fcf7ebcd93d7eb0b'
-         'c60b6c66f498809a6e5ca18a8c97d336'
-         'ccae1296ef248fa52ec3a7cb820a476e'
-         '6112f32c48763a057341ccfb18d2375a'
-         '18a884a73344ff6eb74f63b49745e0f5'
-         'dc3eef2a624754e16805d72bbe488b67'
-         '72eb4117bb7d523691233c40e7535752'
-         'f1870a9522c79e6b248fcbf81dec3280'
-         '90a5d903e11e8bb457855d2ffd657e1e'
-         'eb879fee9603a05d5420d4ce8ed9e450')
 md5sums=('19934a456d0e112298b8aac3279f9a16'
          '5881bdb43d578ec3a79d1f77ea58a3db'
          'a875ee97f86e46f34a741c2bc455f894'
          'cdcbc530224215f8fcf7ebcd93d7eb0b'
          'c60b6c66f498809a6e5ca18a8c97d336'
          'ccae1296ef248fa52ec3a7cb820a476e'
-         '6112f32c48763a057341ccfb18d2375a'
+         '7bae998ba458a7f74c51c7268e39b28d'
          '18a884a73344ff6eb74f63b49745e0f5'
          'dc3eef2a624754e16805d72bbe488b67'
-         '72eb4117bb7d523691233c40e7535752'
+         'dc0be354ce77ba2b89868fc29b942c43'
          'f1870a9522c79e6b248fcbf81dec3280'
-         'f891f01eac77a1a9cd3d638c28ae4b3a'
+         'abe887472a170bd1a8e6da6a7b7e93e4'
          'eb879fee9603a05d5420d4ce8ed9e450')
 md5sums=('19934a456d0e112298b8aac3279f9a16'
          '5881bdb43d578ec3a79d1f77ea58a3db'
@@ -74,12 +60,13 @@ md5sums=('19934a456d0e112298b8aac3279f9a16'
          'cdcbc530224215f8fcf7ebcd93d7eb0b'
          'c60b6c66f498809a6e5ca18a8c97d336'
          'ccae1296ef248fa52ec3a7cb820a476e'
-         '6112f32c48763a057341ccfb18d2375a'
+         '7bae998ba458a7f74c51c7268e39b28d'
          '18a884a73344ff6eb74f63b49745e0f5'
          'dc3eef2a624754e16805d72bbe488b67'
-         '72eb4117bb7d523691233c40e7535752'
+         'dc0be354ce77ba2b89868fc29b942c43'
          'f1870a9522c79e6b248fcbf81dec3280'
          'abe887472a170bd1a8e6da6a7b7e93e4'
+         '5bced1c7b92e6190835139494c5e9905'
          'eb879fee9603a05d5420d4ce8ed9e450')
 md5sums=('19934a456d0e112298b8aac3279f9a16'
          '5881bdb43d578ec3a79d1f77ea58a3db'
@@ -87,10 +74,11 @@ md5sums=('19934a456d0e112298b8aac3279f9a16'
          'cdcbc530224215f8fcf7ebcd93d7eb0b'
          'c60b6c66f498809a6e5ca18a8c97d336'
          'ccae1296ef248fa52ec3a7cb820a476e'
-         '6022095f05d0428de926bb81b1693d56'
+         '7bae998ba458a7f74c51c7268e39b28d'
          '18a884a73344ff6eb74f63b49745e0f5'
          'dc3eef2a624754e16805d72bbe488b67'
          'dc0be354ce77ba2b89868fc29b942c43'
          'f1870a9522c79e6b248fcbf81dec3280'
          'abe887472a170bd1a8e6da6a7b7e93e4'
+         '752488eb8bfb672ce0e4c924f7faf3d1'
          'eb879fee9603a05d5420d4ce8ed9e450')
diff --git a/abs/core-testing/LinHES-system/bin/mythrestore b/abs/core-testing/LinHES-system/bin/mythrestore
index 7fce371..76b76a3 100755
--- a/abs/core-testing/LinHES-system/bin/mythrestore
+++ b/abs/core-testing/LinHES-system/bin/mythrestore
@@ -86,6 +86,9 @@ fi
 do_db_updates
 do_file_updates
 
+#post restore fixup for sshd
+/usr/MythVantage/bin/systemconfig.py -m user
+
 # Now it's more or less safe to restart the backend.
 start_mythbackend
 
diff --git a/abs/core-testing/LinHES-system/mythfrontend-start b/abs/core-testing/LinHES-system/mythfrontend-start
new file mode 100755
index 0000000..c92d024
--- /dev/null
+++ b/abs/core-testing/LinHES-system/mythfrontend-start
@@ -0,0 +1,22 @@
+#!/bin/bash
+PIDS=$(pidof mythfrontend)
+P_array=( $PIDS )
+let "instances = ${#P_array[*]}"  # Count elements.
+
+if [ $instances -gt 0 ];
+then
+    if [ $instances -eq 1 ]; then
+        diagtext="is already a MythFrontend"
+    else
+        diagtext="are already $instances MythFrontends"
+    fi
+
+    question="There $diagtext running. Do you really want to start another one?"  
+    mythvantage -q "${question}"
+    if [ $?  = 16 ] 
+    then
+        mythfrontend --logfile /var/log/mythtv/mythfrontend.log
+    fi
+else
+    mythfrontend --logfile /var/log/mythtv/mythfrontend.log
+fi
diff --git a/abs/core-testing/fluxbox/PKGBUILD b/abs/core-testing/fluxbox/PKGBUILD
index b3a9a41..1ec527f 100644
--- a/abs/core-testing/fluxbox/PKGBUILD
+++ b/abs/core-testing/fluxbox/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=fluxbox
 pkgver=1.1.1
-pkgrel=6
+pkgrel=8
 pkgdesc="A lightweight and highly-configurable window manager"
 arch=('i686' 'x86_64')
 url="http://www.fluxbox.org"
@@ -29,3 +29,6 @@ build() {
   install -D -m644 ../keys ${pkgdir}/usr/share/fluxbox/keys || return 1
   install -D -m644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/COPYING || return 1
 }
+md5sums=('fa9fa8fe9a44f86522de5754f8b285ca'
+         'eeae9c88a2526ac0bd8afcd9ce97f9ed'
+         '37438d3c615aec8c3335b5946923ca5f')
diff --git a/abs/core-testing/fluxbox/keys b/abs/core-testing/fluxbox/keys
index fbacf75..a166829 100644
--- a/abs/core-testing/fluxbox/keys
+++ b/abs/core-testing/fluxbox/keys
@@ -19,7 +19,8 @@ Mod1 F11 :Workspace 11
 Mod1 F12 :Workspace 12
 Mod1 x :ExecCommand xterm -fn *18*
 Mod1 s :ExecCommand sudo taskset -c 0 mythtv-setup
-Mod1 m :ExecCommand mythfrontend --logfile /var/log/mythtv/mythfrontend.log
+#Mod1 m :ExecCommand mythfrontend --logfile /var/log/mythtv/mythfrontend.log
+Mod1 m :ExecCommand /usr/LH/bin/mythfrontend-start
 Mod1 1 :ExecCommand sudo sv start mythbackend
 Mod1 2 :ExecCommand sudo sv stop mythbackend
 Mod1 3 :ExecCommand sudo sv restart mythbackend
diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index 02fba0e..82cede0 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=1
-pkgrel=58
+pkgrel=63
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -38,6 +38,7 @@ update_schema_021_to_022.sh
 upgrade_to_0.22.sh
 remove_php_mythvideo.sh
 removecommercials.sh
+system-cleanup.sh
 )
 
 build() {
@@ -63,9 +64,9 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          '0750d7c65109d12aa536f312a38410d1'
          'ac2a4a6b4100f4d7bfb9ecd9356c8c6e'
          'd2b475821f902c5e081e7da43a35e6ac'
-         '26a194301b0cfc4ca212d462a0899077'
+         '95c092f67036a361ef7a57436f44332e'
          '3b776bbff68906ddc2f62b7e0dde3fe4'
-         '85706c981e8ec2c5bb49a33538782d4c'
+         '15f3143d2b1369da431e4268029aba40'
          '3d0adf26280cde55a0c47188fff34826'
          '93aaa2940e33ec9ebb305b839ac46a3e'
          '972e42e02a11575da91f5e051d4de1d2'
@@ -76,7 +77,9 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          'c9dc0dd07369622879a000247ac55074'
          '65629302a4d2c3adf88cdf0ebc10d493'
          'ea5492d4dab8271db20cb84416c001dc'
-         'd7c7914225ec86bf3ea46104a364f977')
+         'd7c7914225ec86bf3ea46104a364f977'
+         '25c1baeb97a49656456ae33f7e7a9f06'
+         '5713640cb516246cfd4c06b1393a7f13')
 md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          '623b6e9ba6cc4a19771005e750f337a7'
          '9ae2cd7a0c42d57ad8b5f515d7d60196'
@@ -91,7 +94,7 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          'd2b475821f902c5e081e7da43a35e6ac'
          '95c092f67036a361ef7a57436f44332e'
          '3b776bbff68906ddc2f62b7e0dde3fe4'
-         '85706c981e8ec2c5bb49a33538782d4c'
+         '15f3143d2b1369da431e4268029aba40'
          '3d0adf26280cde55a0c47188fff34826'
          '93aaa2940e33ec9ebb305b839ac46a3e'
          '972e42e02a11575da91f5e051d4de1d2'
@@ -102,7 +105,37 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          'c9dc0dd07369622879a000247ac55074'
          '65629302a4d2c3adf88cdf0ebc10d493'
          'ea5492d4dab8271db20cb84416c001dc'
-         'd7c7914225ec86bf3ea46104a364f977')
+         'd7c7914225ec86bf3ea46104a364f977'
+         '25c1baeb97a49656456ae33f7e7a9f06'
+         'f77bb76ee2759195b67a2e0df8c47c44')
+md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
+         '623b6e9ba6cc4a19771005e750f337a7'
+         '9ae2cd7a0c42d57ad8b5f515d7d60196'
+         '1274bad3fb7296f00acd2d44804bad14'
+         'b4f858834ea92418208ab496ca39ad32'
+         '6b6e7d34a4bda6d608d150039adefd07'
+         '3fe554dbbf7d09e1f9925032ba888bf5'
+         '18263972b6326e140bbef0bb7dfa2da9'
+         '410795ef9039e4c6c0484e706ecfd567'
+         '0750d7c65109d12aa536f312a38410d1'
+         'ac2a4a6b4100f4d7bfb9ecd9356c8c6e'
+         'd2b475821f902c5e081e7da43a35e6ac'
+         '95c092f67036a361ef7a57436f44332e'
+         '3b776bbff68906ddc2f62b7e0dde3fe4'
+         '15f3143d2b1369da431e4268029aba40'
+         '3d0adf26280cde55a0c47188fff34826'
+         '93aaa2940e33ec9ebb305b839ac46a3e'
+         '972e42e02a11575da91f5e051d4de1d2'
+         'b527b01d119d3bc33b8fa69bdf1082bb'
+         'c537c44156d8404016cc4b405b092d45'
+         '4e66f302a77f1a857476e7f289d0c157'
+         'be324dba44ae96676973a74421944853'
+         'c9dc0dd07369622879a000247ac55074'
+         '65629302a4d2c3adf88cdf0ebc10d493'
+         'ea5492d4dab8271db20cb84416c001dc'
+         'd7c7914225ec86bf3ea46104a364f977'
+         '25c1baeb97a49656456ae33f7e7a9f06'
+         'bd419fe54590925eb0bc991902dffecf')
 md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          '623b6e9ba6cc4a19771005e750f337a7'
          '9ae2cd7a0c42d57ad8b5f515d7d60196'
@@ -129,4 +162,5 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          '65629302a4d2c3adf88cdf0ebc10d493'
          'ea5492d4dab8271db20cb84416c001dc'
          'd7c7914225ec86bf3ea46104a364f977'
-         '25c1baeb97a49656456ae33f7e7a9f06')
+         '25c1baeb97a49656456ae33f7e7a9f06'
+         '2fb25aef03ffd1282414d8cca3df7056')
diff --git a/abs/core-testing/linhes-scripts/system-cleanup.sh b/abs/core-testing/linhes-scripts/system-cleanup.sh
new file mode 100755
index 0000000..59a4ebb
--- /dev/null
+++ b/abs/core-testing/linhes-scripts/system-cleanup.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# This script cleans up some SVN stuff that the build process leaves
+# in /usr/share/mythtv, along with ownership and file permsisions on the
+# themes and the mythstream stuff.  There are bunch of files which are
+# left executable for no good reason, although I can think of several
+# potentially bad reasons for it.
+
+find /usr/share/mythtv -name .svn -print0 | xargs -0 rm -rf
+find /usr/share/mythtv -name CVS -print0 | xargs -0 rm -rf
+
+THEMES=/usr/share/mythtv/themes
+
+chown -R root:root $THEMES
+chmod -R +r $THEMES
+find $THEMES -type f -print0 | xargs -0 chmod a-x
+
+
+chown -R mythtv:users /myth
+chown -R root:root /myth/backup/
+chown -R root:root /etc/sv
+
+chown -R http:users /data/srv/httpd/
+
+# None of thes files should be executable.
+for ext in gif png jpg xml htm html php ; do
+    find / -type f -name "*.$ext" -print0 | xargs -0 chmod a-x
+done
+
+# These files should be owned by root and not writable to anybody else
+
+#chown root:root /usr/share/mythtv/*.xml /usr/share/mythtv/*.ttf
+chown root:root /usr/share/mythtv/*.ttf
+
+chown -R root:root \
+    /usr/share/mythtv/i18n \
+    /usr/share/mythtv/mytharchive \
+    /usr/share/mythtv/mythflix \
+    /usr/share/mythtv/mythnews \
+    /usr/share/mythtv/mythvideo \
+    /usr/share/mythtv/mythweather \
+    /usr/LH 
+
+
+
+# Report any remaining orphans...
+find / /myth -xdev \( -nouser -o -nogroup \) -ls
diff --git a/abs/core-testing/mythinstall/PKGBUILD b/abs/core-testing/mythinstall/PKGBUILD
index b651479..6cc39a9 100644
--- a/abs/core-testing/mythinstall/PKGBUILD
+++ b/abs/core-testing/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jams
 pkgname=mythinstall
 pkgver=2
-pkgrel=29
+pkgrel=33
 pkgdesc="LinHES installer/systemconfig GUI."
 arch=i686
 depends=()
diff --git a/abs/core-testing/mythtv/stable-0.22/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythtv/PKGBUILD
index d0c526c..82a9b7c 100755
--- a/abs/core-testing/mythtv/stable-0.22/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythtv/PKGBUILD
@@ -66,11 +66,13 @@ build() {
 	# install db schema, scripts and docs
 	install -m0644 database/mc.sql $startdir/pkg/usr/share/mythtv/ || return 1
 	install -D -m0755 ../mythbackend $startdir/pkg/etc/rc.d/mythbackend || return 1
-	cp -r docs $startdir/pkg/usr/share/mythtv/ || return 1
-	# cp ../QUICKSTART.archlinux $startdir/pkg/usr/share/mythtv/ || return 1
 
+	#cp -r docs $startdir/pkg/usr/share/mythtv/ || return 1
+	#cp ../QUICKSTART.archlinux $startdir/pkg/usr/share/mythtv/ || return 1
+    rsync -arp --exclude .svn --delete-excluded  docs $startdir/pkg/usr/share/mythtv/ || return 1
 	# install contrib
-	cp -r contrib $startdir/pkg/usr/share/mythtv/ || return 1
+    #cp -r contrib $startdir/pkg/usr/share/mythtv/ || return 1
+    rsync -arp --exclude .svn --delete-excluded  contrib $startdir/pkg/usr/share/mythtv/ || return 1
 
 	# patch the xml LinHES style
 	cp -r $startdir/menu-xml/*.xml $startdir/pkg/usr/share/mythtv/themes/defaultmenu/
diff --git a/abs/core-testing/mythtv/stable-0.22/mythweb/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythweb/PKGBUILD
index d44528f..060a229 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythweb/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythweb/PKGBUILD
@@ -13,7 +13,6 @@ install=mythweb.install
 
 patches=()
 source=(`echo ${patches[@]:0}`)
-
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
 _svnver=23566
 _svnmod=mythplugins
@@ -41,9 +40,10 @@ build() {
 
 	mkdir -p $startdir/pkg/$DOCROOT/{image_cache,php_sessions}
 
-	cp -r $startdir/src/mythplugins/mythweb/* $startdir/pkg/$DOCROOT
-#   cp $startdir/src/mythplugins-$pkgver/mythweb/data/.htaccess $startdir/pkg/$DOCROOT
-	rm $startdir/pkg/srv/$DOCROOT/README
+	#cp -r $startdir/src/mythplugins/mythweb/* $startdir/pkg/$DOCROOT
+	rsync -arp --exclude .svn --delete-excluded   $startdir/src/mythplugins/mythweb/* $startdir/pkg/$DOCROOT
+	
+    rm $startdir/pkg/$DOCROOT/README
 	chown -R http:users $startdir/pkg/$DOCROOT
 	chmod g+rw $startdir/pkg/$DOCROOT/{image_cache,php_sessions,data}
 
diff --git a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
index c5be258..65b12db 100755
--- a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
@@ -66,11 +66,12 @@ build() {
 	# install db schema, scripts and docs
 	install -m0644 database/mc.sql $startdir/pkg/usr/share/mythtv/ || return 1
 	install -D -m0755 ../mythbackend $startdir/pkg/etc/rc.d/mythbackend || return 1
-	cp -r docs $startdir/pkg/usr/share/mythtv/ || return 1
-	# cp ../QUICKSTART.archlinux $startdir/pkg/usr/share/mythtv/ || return 1
+#	cp -r docs $startdir/pkg/usr/share/mythtv/ || return 1
+    rsync -arp --exclude .svn --delete-excluded  docs $startdir/pkg/usr/share/mythtv/ || return 1
 
 	# install contrib
-	cp -r contrib $startdir/pkg/usr/share/mythtv/ || return 1
+    rsync -arp --exclude .svn --delete-excluded  contrib $startdir/pkg/usr/share/mythtv/ || return 1
+	#cp -r contrib $startdir/pkg/usr/share/mythtv/ || return 1
 
 	# patch the xml LinHES style
 	cp -r $startdir/menu-xml/*.xml $startdir/pkg/usr/share/mythtv/themes/defaultmenu/
diff --git a/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD b/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
index 3773e89..dedfcf5 100644
--- a/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
@@ -40,9 +40,10 @@ build() {
 
 	mkdir -p $startdir/pkg/$DOCROOT/{image_cache,php_sessions}
 
-	cp -r $startdir/src/mythplugins/mythweb/* $startdir/pkg/$DOCROOT
+#	cp -r $startdir/src/mythplugins/mythweb/* $startdir/pkg/$DOCROOT
 #   cp $startdir/src/mythplugins-$pkgver/mythweb/data/.htaccess $startdir/pkg/$DOCROOT
-	rm $startdir/pkg/srv/$DOCROOT/README
+    rsync -arp --exclude .svn --delete-excluded   $startdir/src/mythplugins/mythweb/* $startdir/pkg/$DOCROOT
+	rm $startdir/pkg/$DOCROOT/README
 	chown -R http:users $startdir/pkg/$DOCROOT
 	chmod g+rw $startdir/pkg/$DOCROOT/{image_cache,php_sessions,data}