Remove support for 5-exp and add 7-exp, 8 and 8-exp

5 files changed, 17 insertions, 11 deletions

diff --git a/Tools/portbuild/scripts/buildenv b/Tools/portbuild/scripts/buildenv
index 69056ff7d83a..cf4dd7f6775e 100644
--- a/Tools/portbuild/scripts/buildenv
+++ b/Tools/portbuild/scripts/buildenv
@@ -12,9 +12,6 @@ buildenv () {
 	export INDEXFILE=INDEX-5
 	export USE_NONDEFAULT_X11BASE=1
 	    ;;
-	x5-exp)
-	export INDEXFILE=INDEX-6
-	    ;;
 	x6)
 	export INDEXFILE=INDEX-6
 	    ;;
@@ -33,6 +30,15 @@ buildenv () {
 	x8)
 	export INDEXFILE=INDEX-8
 	    ;;
+	x7-exp)
+	export INDEXFILE=INDEX-7
+	    ;;
+	x8)
+	export INDEXFILE=INDEX-8
+	    ;;
+	x8-exp)
+	export INDEXFILE=INDEX-8
+	    ;;
 	*)
 	    echo "buildenv: invalid branch"
 	    exit 1
diff --git a/Tools/portbuild/scripts/dologs b/Tools/portbuild/scripts/dologs
index f7d6ca61cbbd..95ad41e2f96a 100755
--- a/Tools/portbuild/scripts/dologs
+++ b/Tools/portbuild/scripts/dologs
@@ -9,11 +9,11 @@ home=${pb}/errorlogs
 scripts=${pb}/scripts
 
 for ver in latest full; do
-  for num in 5 5-exp 6 6-exp 6-exp2 7 7-exp 8; do
+  for num in 5 6 6-exp 6-exp2 7 7-exp 8 8-exp; do
     cd $home/$arch-$num-$ver && ${scripts}/processlogs ${arch}
     cd ${pb}/${arch}/${num} && ${scripts}/processfail ${arch} ${num}
   done
-  for num in 5 5-exp 6 6-exp 6-exp2 7 7-exp 8; do
+  for num in 5 6 6-exp 6-exp2 7 7-exp 8 8-exp; do
     cd $home/$arch-$num-$ver-logs && ${scripts}/processlogs2
   done
 #  for num in 5 6 6-exp 7; do
diff --git a/Tools/portbuild/scripts/dopackages b/Tools/portbuild/scripts/dopackages
index 21a1f1a4904e..95a80f060fd2 100755
--- a/Tools/portbuild/scripts/dopackages
+++ b/Tools/portbuild/scripts/dopackages
@@ -255,7 +255,7 @@ date=$2
 
 echo | mail -s "$(basename $0) started for ${arch}-${branch} ${date} at $(date)" ${mailto}
 
-if [ "x$branch" != x5 -a "x$branch" != x5-exp -a "x$branch" != x6 -a "x$branch" != x6-exp -a "x$branch" != "x6-exp2" -a "x$branch" != x7 -a "x$branch" != x7-exp -a "x$branch" != x8 ]; then
+if [ "x$branch" != x5 -a "x$branch" != x6 -a "x$branch" != x6-exp -a "x$branch" != "x6-exp2" -a "x$branch" != x7 -a "x$branch" != x7-exp -a "x$branch" != x8 -a "x$branch" != x8-exp ]; then
   usage
 fi
 
diff --git a/Tools/portbuild/scripts/makeindex b/Tools/portbuild/scripts/makeindex
index 472a3bade40f..9ae273b7df46 100755
--- a/Tools/portbuild/scripts/makeindex
+++ b/Tools/portbuild/scripts/makeindex
@@ -30,10 +30,6 @@ case "x$1" in
     branch=5
     INDEXFILE=INDEX-5
     ;;
-  x5-exp)
-    branch=5-exp
-    INDEXFILE=INDEX-5
-    ;;
   x6)
     branch=6
     INDEXFILE=INDEX-6
@@ -58,6 +54,10 @@ case "x$1" in
     branch=8
     INDEXFILE=INDEX-8
     ;;
+  x8-exp)
+    branch=8-exp
+    INDEXFILE=INDEX-8
+    ;;
   *)
     usage
     ;;
diff --git a/Tools/portbuild/scripts/mkbindist b/Tools/portbuild/scripts/mkbindist
index de2b5d4a2a39..5a1da7ff752e 100755
--- a/Tools/portbuild/scripts/mkbindist
+++ b/Tools/portbuild/scripts/mkbindist
@@ -10,7 +10,7 @@ fi
 
 arch=$1
 branch=$2
-if [ "x$branch" != x5 -a "x$branch" != x5-exp -a "x$branch" != x6-exp -a "x$branch" != x6-exp2 -a "x$branch" != x6 -a "x$branch" != x7 -a "x$branch" != x7-exp -a "x$branch" != x8 ]; then
+if [ "x$branch" != x5 -a "x$branch" != x6-exp -a "x$branch" != x6-exp2 -a "x$branch" != x6 -a "x$branch" != x7 -a "x$branch" != x7-exp -a "x$branch" != x8 -a "x$branch" != x8-exp ]; then
   usage
 fi