diff options
| author | des <des@FreeBSD.org> | 2001-08-14 21:58:56 +0800 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2001-08-14 21:58:56 +0800 |
| commit | f61154899249ec3154a0016bcaddcf7c5c61fb21 (patch) | |
| tree | 10df3c4bb6210ab551926d5f1f921226437f8e8d /misc | |
| parent | bb47baff363e954fc12d51ba333b018da08c3d3b (diff) | |
| download | freebsd-ports-gnome-f61154899249ec3154a0016bcaddcf7c5c61fb21.tar.gz freebsd-ports-gnome-f61154899249ec3154a0016bcaddcf7c5c61fb21.tar.zst freebsd-ports-gnome-f61154899249ec3154a0016bcaddcf7c5c61fb21.zip | |
Fix handling of unconditional dependencies
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/porteasy/Makefile | 2 | ||||
| -rw-r--r-- | misc/porteasy/src/porteasy.pl | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/misc/porteasy/Makefile b/misc/porteasy/Makefile index 2f06659c55c4..2b73d7daaf7c 100644 --- a/misc/porteasy/Makefile +++ b/misc/porteasy/Makefile @@ -8,7 +8,7 @@ # PORTNAME= porteasy -PORTVERSION= 2.4 +PORTVERSION= 2.5 CATEGORIES= misc MASTER_SITES= # none DISTFILES= # none diff --git a/misc/porteasy/src/porteasy.pl b/misc/porteasy/src/porteasy.pl index 230ab2e31e67..eeb3f59b5e31 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.4"; +my $VERSION = "2.5"; my $COPYRIGHT = "Copyright (c) 2000 Dag-Erling Smørgrav. All rights reserved."; # Constants @@ -550,11 +550,14 @@ sub find_dependencies($) { or bsd::errx(1, "failed to obtain dependency list"); %depends = (); foreach $item (split(' ', $dependvars)) { - if ($item !~ m|^([^:]+):$portsdir/([^/:]+/[^/:]+)/?(:[^:]+)?$|) { + if ($item !~ m|^(?:([^:]+):)?$portsdir/([^/:]+/[^/:]+)/?(:[^:]+)?$|) { bsd::warnx("invalid dependency: %s", $item); + next; } ($lhs, $rhs) = ($1, $2); - if ($exclude) { + # XXX this isn't quite right; lhs-less dependencies should be + # XXX checked against /var/db/pkg or something. + if ($exclude && defined($lhs)) { if ($have_dep{$rhs}) { next; } |