From owner-cvs-ports@FreeBSD.ORG Thu Dec 30 07:14:28 2004 Return-Path: Delivered-To: cvs-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CFF716A4CE; Thu, 30 Dec 2004 07:14:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B35B43D48; Thu, 30 Dec 2004 07:14:28 +0000 (GMT) (envelope-from kris@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBU7ERrG089160; Thu, 30 Dec 2004 07:14:27 GMT (envelope-from kris@repoman.freebsd.org) Received: (from kris@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBU7ERhn089159; Thu, 30 Dec 2004 07:14:27 GMT (envelope-from kris) Message-Id: <200412300714.iBU7ERhn089159@repoman.freebsd.org> From: Kris Kennaway Date: Thu, 30 Dec 2004 07:14:27 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: ports/Mk bsd.port.mk X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Dec 2004 07:14:28 -0000 kris 2004-12-30 07:14:27 UTC FreeBSD ports repository Modified files: Mk bsd.port.mk Log: * Back out introduction of DATE variable in previous commit; it conflicts with the reasonable use of that variable to hold date strings in the environment [1] * Overhaul the mtree spec file selection code: instead of deciding based on the value of USE_X_PREFIX, compare PREFIX to X11BASE and LOCALBASE directly. This fixes the MTREE_FILE for ports that set PREFIX=${X11BASE} but don't set USE_X_PREFIX for some reason. If PREFIX is a nonstandard value, set NO_MTREE=yes. Noticed by: Jez Hancock [1] Revision Changes Path 1.503 +7 -6 ports/Mk/bsd.port.mk