From owner-svn-ports-head@FreeBSD.ORG  Sat Jun 13 02:46:53 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6D56396F;
 Sat, 13 Jun 2015 02:46:53 +0000 (UTC) (envelope-from mat@FreeBSD.org)
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 5B844D26;
 Sat, 13 Jun 2015 02:46:53 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5D2krKe099691;
 Sat, 13 Jun 2015 02:46:53 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5D2kquQ099689;
 Sat, 13 Jun 2015 02:46:52 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201506130246.t5D2kquQ099689@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Sat, 13 Jun 2015 02:46:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r389312 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2015 02:46:53 -0000

Author: mat
Date: Sat Jun 13 02:46:52 2015
New Revision: 389312
URL: https://svnweb.freebsd.org/changeset/ports/389312

Log:
  Use .sinclude when possible.
  
  PR:		178271 (based on)
  Submitted by:	eadler
  Sponsored by:	Absolight

Modified:
  head/Mk/bsd.gnome.mk
  head/Mk/bsd.port.subdir.mk

Modified: head/Mk/bsd.gnome.mk
==============================================================================
--- head/Mk/bsd.gnome.mk	Sat Jun 13 02:43:20 2015	(r389311)
+++ head/Mk/bsd.gnome.mk	Sat Jun 13 02:46:52 2015	(r389312)
@@ -497,9 +497,7 @@ gvfs_RUN_DEPENDS=	gvfs>=0:${PORTSDIR}/de
 gvfs_USE_GNOME_IMPL=	glib20
 
 .if defined(MARCUSCOM_CVS)
-. if exists(${PORTSDIR}/Mk/bsd.gnome-experimental.mk)
-.include "${PORTSDIR}/Mk/bsd.gnome-experimental.mk"
-. endif
+.sinclude "${PORTSDIR}/Mk/bsd.gnome-experimental.mk"
 .endif
 
 .if defined(INSTALLS_ICONS)

Modified: head/Mk/bsd.port.subdir.mk
==============================================================================
--- head/Mk/bsd.port.subdir.mk	Sat Jun 13 02:43:20 2015	(r389311)
+++ head/Mk/bsd.port.subdir.mk	Sat Jun 13 02:46:52 2015	(r389312)
@@ -127,9 +127,7 @@ INDEXDIR?=	${PORTSDIR}
 INDEXFILE?=	INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}
 
 # local customization of the ports tree
-.if exists(${.CURDIR}/Makefile.local)
-.include "${.CURDIR}/Makefile.local"
-.endif
+.sinclude "${.CURDIR}/Makefile.local"
 
 TARGETS+=	all
 TARGETS+=	build