From ade@FreeBSD.org  Sun Feb  1 20:37:23 2004
Return-Path: <ade@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id E1D6816A4CE; Sun,  1 Feb 2004 20:37:23 -0800 (PST)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id EFF2E43D2F; Sun,  1 Feb 2004 20:37:22 -0800 (PST)
	(envelope-from ade@FreeBSD.org)
Received: from freefall.freebsd.org (ade@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.10/8.12.10) with ESMTP id i124bMFR052546;
	Sun, 1 Feb 2004 20:37:22 -0800 (PST)
	(envelope-from ade@freefall.freebsd.org)
Received: (from ade@localhost)
	by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i124bMIK052545;
	Sun, 1 Feb 2004 20:37:22 -0800 (PST)
	(envelope-from ade)
Message-Id: <200402020437.i124bMIK052545@freefall.freebsd.org>
Date: Sun, 1 Feb 2004 20:37:22 -0800 (PST)
From: Ade Lovett <ade@FreeBSD.org>
Reply-To: Ade Lovett <ade@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: ade@FreeBSD.org
Subject: bsd.port.mk WRKDIRPREFIX breakage
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         62247
>Category:       ports
>Synopsis:       [patch] bsd.port.mk WRKDIRPREFIX breakage
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 01 20:40:16 PST 2004
>Closed-Date:    Thu Apr 01 23:34:51 PST 2004
>Last-Modified:  Thu Apr 01 23:34:51 PST 2004
>Originator:     Ade Lovett
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:

System environment irrelevant, affects 4.x and 5.x

>Description:

with WRKDIRPREFIX set, there are still a couple of areas where invocations
of make(1) within bsd.port.mk fail due to assumptions being made about
the current directory.

>How-To-Repeat:

set WRKDIRPREFIX, build a few ports, watch *carefully* for errors just
after install.

>Fix:

http://people.FreeBSD.org/~ade/bsd.port.mk_fix-make.patch


Index: bsd.port.mk
===================================================================
RCS file: /home/FreeBSD/cvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.481
diff -u -1 -r1.481 bsd.port.mk
--- bsd.port.mk	23 Jan 2004 16:22:26 -0000	1.481
+++ bsd.port.mk	23 Jan 2004 22:28:20 -0000
@@ -3537,3 +3537,4 @@
 	then \
-	    if [ ! -z "`make www-site`" ]; then \
+		www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \
+	    if [ ! -z "$${www_site}" ]; then \
 			${ECHO_MSG}; \
@@ -3541,3 +3542,3 @@
 			${ECHO_MSG} "      status of this software, see the following webpage: "; \
-			${MAKE} www-site; \
+			${ECHO_MSG} "$${www_site}"; \
 		fi; \
@@ -3631,3 +3632,4 @@
 		${ECHO_MSG} "      to deinstall the port if this is a concern."; \
-	    if [ ! -z "`make www-site`" ]; then \
+		www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \
+	    if [ ! -z "$${www_site}" ]; then \
 			${ECHO_MSG}; \
@@ -3635,3 +3637,3 @@
 			${ECHO_MSG} "      status of this software, see the following webpage: "; \
-			${MAKE} www-site; \
+			${ECHO_MSG} "$${www_site}"; \
 		fi; \
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: ade 
Responsible-Changed-When: Sun Feb 1 20:40:45 PST 2004 
Responsible-Changed-Why:  
Have fun 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62247 
State-Changed-From-To: open->analyzed 
State-Changed-By: kris 
State-Changed-When: Sat Mar 20 18:18:11 PST 2004 
State-Changed-Why:  
Will be tested on the next bento 4-exp run 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62247 
State-Changed-From-To: analyzed->closed 
State-Changed-By: kris 
State-Changed-When: Thu Apr 1 23:34:44 PST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62247 
>Unformatted:
