[Midnightbsd-cvs] mports [24024] trunk/Mk/extensions/dos2unix.mk: -m

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Aug 29 11:14:46 EDT 2018


Revision: 24024
          http://svnweb.midnightbsd.org/mports/?rev=24024
Author:   laffer1
Date:     2018-08-29 11:14:45 -0400 (Wed, 29 Aug 2018)
Log Message:
-----------
-m

Modified Paths:
--------------
    trunk/Mk/extensions/dos2unix.mk

Modified: trunk/Mk/extensions/dos2unix.mk
===================================================================
--- trunk/Mk/extensions/dos2unix.mk	2018-08-29 15:14:29 UTC (rev 24023)
+++ trunk/Mk/extensions/dos2unix.mk	2018-08-29 15:14:45 UTC (rev 24024)
@@ -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}
 #
 
 .if !defined(_INCLUDE_USES_DOS2UNIX_MK)
@@ -14,24 +15,27 @@
 _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



More information about the Midnightbsd-cvs mailing list