diff options
| author | des <des@FreeBSD.org> | 2004-10-14 03:53:36 +0800 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-10-14 03:53:36 +0800 |
| commit | a6435c480ef7044b0a3aaa1a0c9cb03e5a74760c (patch) | |
| tree | 094511872ba6f351ed8449464b60ff792935b75d | |
| parent | 6b9e568a7d93f8220a0ae98e0c0f2defe4f158ce (diff) | |
| download | freebsd-ports-gnome-a6435c480ef7044b0a3aaa1a0c9cb03e5a74760c.tar.gz freebsd-ports-gnome-a6435c480ef7044b0a3aaa1a0c9cb03e5a74760c.tar.zst freebsd-ports-gnome-a6435c480ef7044b0a3aaa1a0c9cb03e5a74760c.zip | |
Improve handling of installed ports whose origin can't be determined.
| -rw-r--r-- | misc/porteasy/Makefile | 2 | ||||
| -rw-r--r-- | misc/porteasy/src/porteasy.pl | 16 | ||||
| -rw-r--r-- | ports-mgmt/porteasy/Makefile | 2 | ||||
| -rw-r--r-- | 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 { |