- Fix dialog4ports missing when PREFIX!=LOCALBASE

PR:		ports/177174
Reported by:	Hirohisa Yamaguchi <umq@ueo.co.jp>
With hat:	portmgr
This commit is contained in:
Bryan Drewery 2013-03-21 11:13:49 +00:00
parent 314f9a8f8f
commit cca914e0f6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=314836
2 changed files with 5 additions and 1 deletions

View File

@ -6099,6 +6099,8 @@ D4P_ENV= PKGNAME="${PKGNAME}" \
OPTIONS_RADIO="${OPTIONS_RADIO}" \
OPTIONS_GROUP="${OPTIONS_GROUP}" \
DIALOG4PORTS="${DIALOG4PORTS}" \
PREFIX="${PREFIX}" \
LOCALBASE="${LOCALBASE}" \
PORTSDIR="${PORTSDIR}" \
MAKE="${MAKE}" \
D4PHEIGHT="${D4PHEIGHT}" \

View File

@ -15,7 +15,9 @@ OPTIONSFILE="$1"
if ! [ -e $DIALOG4PORTS ]; then
# If INSTALL_AS_USER is set then just build and use the WRKDIR version
if [ -n "${INSTALL_AS_USER}" ]; then
# Also do this if PREFIX!=LOCALBASE to avoid missing file or double
# installs
if [ -n "${INSTALL_AS_USER}" -o "${PREFIX}" != "${LOCALBASE}" ]; then
if ! [ -d "${PORTSDIR}/${DIALOGPORT}" ]; then
echo "===> Skipping 'config' as ${DIALOGPORT} is not checked out" >&2
exit 1