diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2007-10-31 08:57:03 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2007-10-31 08:57:03 +0000 |
| commit | fada3faae4f00007153b3b11e308381ad8a63bd8 (patch) | |
| tree | d52295a909d1b444819cb87a21835e937ac669b2 /ports-mgmt | |
| parent | Fix PKGORIGIN by backing out part of the previous commit. The first (diff) | |
Small bug fixes
===============
1. In delete_all_distfiles(), $distdir already contains a trailing slash
2. Only print the "no new versions" message for -L, not -l
Big bug fix
===========
1. cd back to the port directory before trying to run 'make install'
pointy_hat_supply++
Approved by: portmgr (marcus)
Notes
Notes:
svn path=/head/; revision=202454
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmaster/files/portmaster.sh.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ports-mgmt/portmaster/files/portmaster.sh.in b/ports-mgmt/portmaster/files/portmaster.sh.in index 6c3e706f1ee5..154ff4ecf415 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.192 +# Local version: 1.193 # $FreeBSD$ # Copyright (c) 2005-2007 Douglas Barton, All rights reserved @@ -866,7 +866,7 @@ delete_all_distfiles () { if [ -n "$do_delete" ]; then delete_stale_distfiles rm -f $distfiles - find ${distdir}/ -type d -empty -delete + find $distdir -type d -empty -delete fi fi } @@ -1083,7 +1083,7 @@ if [ -n "$LIST" -o -n "$LIST_PLUS" ]; then echo " ===>>> $num_updates have new versions available" elif [ "$num_updates" -eq 1 ]; then echo " ===>>> 1 has a new version available" - else + elif [ -n "$LIST_PLUS" ]; then echo " ===>>> There are no new versions available" fi @@ -1767,6 +1767,9 @@ if [ -n "$upg_port" ]; then fi fi +# In case we went elsewhere to create a backup package +cd $pd/$portdir + # Do the install here in case a run dependency has a build dependency on us. # Defining NO_DEPENDS ensures that we will control the installation of the # run depends, not bsd.port.mk. |