svn commit: r410819 - head/Mk/Uses
Jan Beich
jbeich at FreeBSD.org
Fri Mar 11 10:39:06 UTC 2016
Author: jbeich
Date: Fri Mar 11 10:39:04 2016
New Revision: 410819
URL: https://svnweb.freebsd.org/changeset/ports/410819
Log:
Allow overriding WRKSRC for USES=dos2unix
Approved by: portmgr (mat)
Differential Revision: https://reviews.freebsd.org/D5607
Modified:
head/Mk/Uses/dos2unix.mk
Modified: head/Mk/Uses/dos2unix.mk
==============================================================================
--- head/Mk/Uses/dos2unix.mk Fri Mar 11 10:34:27 2016 (r410818)
+++ head/Mk/Uses/dos2unix.mk Fri Mar 11 10:39:04 2016 (r410819)
@@ -5,6 +5,7 @@
# DOS2UNIX_REGEX a regular expression to match files that needs to be converted
# DOS2UNIX_FILES list of files of glob pattern relative to ${WRKSRC}
# DOS2UNIX_GLOB list of glob pattern find(1) will match with
+# DOS2UNIX_WRKSRC top-level path for directory traversal instead of ${WRKSRC}
#
# MAINTAINER: portmgr at FreeBSD.org
@@ -15,22 +16,24 @@ _INCLUDE_USES_DOS2UNIX_MK= yes
_DOS2UNIX_ALL= yes
.endif
+DOS2UNIX_WRKSRC?= ${WRKSRC}
+
_USES_patch+= 200:dos2unix
dos2unix:
@${ECHO_MSG} "===> Converting DOS text files to UNIX text files"
.if defined(_DOS2UNIX_ALL)
- @${FIND} ${WRKSRC} -type f -print0 | \
+ @${FIND} ${DOS2UNIX_WRKSRC} -type f -print0 | \
${XARGS} -0 ${SED} -i '' -e 's/
$$//'
.else
.if defined(DOS2UNIX_FILES)
- @(cd ${WRKSRC}; \
+ @(cd ${DOS2UNIX_WRKSRC}; \
${ECHO_CMD} ${DOS2UNIX_FILES} | ${XARGS} ${SED} -i '' -e 's/
$$//' )
.elif defined(DOS2UNIX_REGEX)
- @${FIND} -E ${WRKSRC} -type f -iregex '${DOS2UNIX_REGEX}' -print0 | \
+ @${FIND} -E ${DOS2UNIX_WRKSRC} -type f -iregex '${DOS2UNIX_REGEX}' -print0 | \
${XARGS} -0 ${SED} -i '' -e 's/
$$//'
.else
.for f in ${DOS2UNIX_GLOB}
- @${FIND} ${WRKSRC} -type f -name '${f}' -print0 | \
+ @${FIND} ${DOS2UNIX_WRKSRC} -type f -name '${f}' -print0 | \
${XARGS} -0 ${SED} -i '' -e 's/
$$//'
.endfor
.endif
More information about the svn-ports-head
mailing list