(1) Update values of OSREL/OSVERSION to match reality.

(2) (portbuild) Change no-output timeout from 1800 to 3600.  Some ports
    seem to actually take more than 30 minutes inside a command.

(3) (portbuild) Add -p flag to tar when extracting bindist.

(4) (makeindex) Remove the -j flag to make index, the argument was 1 anyway.

3 files changed, 15 insertions, 15 deletions

diff --git a/Tools/portbuild/scripts/makeduds b/Tools/portbuild/scripts/makeduds
index 0cd72ab77721..c4afc19d352f 100755
--- a/Tools/portbuild/scripts/makeduds
+++ b/Tools/portbuild/scripts/makeduds
@@ -27,14 +27,14 @@ case "x$1" in
   x4)
     branch=4
     export PORTOBJFORMAT=elf
-    # export OSREL=4.0
-    # export OSVERSION=400018
+    # export OSREL=4.2
+    # export OSVERSION=420001
     ;;
   x5)
     branch=5
     export PORTOBJFORMAT=elf
     export OSREL=5.0
-    export OSVERSION=500011
+    export OSVERSION=500017
     ;;
   *)
     usage
diff --git a/Tools/portbuild/scripts/makeindex b/Tools/portbuild/scripts/makeindex
index 8534e29be8bc..be3bb1810da4 100755
--- a/Tools/portbuild/scripts/makeindex
+++ b/Tools/portbuild/scripts/makeindex
@@ -1,8 +1,8 @@
 #!/bin/sh
 # usage: $0 branch
 
-# -j# to make index
-INDEXJOBS=1
+#### -j# to make index
+###INDEXJOBS=1
 
 usage () {
   echo "usage: makeindex branch"
@@ -27,14 +27,14 @@ case "x$1" in
   x4)
     branch=4
     export PORTOBJFORMAT=elf
-    # export OSREL=4.0
-    # export OSVERSION=400018
+    # export OSREL=4.2
+    # export OSVERSION=420001
     ;;
   x5)
     branch=5
     export PORTOBJFORMAT=elf
     export OSREL=5.0
-    export OSVERSION=500011
+    export OSVERSION=500017
     ;;
   *)
     usage
@@ -59,7 +59,7 @@ export PARALLEL_PACKAGE_BUILD=t
 #export NO_RESTRICTED=t
 #export FOR_CDROM=t
 #export INDEX_NOSORT=t
-make -j${INDEXJOBS} index
+make 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
diff --git a/Tools/portbuild/scripts/portbuild b/Tools/portbuild/scripts/portbuild
index dc4e2b9cf6c9..8f8dbc998cb5 100755
--- a/Tools/portbuild/scripts/portbuild
+++ b/Tools/portbuild/scripts/portbuild
@@ -25,8 +25,8 @@ export WRKDIRPREFIX=/tmp
 # don't pass -j, -k etc. to sub-makes
 unset MAKEFLAGS
 unset PORTSDIR
-# wait 1800 seconds before killing build with no output
-export TIMEOUT=1800
+# wait 3600 seconds before killing build with no output
+export TIMEOUT=3600
 # to prevent runaway processes -- 256 meg file size limit, one hour CPU limit
 ulimit -f 524288
 ulimit -t 3600
@@ -78,12 +78,12 @@ fi
 case ${branch} in
   5*)
 #    export OSREL=5.0
-    export OSVERSION=500011
+    export OSVERSION=500017
     # export PORTOBJFORMAT=elf
     ;;
   4*)
-    # export OSREL=4.1
-    # export OSVERSION=410002
+    # export OSREL=4.2
+    # export OSVERSION=420001
     # export PORTOBJFORMAT=elf
     ;;
   3*)
@@ -136,7 +136,7 @@ if [ ${found} != 1 ]; then
 
   mkdir -p ${chroot}/used
   touch ${chroot}/used/${pkgname}
-  tar -C ${chroot} -xf ${bindist}
+  tar -C ${chroot} -xpf ${bindist}
 
   # to be able to run ps and killall inside chroot area
   cp -p /bin/ps ${chroot}/bin