Fixed "test ==" and $RANDOM.

4 files changed, 119 insertions, 1 deletions

diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 7cdf74ccb09..03da5f92551 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2006/10/03 14:32:24 tron Exp $
+$NetBSD: distinfo,v 1.33 2006/10/11 18:32:40 rillig Exp $
 
 SHA1 (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 8a0929b84dcb37d47c062230ce693b64b3e30921
 RMD160 (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0
@@ -9,3 +9,6 @@ SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
 SHA1 (patch-ad) = 4744bdb2ea6ffa1a18abaef5a9cf5756f3b8a645
 SHA1 (patch-ah) = 2960a9f44b9173cd9e7a82c0dbc2379a13ed6307
 SHA1 (patch-ak) = 376bd5bd7a96e64d80d9272c336a2e0447e8232a
+SHA1 (patch-ta) = 81f8e0890cf879eec06b8cdb81facb434e80263e
+SHA1 (patch-tb) = 57980b57e1a46cb86e72311741aa05270e064dce
+SHA1 (patch-tc) = e67443cec273d7aa168fb160e2409d2ce352a8bf
diff --git a/multimedia/mplayer-share/patches/patch-ta b/multimedia/mplayer-share/patches/patch-ta
new file mode 100644
index 00000000000..48b259d598d
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-ta
@@ -0,0 +1,89 @@
+$NetBSD: patch-ta,v 1.1 2006/10/11 18:32:40 rillig Exp $
+
+--- TOOLS/checktree.sh.orig	2006-06-11 20:35:46.000000000 +0200
++++ TOOLS/checktree.sh	2006-10-11 20:28:37.000000000 +0200
+@@ -71,7 +71,7 @@ printhead() {
+ all_filenames() {
+     test "$_files" != "" && echo "$_files" && return
+ 
+-    if [ "$_cvs" == "no" ]; then
++    if [ "$_cvs" = "no" ]; then
+         find . -type f \
+         | grep -v "\.\#\|\~$\|\.depend\|\/CVS\/\|config.mak\|^\./config\.h" \
+         | grep -v "^\./version\.h\|\.o$\|\.a$"
+@@ -208,7 +208,7 @@ done
+ 
+ # Set heading color
+ 
+-if [ "$_color" == "yes" ]; then
++if [ "$_color" = "yes" ]; then
+     COLB="\e[36m"
+     COLE="\e[m"
+ else
+@@ -220,7 +220,7 @@ fi
+ 
+ filelist=`all_filenames`
+ 
+-if [ "$_showcont" == "yes" ]; then
++if [ "$_showcont" = "yes" ]; then
+   _diffopts="-u"
+   _grepopts="-n -I"
+ else
+@@ -234,21 +234,21 @@ fi
+ 
+ # -----------------------------------------------------------------------------
+ 
+-if [ "$_spaces" == "yes" ]; then
++if [ "$_spaces" = "yes" ]; then
+     printhead "checking for spaces in filenames ..."
+     find . | grep " "
+ fi
+ 
+ # -----------------------------------------------------------------------------
+ 
+-if [ "$_extensions" == "yes" ]; then
++if [ "$_extensions" = "yes" ]; then
+     printhead "checking for uppercase extensions ..."
+     echo $filelist | grep "\.[[:upper:]]\+$" | grep -v "\.S$"
+ fi
+ 
+ # -----------------------------------------------------------------------------
+ 
+-if [ "$_crlf" == "yes" ]; then
++if [ "$_crlf" = "yes" ]; then
+     printhead "checking for MSDOS line endings ..."
+     grep $_grepopts "
+ " $filelist
+@@ -256,28 +256,28 @@ fi
+ 
+ # -----------------------------------------------------------------------------
+ 
+-if [ "$_trailws" == "yes" ]; then
++if [ "$_trailws" = "yes" ]; then
+     printhead "checking for trailing whitespace ..."
+     grep $_grepopts "[[:space:]]\+$" $filelist
+ fi
+ 
+ # -----------------------------------------------------------------------------
+ 
+-if [ "$_rcsid" == "yes" ]; then
++if [ "$_rcsid" = "yes" ]; then
+     printhead "checking for missing RCS \$Id\$ or \$Revision\$ tags ..."
+     grep -L -I "\$\(Id\|Revision\)[[:print:]]\+\$" $filelist
+ fi
+ 
+ # -----------------------------------------------------------------------------
+ 
+-if [ "$_oll" == "yes" ]; then
++if [ "$_oll" = "yes" ]; then
+     printhead "checking for overly long lines (over 79 characters) ..."
+     grep $_grepopts "^[[:print:]]\{80,\}$" $filelist
+ fi
+ 
+ # -----------------------------------------------------------------------------
+ 
+-if [ "$_charset" == "yes" ]; then
++if [ "$_charset" = "yes" ]; then
+     printhead "checking bad charsets ..."
+     for I in $filelist ; do
+       case "$I" in
diff --git a/multimedia/mplayer-share/patches/patch-tb b/multimedia/mplayer-share/patches/patch-tb
new file mode 100644
index 00000000000..5ffe05413ef
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-tb
@@ -0,0 +1,13 @@
+$NetBSD: patch-tb,v 1.1 2006/10/11 18:32:40 rillig Exp $
+
+--- TOOLS/mencvcd.orig	2006-06-11 20:35:46.000000000 +0200
++++ TOOLS/mencvcd	2006-10-11 20:29:01.000000000 +0200
+@@ -330,7 +330,7 @@ done
+ 
+ # some configs
+ mpegnorm="-f $VCDMODE -b $vbr -B 260 -V 46"
+-if [ "$vnorm" == "SVCD" ]; then
++if [ "$vnorm" = "SVCD" ]; then
+    [ $vbrset -eq 0 ] && vbr=2500
+    mplexnorm="-f $SVCDMODE -m 2 -V -b 230"
+    mpegnorm="-f $SVCDMODE -b $vbr -B 260 -V 230"
diff --git a/multimedia/mplayer-share/patches/patch-tc b/multimedia/mplayer-share/patches/patch-tc
new file mode 100644
index 00000000000..950ea4f00d8
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-tc
@@ -0,0 +1,13 @@
+$NetBSD: patch-tc,v 1.1 2006/10/11 18:32:40 rillig Exp $
+
+--- TOOLS/x2mpsub.sh.orig	2006-10-11 20:29:22.000000000 +0200
++++ TOOLS/x2mpsub.sh	2006-06-11 20:35:46.000000000 +0200
+@@ -6,7 +6,7 @@
+ # Gabucino. No warranty. :)
+ #
+ 
+-TMP="x2mpsub-$RANDOM"
++TMP="x2mpsub-$$-$RANDOM"
+ mkdir "$TMP"
+ touch "$TMP/$TMP"
+