svn commit: r374466 - head/Mk

[Mathieu Arnold]

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 \