diff options
author | Doug Barton <dougb@FreeBSD.org> | 2007-10-21 13:33:07 +0800 |
---|---|---|
committer | Doug Barton <dougb@FreeBSD.org> | 2007-10-21 13:33:07 +0800 |
commit | 4611f3a852620b143653665836f725eae39e9f2e (patch) | |
tree | 1551336eb4e84410b4642a581be6a8cc1c1b92b7 /ports-mgmt | |
parent | 382c030511da1a531a716f2125020d16d4590725 (diff) | |
download | freebsd-ports-gnome-4611f3a852620b143653665836f725eae39e9f2e.tar.gz freebsd-ports-gnome-4611f3a852620b143653665836f725eae39e9f2e.tar.zst freebsd-ports-gnome-4611f3a852620b143653665836f725eae39e9f2e.zip |
Two small bug fixes
===================
1. When I changed how the MOVED file was treated in version 1.19
I accidentally typed a literal /usr/ports/. Change that to the
variable for PORTSDIR as it should be. [1]
2. When using the --show-work feature and the port has no dependencies,
exit immediately instead of recursing.
Submitted by: Jason C. Wells <jcw@highperformance.net> [1]
Diffstat (limited to 'ports-mgmt')
-rw-r--r-- | ports-mgmt/portmaster/files/portmaster.sh.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ports-mgmt/portmaster/files/portmaster.sh.in b/ports-mgmt/portmaster/files/portmaster.sh.in index a3a3b909e36f..8cdb3dd814f5 100644 --- a/ports-mgmt/portmaster/files/portmaster.sh.in +++ b/ports-mgmt/portmaster/files/portmaster.sh.in @@ -1,6 +1,6 @@ #!/bin/sh -# Local version: 1.190 +# Local version: 1.191 # $FreeBSD$ # Copyright (c) 2005-2007 Douglas Barton, All rights reserved @@ -513,7 +513,7 @@ find_moved_port () { # To avoid having each word of the reason treated separately IFS=' ' - for l in `grep "^$sf" /usr/ports/MOVED`; do + for l in `grep "^$sf" $pd/MOVED`; do case "$l" in ${sf}\|\|*) fail "The $sf port has been deleted: ${l##*|}" ;; @@ -571,6 +571,7 @@ dependency_check () { if [ -z "$dep_port_list" ]; then echo "===>>> No dependencies for $portdir" + [ -n "$SHOW_WORK" ] && safe_exit return 0 else if [ -n "$CONFIG_ONLY" ]; then |