8 files changed, 51 insertions, 125 deletions

diff --git a/multimedia/tovid/files/patch-Makefile.in b/multimedia/tovid/files/patch-Makefile.in
new file mode 100644
index 000000000000..059aff204cbc
--- /dev/null
+++ b/multimedia/tovid/files/patch-Makefile.in
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Tue Feb 13 13:16:01 2007
++++ Makefile.in	Sun May 27 22:27:03 2007
+@@ -952,8 +952,8 @@
+ # Make the manpages for svn users (tarball users' man pages made in dist-hook)
+ #   This is a static pattern rule as seen on (TV!)
+ #   http://www.gnu.org/software/make/manual/make.html#Static-Pattern
+-$(man_MANS): $(man_dir)/%.1: $(man_src_dir)/%.t2t
+-	txt2tags -t man -i "$<" -o "$@"
++#$(man_MANS): $(man_dir)/%.1: $(man_src_dir)/%.t2t
++#	txt2tags -t man -i "$<" -o "$@"
+ 
+ # src/tovid-init not needed b/c ./configure derives it from src/tovid-init.in
+ # make fresh man pages for tarball users, ensuring that they're newer than the
diff --git a/multimedia/tovid/files/patch-man__postproc.1 b/multimedia/tovid/files/patch-man__postproc.1
deleted file mode 100644
index c48801716349..000000000000
--- a/multimedia/tovid/files/patch-man__postproc.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/postproc.1.orig	Fri Jan 20 00:33:04 2006
-+++ man/postproc.1	Fri Jan 20 00:33:14 2006
-@@ -6,7 +6,7 @@
- 
- .SS Synopsis
- .nf
--  makeslides [ OPTIONS ] IN_FILE OUT_FILE
-+  postproc [ OPTIONS ] IN_FILE OUT_FILE
- .fi
- 
- 
diff --git a/multimedia/tovid/files/patch-src__dvrequant.sh b/multimedia/tovid/files/patch-src__dvrequant.sh
deleted file mode 100644
index 55b41c9ce1bd..000000000000
--- a/multimedia/tovid/files/patch-src__dvrequant.sh
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/dvrequant.sh.orig	Fri Jan 20 00:23:01 2006
-+++ src/dvrequant.sh	Fri Jan 20 00:26:34 2006
-@@ -446,11 +446,11 @@
- echo "You may consult the log file:$PROCESS_LOG"
- echo " "
- echo "BURNING:"
--echo "Use to burn image: growisofs -dvd-compat -Z $DVD_DEVICE=$DISK_TITLE.iso "
-+echo "Use to burn image: growisofs -dvd-compat -dvd-video -use-the-force-luke=dao -Z $DVD_DEVICE=$DISK_TITLE.iso "
- echo "Insert blank dvd and press ENTER"
- read BURN
- cd $WORKING_DIR/$DISK_TITLE
--growisofs -dvd-compat -Z $DVD_DEVICE=$DISK_TITLE.iso 
-+growisofs -dvd-compat -dvd-video -use-the-force-luke=dao -Z $DVD_DEVICE=$DISK_TITLE.iso 
- 
- exit
- 
diff --git a/multimedia/tovid/files/patch-src__makedvd b/multimedia/tovid/files/patch-src__makedvd
new file mode 100644
index 000000000000..b59460ff4714
--- /dev/null
+++ b/multimedia/tovid/files/patch-src__makedvd
@@ -0,0 +1,25 @@
+--- src/makedvd.orig	Tue May 29 07:51:08 2007
++++ src/makedvd	Tue May 29 07:51:55 2007
+@@ -288,11 +288,11 @@
+     DISC_SUM=0
+     while test $i -le $NUM_VOBS; do
+       VOB=$(echo "$VOB_LIST" | awk -F ':' '{ print $'$i' }')
+-      VOB_SIZE=$(du -B M "$VOB" | awk -F ' ' '{print $1}' | tr -d M)
++      VOB_SIZE=$(du -m "$VOB" | awk -F ' ' '{print $1}' | tr -d M)
+       DISC_SUM=$(expr $VOB_SIZE \+ $DISC_SUM)
+       i=$(expr $i \+ 1)
+     done
+-    AVAIL_SPACE=$(df -B M -P . | awk 'NR != 1 {print $4;}' | tr -d M)
++    AVAIL_SPACE=$(df -m -P . | awk 'NR != 1 {print $4;}' | tr -d M)
+ 
+     if test $DISC_SUM -gt $AVAIL_SPACE; then
+        echo $SEPARATOR
+@@ -400,7 +400,7 @@
+       probe_media
+     fi
+ 
+-    DISC_SUM=$(du -s -B M "$OUT_DIR" | awk '{print $1}' | tr -d M)
++    DISC_SUM=$(du -s -m "$OUT_DIR" | awk '{print $1}' | tr -d M)
+     if test $DISC_SUM -gt $DISC_CAPACITY; then
+        echo $SEPARATOR
+        echo "Cannot continue! DVD image (${DISC_SUM}MB) exceeds the DVD's capacity (${DISC_CAPACITY}MB)."
diff --git a/multimedia/tovid/files/patch-src__makedvd.sh b/multimedia/tovid/files/patch-src__makedvd.sh
deleted file mode 100644
index ef3a198785ae..000000000000
--- a/multimedia/tovid/files/patch-src__makedvd.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/makedvd.sh.orig	Fri Jan 20 00:23:04 2006
-+++ src/makedvd.sh	Fri Jan 20 00:27:46 2006
-@@ -236,7 +236,7 @@
-     
- # Burn the disc, if requested
- if $DO_BURN; then
--    BURN_CMD="growisofs -dvd-compat -speed=$BURN_SPEED -Z $DVDRW_DEVICE=$DISC_LABEL.iso"
-+    BURN_CMD="growisofs -dvd-compat -dvd-video -use-the-force-luke=dao -speed=$BURN_SPEED -Z $DVDRW_DEVICE=$DISC_LABEL.iso"
-     echo $SEPARATOR
-     echo "Burning ISO to DVD with the following command:"
-     echo $BURN_CMD
diff --git a/multimedia/tovid/files/patch-src__makexml.sh b/multimedia/tovid/files/patch-src__makexml.sh
deleted file mode 100644
index bb968b4dd94f..000000000000
--- a/multimedia/tovid/files/patch-src__makexml.sh
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/makexml.sh.orig	Sun Feb 19 05:52:41 2006
-+++ src/makexml.sh	Sun Feb 19 05:52:41 2006
-@@ -183,7 +183,7 @@
-     # Generate XML for the button linking to this titleset menu from the top menu
-     TOP_MENU_BUTTONS=`cat << EOF
-   $TOP_MENU_BUTTONS\
--    <button>jump titleset $CUR_TS menu;<\/button>\n
-+    <button>jump titleset $CUR_TS menu;<\/button>
- EOF`
- 
-     # Generate XML for the menu header, with a placeholder for
-@@ -206,7 +206,7 @@
-     # Generate XML for the button linking to this menu from the top menu
-     TOP_MENU_BUTTONS=`cat << EOF
- $TOP_MENU_BUTTONS\
--    <select ref="select-menu-$CUR_TS"\/>\n
-+    <select ref="select-menu-$CUR_TS"\/>
- EOF`
- 
-     # Generate XML for the segment item
-@@ -271,7 +271,7 @@
-       if [ $CUR_VIDEO -lt 2 ]; then
-         MENU_BUTTONS=`cat << EOF
- $MENU_BUTTONS\
--        <button>jump title $CUR_TITLE;<\/button>\n
-+        <button>jump title $CUR_TITLE;<\/button>
- EOF`
-       fi
-     else
-@@ -279,7 +279,7 @@
-       if [ $CUR_VIDEO -le 1 ]; then
-         TOP_MENU_BUTTONS=`cat << EOF
- $TOP_MENU_BUTTONS\
--        <button>jump titleset $CUR_TS menu;<\/button>\n
-+        <button>jump titleset $CUR_TS menu;<\/button>
- EOF`
-       fi
-     fi 
-@@ -377,7 +377,7 @@
-       if $FIRST_TITLE; then
-         MENU_BUTTONS=`cat << EOF
- $MENU_BUTTONS
--    <select ref="play-title-$CUR_TITLE"\/>\n
-+    <select ref="play-title-$CUR_TITLE"\/>
- EOF`
-       fi
- 
-@@ -413,7 +413,7 @@
-       # jump to this playlist (title)
-       MENU_BUTTONS=`cat << EOF
- $MENU_BUTTONS\
--    <select ref="play-title-$CUR_TITLE"\/>\n
-+    <select ref="play-title-$CUR_TITLE"\/>
- EOF`
- 
-       # Generate XML for the sequence item
-@@ -457,7 +457,7 @@
-     if $HAVE_TOP_MENU; then
-       MENU_BUTTONS=`cat << EOF
- $MENU_BUTTONS\
--      <button>jump vmgm menu;<\/button>\n
-+      <button>jump vmgm menu;<\/button>
- EOF`
-     fi
- 
diff --git a/multimedia/tovid/files/patch-src__tovid b/multimedia/tovid/files/patch-src__tovid
new file mode 100644
index 000000000000..bb7c53d304fd
--- /dev/null
+++ b/multimedia/tovid/files/patch-src__tovid
@@ -0,0 +1,13 @@
+--- src/tovid.orig	Sun May 27 21:50:36 2007
++++ src/tovid	Sun May 27 21:50:55 2007
+@@ -1930,8 +1930,8 @@
+ # ******************************************************************************
+ 
+ if ! $FAKE; then
+-    AUDIO_SIZE=$(du -c -b "$AUDIO_STREAM" | awk 'END{print $1}')
+-    VIDEO_SIZE=$(du -c -b "$VIDEO_STREAM" | awk 'END{print $1}')
++    AUDIO_SIZE=`ls -ALln "$OUT_PREFIX.$AUD_SUF" | awk '{ sum += $5 } END { print sum }'`
++    VIDEO_SIZE=`ls -ALln "$OUT_PREFIX.$VID_SUF" | awk '{ sum += $5 } END { print sum }'`
+     # Total size of streams so far (in MBytes)
+     STREAM_SIZE=$(expr \( $AUDIO_SIZE \+ $VIDEO_SIZE \) \/ 1000000)
+     # If it exceeds disc size, add '%d' field to allow mplex to split output
diff --git a/multimedia/tovid/files/patch-src__tovid.sh b/multimedia/tovid/files/patch-src__tovid.sh
deleted file mode 100644
index d1fbbb919d43..000000000000
--- a/multimedia/tovid/files/patch-src__tovid.sh
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/tovid.sh.orig	Tue Dec 27 03:29:42 2005
-+++ src/tovid.sh	Tue Dec 27 03:43:52 2005
-@@ -265,7 +265,7 @@
- check_disk_space()
- {
-     # Determine space available in current directory (in MB)
--    AVAIL_SPACE=`df -mP . | awk 'NR != 1 {print $4;}'`
-+    AVAIL_SPACE=`df -m . | awk 'NR != 1 {print $4;}'`
-     # Rough estimates of KB/sec for different formats
-     K_PER_SEC=200
-     test x"$TGT_RES" = x"VCD" && K_PER_SEC=172
-@@ -1512,8 +1512,8 @@
- # ******************************************************************************
- # ******************************************************************************
- 
--AUDIO_SIZE=`du -c -b "$OUT_PREFIX.$AUD_SUF" | awk 'END{print $1}'`
--VIDEO_SIZE=`du -c -b "$OUT_PREFIX.$VID_SUF" | awk 'END{print $1}'`
-+AUDIO_SIZE=`ls -ALln "$OUT_PREFIX.$AUD_SUF" | awk '{ sum += $5 } END { print sum }'`
-+VIDEO_SIZE=`ls -ALln "$OUT_PREFIX.$VID_SUF" | awk '{ sum += $5 } END { print sum }'`
- # Total size of streams so far (in MBytes)
- TOTAL_SIZE=`expr \( $AUDIO_SIZE \+ $VIDEO_SIZE \) \/ 1000000`
- # If it will exceed disc size, add '%d' field to allow mplex to split the output