Add branch=5 case and update some variables. Don't set NO_RESTRICTED,

this will be passed down by calling scripts if necessary.

Remove extra spaces in dependency list -- this sometimes confuses make
for some reason.

1 files changed, 14 insertions, 5 deletions

diff --git a/Tools/portbuild/scripts/makeindex b/Tools/portbuild/scripts/makeindex
index cadd73e867df..f5ca0b0e43df 100755
--- a/Tools/portbuild/scripts/makeindex
+++ b/Tools/portbuild/scripts/makeindex
@@ -21,14 +21,20 @@ case "x$1" in
   x3)
     branch=3
     export PORTOBJFORMAT=elf
-    # export OSREL=3.3
-    # export OSVERSION=330000
+    export OSREL=3.5
+    export OSVERSION=350001
     ;;
   x4)
     branch=4
     export PORTOBJFORMAT=elf
-    export OSREL=4.0
-    export OSVERSION=400009
+    # export OSREL=4.0
+    # export OSVERSION=400018
+    ;;
+  x5)
+    branch=5
+    export PORTOBJFORMAT=elf
+    export OSREL=5.0
+    export OSVERSION=500011
     ;;
   *)
     usage
@@ -42,7 +48,10 @@ export BATCH=t
 export HAVE_MOTIF=t
 export PACKAGE_BUILDING=t
 export PARALLEL_PACKAGE_BUILD=t
-export NO_RESTRICTED=t
+#export NO_RESTRICTED=t
 #export FOR_CDROM=t
 #export INDEX_NOSORT=t
 make -j${INDEXJOBS} index
+# remove extra spaces in dependency list -- this could cause problems
+sed -e 's/  */ /g' -e 's/|  */|/g' -e 's/  *|/|/g' INDEX > INDEX.tmp
+mv -f INDEX.tmp INDEX