Refactor common variables from case statement for various branches.

Update default X11BASE.  Retire PARALLEL_PACKAGE_BUILD and HAVE_MOTIF which
are now obsolete.

1 files changed, 12 insertions, 35 deletions

diff --git a/Tools/portbuild/scripts/buildenv b/Tools/portbuild/scripts/buildenv
index 0bd853ffa519..c629596985fd 100644
--- a/Tools/portbuild/scripts/buildenv
+++ b/Tools/portbuild/scripts/buildenv
@@ -7,51 +7,25 @@ buildenv () {
     arch=$2
     branch=$3
 
-    export X11BASE=/usr/X11R6
-    export LOCALBASE=/usr/local
     case "x$branch" in
-	x4)
-    	export PKGSUFFIX=.tgz
-    	export PKGZIPCMD=gzip
-	export INDEXFILE=INDEX
-	export X_WINDOW_SYSTEM=xfree86-4
-	    ;;
-	x4-exp)
-    	export PKGSUFFIX=.tgz
-    	export PKGZIPCMD=gzip
-	export PORTS_AUDIT=1
-	export INDEXFILE=INDEX
-	export X_WINDOW_SYSTEM=xfree86-4
-	    ;;
 	x5)
-    	export PKGSUFFIX=.tbz
-    	export PKGZIPCMD=bzip2
 	export INDEXFILE=INDEX-5
-	export X_WINDOW_SYSTEM=xorg
+	export USE_NONDEFAULT_X11BASE=1
 	    ;;
 	x5-exp)
-    	export PKGSUFFIX=.tbz
-    	export PKGZIPCMD=bzip2
-	export INDEXFILE=INDEX-5
-	export X_WINDOW_SYSTEM=xorg
+	export INDEXFILE=INDEX-6
 	    ;;
 	x6)
-    	export PKGSUFFIX=.tbz
-    	export PKGZIPCMD=bzip2
 	export INDEXFILE=INDEX-6
-	export X_WINDOW_SYSTEM=xorg
 	    ;;
 	x6-exp)
-    	export PKGSUFFIX=.tbz
-    	export PKGZIPCMD=bzip2
 	export INDEXFILE=INDEX-6
-	export X_WINDOW_SYSTEM=xorg
+	    ;;
+	x6-exp2)
+	export INDEXFILE=INDEX-6
 	    ;;
 	x7)
-    	export PKGSUFFIX=.tbz
-    	export PKGZIPCMD=bzip2
 	export INDEXFILE=INDEX-7
-	export X_WINDOW_SYSTEM=xorg
 	    ;;
 	*)
 	    echo "buildenv: invalid branch"
@@ -62,6 +36,13 @@ buildenv () {
     export ARCH=${arch}
     export MACHINE_ARCH=${arch}
 
+    export X11BASE=/usr/local
+    export LOCALBASE=/usr/local
+    export PKGSUFFIX=.tbz
+    export PKGZIPCMD=bzip2
+    export X_WINDOW_SYSTEM=xorg
+    export XORG_UPGRADE=1
+
     # Have to use realpath because 'make index' doesn't deal with symlinks in PORTSDIR
     # - kk 020311
     export PORTSDIR=$(realpath ${pb}/${arch}/${branch}/ports)
@@ -92,10 +73,6 @@ buildenv () {
 
     export USA_RESIDENT=yes
 
-    # Old and mouldy?
-    export PARALLEL_PACKAGE_BUILD=1
-    export HAVE_MOTIF=1
-
     export FTP_PASSIVE_MODE=yes
     #export FETCH_BEFORE_ARGS=-vvv
 }