From 6a8714c9fd3187d015f98bde5b28a991ace336c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Wed, 13 Oct 2004 19:53:36 +0000
Subject: [PATCH] Improve handling of installed ports whose origin can't be
 determined.

---
 misc/porteasy/Makefile              |  2 +-
 misc/porteasy/src/porteasy.pl       | 16 +++++++++++++---
 ports-mgmt/porteasy/Makefile        |  2 +-
 ports-mgmt/porteasy/src/porteasy.pl | 16 +++++++++++++---
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/misc/porteasy/Makefile b/misc/porteasy/Makefile
index 80e100aff989..a255f3aa5b5e 100644
--- a/misc/porteasy/Makefile
+++ b/misc/porteasy/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	porteasy
-PORTVERSION=	2.7.17
+PORTVERSION=	2.7.18
 CATEGORIES=	misc
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/misc/porteasy/src/porteasy.pl b/misc/porteasy/src/porteasy.pl
index 388c4b9f3dd7..9cfb1e469a8d 100644
--- a/misc/porteasy/src/porteasy.pl
+++ b/misc/porteasy/src/porteasy.pl
@@ -33,7 +33,7 @@ use strict;
 use Fcntl;
 use Getopt::Long;
 
-my $VERSION	= "2.7.17";
+my $VERSION	= "2.7.18";
 my $COPYRIGHT	= "Copyright (c) 2000-2004 Dag-Erling Smørgrav. " .
 		  "All rights reserved.";
 
@@ -275,7 +275,7 @@ sub cvs($;@) {
     if (!$verbose) {
 	push(@args, "-q");
     }
-    push(@args, "-f", "-z3", "-R", "-d$cvsroot", $cmd, "-A");
+    push(@args, "-f", "-z3", "-R", "-d$cvsroot", $cmd, "-A", "-T");
     if ($cmd eq "checkout") {
 	push(@args, "-P");
     } elsif ($cmd eq "update") {
@@ -771,6 +771,12 @@ sub update_ports_tree(@) {
 	# Process all unprocessed ports we know of so far
 	foreach my $port (@update_now) {
 	    next if ($processed{$port});
+	    if (! -f "$portsdir/$port/Makefile") {
+		bsd::warnx("$port does not exist in $portsdir");
+		$pkgname{$port} = $installed{$port}->[0] || "";
+		$processed{$port} = 1;
+		next;
+	    }
 	    setproctitle("updating $port");
 
 	    # See if the port has an unprocessed master port
@@ -972,7 +978,11 @@ sub show_port_status($) {
 
     if ($installed{$port}) {
 	foreach my $pkg (@{$installed{$port}}) {
-	    $cmp = cmp_version($pkg, $pkgname{$port});
+	    if (-d "$portsdir/$port") {
+		$cmp = cmp_version($pkg, $pkgname{$port});
+	    } else {
+		$cmp = '?';
+	    }
 	    if ($cmp eq '=') {
 		print("   $pkg\n");
 	    } else {
diff --git a/ports-mgmt/porteasy/Makefile b/ports-mgmt/porteasy/Makefile
index 80e100aff989..a255f3aa5b5e 100644
--- a/ports-mgmt/porteasy/Makefile
+++ b/ports-mgmt/porteasy/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	porteasy
-PORTVERSION=	2.7.17
+PORTVERSION=	2.7.18
 CATEGORIES=	misc
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/ports-mgmt/porteasy/src/porteasy.pl b/ports-mgmt/porteasy/src/porteasy.pl
index 388c4b9f3dd7..9cfb1e469a8d 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.17";
+my $VERSION	= "2.7.18";
 my $COPYRIGHT	= "Copyright (c) 2000-2004 Dag-Erling Smørgrav. " .
 		  "All rights reserved.";
 
@@ -275,7 +275,7 @@ sub cvs($;@) {
     if (!$verbose) {
 	push(@args, "-q");
     }
-    push(@args, "-f", "-z3", "-R", "-d$cvsroot", $cmd, "-A");
+    push(@args, "-f", "-z3", "-R", "-d$cvsroot", $cmd, "-A", "-T");
     if ($cmd eq "checkout") {
 	push(@args, "-P");
     } elsif ($cmd eq "update") {
@@ -771,6 +771,12 @@ sub update_ports_tree(@) {
 	# Process all unprocessed ports we know of so far
 	foreach my $port (@update_now) {
 	    next if ($processed{$port});
+	    if (! -f "$portsdir/$port/Makefile") {
+		bsd::warnx("$port does not exist in $portsdir");
+		$pkgname{$port} = $installed{$port}->[0] || "";
+		$processed{$port} = 1;
+		next;
+	    }
 	    setproctitle("updating $port");
 
 	    # See if the port has an unprocessed master port
@@ -972,7 +978,11 @@ sub show_port_status($) {
 
     if ($installed{$port}) {
 	foreach my $pkg (@{$installed{$port}}) {
-	    $cmp = cmp_version($pkg, $pkgname{$port});
+	    if (-d "$portsdir/$port") {
+		$cmp = cmp_version($pkg, $pkgname{$port});
+	    } else {
+		$cmp = '?';
+	    }
 	    if ($cmp eq '=') {
 		print("   $pkg\n");
 	    } else {