From owner-svn-ports-all@FreeBSD.ORG  Wed Dec 10 15:10:41 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4F9436B7;
 Wed, 10 Dec 2014 15:10:41 +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 21F48E90;
 Wed, 10 Dec 2014 15:10:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBAFAfQq034595;
 Wed, 10 Dec 2014 15:10:41 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBAFAeLg034594;
 Wed, 10 Dec 2014 15:10:40 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201412101510.sBAFAeLg034594@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: Wed, 10 Dec 2014 15:10:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r374466 - 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-all@freebsd.org
X-Mailman-Version: 2.1.18-1
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: Wed, 10 Dec 2014 15:10:41 -0000

Author: mat
Date: Wed Dec 10 15:10:40 2014
New Revision: 374466
URL: https://svnweb.freebsd.org/changeset/ports/374466
QAT: https://qat.redports.org/buildarchive/r374466/

Log:
  Patches go into PATCHDIR, not FILESDIR.
  
  Pointy hat to:	Everybody that looked at the code review, me included.
  Sponsored by:	Absolight

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Dec 10 15:10:08 2014	(r374465)
+++ head/Mk/bsd.port.mk	Wed Dec 10 15:10:40 2014	(r374466)
@@ -1149,7 +1149,7 @@ STRIPBIN=	${STRIP_CMD}
 .else
 
 # Look for files named "*.orig" under ${PATCH_WRKSRC} and (re-)generate
-# ${FILESDIR}/patch-* files from them.  By popular demand, we currently
+# ${PATCHDIR}/patch-* files from them.  By popular demand, we currently
 # use '_' (underscore) to replace path separators in patch file names.
 #
 # If a file name happens to contain character which is also a separator
@@ -1162,7 +1162,7 @@ STRIPBIN=	${STRIP_CMD}
 .if !target(makepatch)
 PATCH_PATH_SEPARATOR=	_
 makepatch:
-	@${MKDIR} ${FILESDIR}
+	@${MKDIR} ${PATCHDIR}
 	@(cd ${PATCH_WRKSRC}; \
 		for f in `${FIND} -s . -type f -name '*.orig'`; do \
 			ORIG=$${f#./}; \
@@ -1171,14 +1171,14 @@ makepatch:
 			! for _lps in `${ECHO} _ - + | ${SED} -e \
 				's|${PATCH_PATH_SEPARATOR}|__|'`; do \
 					PATCH=`${ECHO} $${NEW} | ${SED} -e "s|/|$${_lps}|g"`; \
-					test -f "${FILESDIR}/patch-$${PATCH}" && break; \
+					test -f "${PATCHDIR}/patch-$${PATCH}" && break; \
 			done || ${ECHO} $${_SEEN} | ${GREP} -q /$${PATCH} && { \
 				PATCH=`${ECHO} $${NEW} | ${SED} -e \
 					's|${PATCH_PATH_SEPARATOR}|&&|g' -e \
 					's|/|${PATCH_PATH_SEPARATOR}|g'`; \
 				_SEEN=$${_SEEN}/$${PATCH}; \
 			}; \
-			OUT=${FILESDIR}/patch-$${PATCH}; \
+			OUT=${PATCHDIR}/patch-$${PATCH}; \
 			${ECHO} ${DIFF} -udp $${ORIG} $${NEW} '>' $${OUT}; \
 			TZ=UTC ${DIFF} -udp $${ORIG} $${NEW} | ${SED} -e \
 				'/^---/s|\.[0-9]* +0000$$| UTC|' -e \