From owner-svn-ports-head@FreeBSD.ORG  Thu Mar 21 11:13:50 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1F23FEAB;
 Thu, 21 Mar 2013 11:13:50 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0EC52E47;
 Thu, 21 Mar 2013 11:13:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2LBDnfC046058;
 Thu, 21 Mar 2013 11:13:49 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2LBDndh046055;
 Thu, 21 Mar 2013 11:13:49 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201303211113.r2LBDndh046055@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 21 Mar 2013 11:13:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314836 - in head: Mk Tools/scripts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Mar 2013 11:13:50 -0000

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