From owner-svn-ports-all@FreeBSD.ORG  Thu Apr 10 17:02:34 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AA81697;
 Thu, 10 Apr 2014 17:02:34 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 962E81A1C;
 Thu, 10 Apr 2014 17:02:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3AH2YaX036510;
 Thu, 10 Apr 2014 17:02:34 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3AH2Yl1036508;
 Thu, 10 Apr 2014 17:02:34 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201404101702.s3AH2Yl1036508@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 10 Apr 2014 17:02:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350822 - in head/Mk: . 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-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Apr 2014 17:02:34 -0000

Author: bapt
Date: Thu Apr 10 17:02:33 2014
New Revision: 350822
URL: http://svnweb.freebsd.org/changeset/ports/350822
QAT: https://qat.redports.org/buildarchive/r350822/

Log:
  Allow to properly run make check-orphans and make makeplist for gnome ports

Modified:
  head/Mk/Scripts/check-stagedir.sh
  head/Mk/bsd.stage.mk

Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh	Thu Apr 10 17:00:46 2014	(r350821)
+++ head/Mk/Scripts/check-stagedir.sh	Thu Apr 10 17:02:33 2014	(r350822)
@@ -23,7 +23,7 @@ esac
 
 # validate environment
 envfault=
-for i in STAGEDIR PREFIX LOCALBASE WRKDIR WRKSRC MTREE_FILE \
+for i in STAGEDIR PREFIX LOCALBASE WRKDIR WRKSRC MTREE_FILE GNOME_MTREE_FILE \
     TMPPLIST DOCSDIR EXAMPLESDIR PLIST_SUB
 do
     if ! ( eval ": \${${i}?}" ) 2>/dev/null ; then
@@ -91,6 +91,10 @@ fi
 		listmtree "${MTREE_FILE}" "${PREFIX}"
 	fi
 
+	if [ -n "${GNOME_MTREE_FILE}" ]; then
+		listmtree "${GNOME_MTREE_FILE}" "${PREFIX}"
+	fi
+
 	a=${PREFIX}
 	while :; do
 		echo ${a}

Modified: head/Mk/bsd.stage.mk
==============================================================================
--- head/Mk/bsd.stage.mk	Thu Apr 10 17:00:46 2014	(r350821)
+++ head/Mk/bsd.stage.mk	Thu Apr 10 17:02:33 2014	(r350822)
@@ -22,6 +22,7 @@ CO_ENV+=	STAGEDIR=${STAGEDIR} \
 		WRKDIR=${WRKDIR} \
 		WRKSRC=${WRKSRC} \
 		MTREE_FILE=${MTREE_FILE} \
+		GNOME_MTREE_FILE=${GNOME_MTREE_FILE} \
 		TMPPLIST=${TMPPLIST} \
 		DOCSDIR=${DOCSDIR} \
 		EXAMPLESDIR=${EXAMPLESDIR} \