Allow staging as a regular user and simplify


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@366463 35697150-7ecd-e111-bb59-0022644237b5