Before performing any work, unset a number of environment variables which

may adversely affect the port build.  See the man page for details.

3 files changed, 18 insertions, 2 deletions

diff --git a/ports-mgmt/porteasy/Makefile b/ports-mgmt/porteasy/Makefile
index c27e404fa916..d12af106037e 100644
--- a/ports-mgmt/porteasy/Makefile
+++ b/ports-mgmt/porteasy/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	porteasy
-PORTVERSION=	2.8.2
+PORTVERSION=	2.8.3
 CATEGORIES=	misc
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/ports-mgmt/porteasy/src/porteasy.8 b/ports-mgmt/porteasy/src/porteasy.8
index 444948a331ad..b3fd25241dcf 100644
--- a/ports-mgmt/porteasy/src/porteasy.8
+++ b/ports-mgmt/porteasy/src/porteasy.8
@@ -332,6 +332,14 @@ Specifies a set of default options for
 .Nm .
 These options can be overridden by command line parameters.
 .El
+.Pp
+The following variables are removed from the environment before any
+work is performed:
+.Ev CLASSPATH ,
+.Ev LD_* ,
+.Ev JAVA_* ,
+.Ev USE_* ,
+.Ev WANT_* .
 .Sh FILES
 .Nm
 maintains and operates on a ports tree, normally
diff --git a/ports-mgmt/porteasy/src/porteasy.pl b/ports-mgmt/porteasy/src/porteasy.pl
index 3801b5d5cdd6..ff794e7604b2 100644
--- a/ports-mgmt/porteasy/src/porteasy.pl
+++ b/ports-mgmt/porteasy/src/porteasy.pl
@@ -33,7 +33,7 @@ use strict;
 use Fcntl;
 use Getopt::Long;
 
-my $VERSION	= "2.8.2";
+my $VERSION	= "2.8.3";
 my $COPYRIGHT	= "Copyright (c) 2000-2004 Dag-Erling Smørgrav. " .
 		  "All rights reserved.";
 
@@ -1239,6 +1239,14 @@ MAIN:{
 	bsd::errx(1, "No CVS root, please use the -r option or set \$CVSROOT");
     }
 
+    # Unset potentially troublesom environment variables
+    foreach my $var (sort(keys(%ENV))) {
+	if ($var =~ m/^(CLASSPATH|(LD|USE|JAVA|WANT)_\w+)$/) {
+	    bsd::warnx("Removing $var from environment");
+	    delete($ENV{$var});
+	}
+    }
+
     # Step 1: update the ports tree infrastructure
     $release = `uname -r`;
     update_root();