Date: Thu, 21 Mar 2013 11:13:49 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314836 - in head: Mk Tools/scripts Message-ID: <201303211113.r2LBDndh046055@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Mar 21 11:13:49 2013 New Revision: 314836 URL: http://svnweb.freebsd.org/changeset/ports/314836 Log: - Fix dialog4ports missing when PREFIX!=LOCALBASE PR: ports/177174 Reported by: Hirohisa Yamaguchi <umq@ueo.co.jp> With hat: portmgr Modified: head/Mk/bsd.port.mk head/Tools/scripts/dialog4ports.sh Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Mar 21 10:50:54 2013 (r314835) +++ head/Mk/bsd.port.mk Thu Mar 21 11:13:49 2013 (r314836) @@ -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}" \ Modified: head/Tools/scripts/dialog4ports.sh ============================================================================== --- head/Tools/scripts/dialog4ports.sh Thu Mar 21 10:50:54 2013 (r314835) +++ head/Tools/scripts/dialog4ports.sh Thu Mar 21 11:13:49 2013 (r314836) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303211113.r2LBDndh046055>