Date: Tue, 31 Jan 2006 08:25:15 +0100 (CET) From: Jean-Yves Lefort <jylefort@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92584: USE_DOS2UNIX is too hungry Message-ID: <20060131072515.99496C14A@jsite.lefort.net> Resent-Message-ID: <200601310730.k0V7U3lE032246@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92584
>Category: ports
>Synopsis: USE_DOS2UNIX is too hungry
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 31 07:30:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Jean-Yves Lefort
>Release: FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Wed Jan 25 19:57:13 CET 2006 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
>Description:
- The regexp is too hungry
- Remove the useless -E find argument
>How-To-Repeat:
>Fix:
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.524
diff -u -r1.524 bsd.port.mk
--- bsd.port.mk 28 Jan 2006 02:11:05 -0000 1.524
+++ bsd.port.mk 31 Jan 2006 07:23:05 -0000
@@ -3231,12 +3231,12 @@
.if defined(USE_DOS2UNIX)
.if ${USE_DOS2UNIX:U}=="YES"
@${ECHO_MSG} "===> Converting DOS text files to UNIX text files"
- @${FIND} -E ${WRKSRC} -type f -print0 | \
- ${XARGS} -0 ${REINPLACE_CMD} -i"" -e 's/[[:cntrl:]]*$$//'
+ @${FIND} ${WRKSRC} -type f -print0 | \
+ ${XARGS} -0 ${REINPLACE_CMD} -i"" -e 's/
$$//'
.else
.for f in ${USE_DOS2UNIX}
@${ECHO_MSG} "===> Converting DOS text file to UNIX text file: ${f}"
- @${REINPLACE_CMD} -i"" -e 's/[[:cntrl:]]*$$//' ${WRKSRC}/${f}
+ @${REINPLACE_CMD} -i"" -e 's/
$$//' ${WRKSRC}/${f}
.endfor
.endif
.else
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060131072515.99496C14A>