Watch out for undefined values when resolving port origins. This makes

-I / -s work properly when some of the installed ports have since been
deleted from the ports tree.

Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de>

2 files changed, 6 insertions, 4 deletions

diff --git a/ports-mgmt/porteasy/Makefile b/ports-mgmt/porteasy/Makefile
index f51b03d..80e100a 100644
--- a/ports-mgmt/porteasy/Makefile
+++ b/ports-mgmt/porteasy/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	porteasy
-PORTVERSION=	2.7.16
+PORTVERSION=	2.7.17
 CATEGORIES=	misc
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/ports-mgmt/porteasy/src/porteasy.pl b/ports-mgmt/porteasy/src/porteasy.pl
index ecbb905..388c4b9 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.7.16";
+my $VERSION	= "2.7.17";
 my $COPYRIGHT	= "Copyright (c) 2000-2004 Dag-Erling Smørgrav. " .
 		  "All rights reserved.";
 
@@ -446,7 +446,7 @@ sub find_moved($) {
 	read_moved();
     }
     while (exists($moved{$port}) && $moved{$port}->[1] gt $date) {
-	if (!defined($moved{$port}->[0])) {
+	if (!$moved{$port}->[0]) {
 	    info("$port was removed" .
 		 " on $moved{$port}->[1]: $moved{$port}->[2]");
 	    return undef;
@@ -478,7 +478,9 @@ sub add_port($$) {
 	} else {
 	    $realport = find_port($port);
 	}
-	$realport = find_moved($realport);
+	if ($realport) {
+	    $realport = find_moved($realport);
+	}
     }
     if (!$realport) {
 	return 1;