ports/120200: ports with custom MTREE fails in bsd.port.mk

[dirk.meyer at dinoex.sub.org]

>Number:         120200
>Category:       ports
>Synopsis:       ports with custom MTREE fails in bsd.port.mk
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 01 09:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Dirk Meyer
>Release:        FreeBSD 6.3-STABLE
>Organization:
privat
>Environment:
	FreeBSD 6.3-STABLE
	A Clean/Empty /usr/local/

>Description:

	in bsd.port.mk there is a "cd" command that fails.
	for the ports in question this code should not be reached.

>How-To-Repeat:
	
	Build a port with MTREE file.
	e.G.
	cd /usr/posrt/net/mpd && make clean install

===>  Installing for mpd-3.18_5
===>   Generating temporary packing list
===>  Checking if net/mpd already installed
cd: can't cd to /usr/local/share/nls
*** Error code 2

Stop in /usr/ports/net/mpd.
=== package mpd-3.18_5 was not installed

>Fix:

	Apply a check like this example:

--- bsd.port.mk.orig	2007-11-18 08:35:32.000000000 +0100
+++ bsd.port.mk	2008-02-01 09:58:12.000000000 +0100
@@ -2239,6 +2239,7 @@
 .else
 MTREE_FILE=	${PORTSDIR}/Templates/BSD.local.dist
 .endif
+MTREE_FILE_DEFAULT=yes
 .endif
 MTREE_CMD?=	/usr/sbin/mtree
 MTREE_ARGS?=	-U ${MTREE_FOLLOWS_SYMLINKS} -f ${MTREE_FILE} -d -e -p
@@ -3852,7 +3853,7 @@
 			exit 1; \
 		else \
 			${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \
-			if [ ${PREFIX} = ${LOCALBASE} ]; then \
+			if [ ${PREFIX} = ${LOCALBASE} -a "${MTREE_DEFAULT}" = "yes" ]; then \
 				cd ${PREFIX}/share/nls; \
 				${LN} -shf C POSIX; \
 				${LN} -shf C en_US.US-ASCII; \
>Release-Note:
>Audit-Trail:
>Unformatted: