* Add support for 7-exp and 8 branches

* XORG_UPGRADE and USA_RESIDENT are no longer required

Approved by:   portmgr (self)

1 files changed, 8 insertions, 3 deletions

diff --git a/Tools/portbuild/scripts/buildenv b/Tools/portbuild/scripts/buildenv
index c629596985fd..69056ff7d83a 100644
--- a/Tools/portbuild/scripts/buildenv
+++ b/Tools/portbuild/scripts/buildenv
@@ -27,6 +27,12 @@ buildenv () {
 	x7)
 	export INDEXFILE=INDEX-7
 	    ;;
+	x7-exp)
+	export INDEXFILE=INDEX-7
+	    ;;
+	x8)
+	export INDEXFILE=INDEX-8
+	    ;;
 	*)
 	    echo "buildenv: invalid branch"
 	    exit 1
@@ -41,7 +47,8 @@ buildenv () {
     export PKGSUFFIX=.tbz
     export PKGZIPCMD=bzip2
     export X_WINDOW_SYSTEM=xorg
-    export XORG_UPGRADE=1
+
+    #export USA_RESIDENT=yes
 
     # Have to use realpath because 'make index' doesn't deal with symlinks in PORTSDIR
     # - kk 020311
@@ -71,8 +78,6 @@ buildenv () {
     export BATCH=1
     export PACKAGE_BUILDING=1
 
-    export USA_RESIDENT=yes
-
     export FTP_PASSIVE_MODE=yes
     #export FETCH_BEFORE_ARGS=-vvv
 }