Index: devel/pb/bin/pb
===================================================================
--- devel/pb/bin/pb	(revision 79)
+++ devel/pb/bin/pb	(revision 80)
@@ -43,5 +43,4 @@
 my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
 my $pbdate = strftime("%Y-%m-%d", @date);
-$ENV{'PBDATE'}=$pbdate;
 
 getopts('hl:p:qr:tv',\%opts);
@@ -129,9 +128,4 @@
 		print $LOG "Management of $pbpkg $pbver-$pbtag (rev $pbrev)\n" if ($debug >= 0);
 		die "Unable to get env var PBDESTDIR" if (not defined $ENV{'PBDESTDIR'});
-		# Put some var in env to allow filtering
-		$ENV{'PBVER'}=$pbver;
-		$ENV{'PBTAG'}=$pbtag;
-		$ENV{'PBPKG'}=$pbpkg;
-		$ENV{'PBREV'}=$pbrev;
 		# Clean up dest if necessary. The export will recreate it
 		my $dest = "$ENV{'PBDESTDIR'}/$pbpkg-$pbver";
@@ -217,9 +211,9 @@
 			if (defined $ptr) {
 				foreach my $f (values %bfiles) {
-					pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$dsuf);
+					pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$dsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate);
 				}
 				if (defined $filteredfiles{$dir}) {
 					foreach my $f (split(/,/,$filteredfiles{$dir})) {
-						pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f");
+						pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$pbdate,$pbdate,$pbdate,$pbdate,$pbdate);
 					}
 				}