From owner-freebsd-stable  Tue Jul 22 23:51:00 1997
Return-Path: <owner-freebsd-stable>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id XAA29108
          for stable-outgoing; Tue, 22 Jul 1997 23:51:00 -0700 (PDT)
Received: from silvia.HIP.Berkeley.EDU (ala-ca26-44.ix.netcom.com [207.93.42.108])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id XAA29102
          for <freebsd-stable@FreeBSD.ORG>; Tue, 22 Jul 1997 23:50:56 -0700 (PDT)
Received: (from asami@localhost) by silvia.HIP.Berkeley.EDU (8.8.6/8.6.9) id XAA21218; Tue, 22 Jul 1997 23:50:48 -0700 (PDT)
Date: Tue, 22 Jul 1997 23:50:48 -0700 (PDT)
Message-Id: <199707230650.XAA21218@silvia.HIP.Berkeley.EDU>
To: haplo@ibm.net
CC: mlghome@home.com, freebsd-stable@FreeBSD.ORG
In-reply-to: <Pine.BSF.3.95q.970722212407.21592A-100000@dilbert.my.net> (message from Jordan Klein on Tue, 22 Jul 1997 21:25:45 -0500 (CDT))
Subject: Re: Problems making x11 ports: missing /etc/mtree/BSD.x11.dist
From: asami@cs.berkeley.edu (Satoshi Asami)
Sender: owner-freebsd-stable@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

 * Look for the file in /usr/src/etc/mtree.  If you've been cvsupping, it'll
 * be there.  Not certain about base 2.2.2 distribution tho.  I had the same
 * problem till I copied the file into /etc/mtree.

Seems like a lot of people are tripping over this one.  How about this 
patch?

Satoshi
-------
Index: bsd.port.mk
===================================================================
RCS file: /usr/cvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.227.2.25
diff -u -r1.227.2.25 bsd.port.mk
--- bsd.port.mk	1997/07/17 17:53:43	1.227.2.25
+++ bsd.port.mk	1997/07/23 06:46:52
@@ -1114,7 +1118,13 @@
 .if make(real-install)
 .if !defined(NO_MTREE)
 	@if [ `id -u` = 0 ]; then \
-		${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/; \
+		if [ ! -f ${MTREE_FILE} ]; then \
+			${ECHO_MSG} "Error: mtree file \"${MTREE_FILE}\" is missing."; \
+			${ECHO_MSG} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \
+			exit 1; \
+		else \
+			${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/; \
+		fi; \
 	else \
 		${ECHO_MSG} "Warning: not superuser, can't run mtree."; \
 		${ECHO_MSG} "Become root and try again to ensure correct permissions."; \