Date: Wed, 1 Feb 2006 13:33:07 -0300 From: "Alejandro Pulver" <alejandro@varnet.biz> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/92689: [UPDATE] Replace USE_CRLF with USE_DOS2UNIX Message-ID: <1138811587.0@phobos.mars.bsd> Resent-Message-ID: <200602011640.k11Ge3Dc096476@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92689
>Category: ports
>Synopsis: [UPDATE] Replace USE_CRLF with USE_DOS2UNIX
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 01 16:40:02 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Alejandro Pulver
>Release: FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
System: FreeBSD 5.4-RELEASE #0: Sat May 21 12:14:47 ART 2005
root@ale.varnet.bsd:/usr/src/sys/i386/compile/ATHLON-ALE
>Description:
Replace USE_CRLF from my ports (and ports thay use my *-data ones) by the new USE_DOS2UNIX.
I prefer ports/92688 to be committed before this one.
>How-To-Repeat:
>Fix:
--- patch-crlf.diff begins here ---
diff -urN /usr/ports/games/doom-data/Makefile.include doom-data/Makefile.include
--- /usr/ports/games/doom-data/Makefile.include Fri Dec 9 08:19:50 2005
+++ doom-data/Makefile.include Tue Jan 31 16:13:48 2006
@@ -16,18 +16,3 @@
.if ${PORTNAME} != "data"
RUN_DEPENDS+= ${DMDIR}:${PORTSDIR}/games/doom-data
.endif
-
-# DOS to Unix text conversion.
-
-.if defined(USE_CRLF)
-. if defined(USE_ZIP)
-EXTRACT_BEFORE_ARGS= -aqo
-. else
-USE_REINPLACE= yes
-pre-patch:
- @${FIND} ${WRKDIR} -type f -print0 | \
- ${XARGS} -0 ${FILE} | ${GREP} 'CRLF' | \
- ${SED} -e "s/:.*//" | ${SED} -e 's/ /\\ /g' | \
- ${XARGS} ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//"
-. endif
-.endif
diff -urN /usr/ports/games/doom-hr/Makefile doom-hr/Makefile
--- /usr/ports/games/doom-hr/Makefile Fri Dec 9 08:19:51 2005
+++ doom-hr/Makefile Tue Jan 31 16:12:06 2006
@@ -21,7 +21,7 @@
COMMENT= Hell Revealed is a megawad, a 32-level replacement for DooM II
USE_ZIP= yes
-USE_CRLF= yes
+USE_DOS2UNIX= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff -urN /usr/ports/games/doom-hr2/Makefile doom-hr2/Makefile
--- /usr/ports/games/doom-hr2/Makefile Fri Dec 9 08:19:51 2005
+++ doom-hr2/Makefile Tue Jan 31 16:12:12 2006
@@ -16,7 +16,7 @@
COMMENT= Hell Revealed II is a megawad, a 32-level replacement for DooM II
USE_ZIP= yes
-USE_CRLF= yes
+USE_DOS2UNIX= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff -urN /usr/ports/games/galaxyhack/Makefile galaxyhack/Makefile
--- /usr/ports/games/galaxyhack/Makefile Fri Nov 11 08:19:41 2005
+++ galaxyhack/Makefile Wed Feb 1 11:59:37 2006
@@ -22,6 +22,7 @@
WRKSRC= ${WRKDIR}/src
USE_BZIP2= yes
+USE_DOS2UNIX= yes
USE_GMAKE= yes
USE_SDL= gfx image mixer sdl
USE_REINPLACE= yes
@@ -38,10 +39,6 @@
# Remove CVS directories
@${FIND} ${WRKDIR}/${PORTNAME} -type d -name CVS -print0 | \
${XARGS} -0 ${RM} -rf
-
-# Convert DOS text files to UNIX
- @${FIND} -E ${WRKSRC} -type f -iregex "(.*Makefile.*|.*\.(cpp|h))" -print0 | \
- ${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//'
do-install:
# Script
diff -urN /usr/ports/games/quake3/Makefile quake3/Makefile
--- /usr/ports/games/quake3/Makefile Thu Jan 19 20:34:06 2006
+++ quake3/Makefile Tue Jan 31 16:12:23 2006
@@ -23,7 +23,7 @@
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
USE_ZIP= yes
-USE_CRLF= yes
+USE_DOS2UNIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_PERL5_BUILD=yes
diff -urN /usr/ports/games/quake3-data/Makefile.include quake3-data/Makefile.include
--- /usr/ports/games/quake3-data/Makefile.include Tue Dec 20 08:59:17 2005
+++ quake3-data/Makefile.include Tue Jan 31 16:13:42 2006
@@ -16,18 +16,3 @@
.if ${PORTNAME} != "data"
RUN_DEPENDS+= ${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data
.endif
-
-# DOS to Unix text conversion.
-
-.if defined(USE_CRLF)
-. if defined(USE_ZIP)
-EXTRACT_BEFORE_ARGS= -aqo
-. else
-USE_REINPLACE= yes
-pre-patch:
- @${FIND} ${WRKDIR} -type f -print0 | \
- ${XARGS} -0 ${FILE} | ${GREP} 'CRLF' | \
- ${SED} -e "s/:.*//" | ${SED} -e 's/ /\\ /g' | \
- ${XARGS} ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//"
-. endif
-.endif
diff -urN /usr/ports/games/quake3-excessive/Makefile quake3-excessive/Makefile
--- /usr/ports/games/quake3-excessive/Makefile Tue Dec 20 08:59:17 2005
+++ quake3-excessive/Makefile Tue Jan 31 16:12:37 2006
@@ -19,7 +19,7 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_ZIP= yes
-USE_CRLF= yes
+USE_DOS2UNIX= yes
NO_BUILD= yes
DATADIR= ${Q3DIR}/${PORTNAME}
diff -urN /usr/ports/games/quake3-freezetag/Makefile quake3-freezetag/Makefile
--- /usr/ports/games/quake3-freezetag/Makefile Tue Dec 20 08:59:17 2005
+++ quake3-freezetag/Makefile Tue Jan 31 16:12:40 2006
@@ -19,7 +19,7 @@
WRKSRC= ${WRKDIR}/freeze
USE_ZIP= yes
-USE_CRLF= yes
+USE_DOS2UNIX= yes
NO_BUILD= yes
DATADIR= ${Q3DIR}/${PORTNAME}
diff -urN /usr/ports/games/quake3-osp/Makefile quake3-osp/Makefile
--- /usr/ports/games/quake3-osp/Makefile Tue Dec 20 08:59:17 2005
+++ quake3-osp/Makefile Tue Jan 31 16:12:46 2006
@@ -19,7 +19,7 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_ZIP= yes
-USE_CRLF= yes
+USE_DOS2UNIX= yes
NO_BUILD= yes
DATADIR= ${Q3DIR}/${PORTNAME}
diff -urN /usr/ports/games/quake3-ra3/Makefile quake3-ra3/Makefile
--- /usr/ports/games/quake3-ra3/Makefile Tue Dec 20 08:59:18 2005
+++ quake3-ra3/Makefile Tue Jan 31 16:13:00 2006
@@ -21,7 +21,7 @@
WRKSRC= ${WRKDIR}/arena
USE_ZIP= yes
-USE_CRLF= yes
+USE_DOS2UNIX= yes
NO_BUILD= yes
DATADIR= ${Q3DIR}/${PORTNAME}
diff -urN /usr/ports/games/quake3-ut/Makefile quake3-ut/Makefile
--- /usr/ports/games/quake3-ut/Makefile Tue Dec 20 08:59:18 2005
+++ quake3-ut/Makefile Tue Jan 31 16:13:06 2006
@@ -16,7 +16,7 @@
COMMENT= Quake III Arena Mod: Urban Terror
USE_ZIP= yes
-USE_CRLF= yes
+USE_DOS2UNIX= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
NO_PACKAGE= "Distfile is \>256MB\; define FORCE_PACKAGE if you really want this."
diff -urN /usr/ports/games/quake3-wfa/Makefile quake3-wfa/Makefile
--- /usr/ports/games/quake3-wfa/Makefile Tue Dec 20 08:59:18 2005
+++ quake3-wfa/Makefile Tue Jan 31 16:13:11 2006
@@ -20,7 +20,7 @@
NO_PACKAGE= "Package will be 138MB, set FORCE_PACKAGE if you really want to build it"
USE_ZIP= yes
-USE_CRLF= yes
+USE_DOS2UNIX= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
--- patch-crlf.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1138811587.0>