- Use USE_DOS2UNIX instead of homemade equivalent

Approved by:    eadler (mentor)

audio/portaudio/Makefile

@@ -20,6 +20,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
+USE_DOS2UNIX=	yes
+
 PLIST_SUB+=	SHLIB_VERSION=${SHLIB_VERSION}
 SHLIB_VERSION=	0
 
@@ -33,12 +35,6 @@ PLIST_SUB+=	WITH_PATESTS="@comment "
 PLIST_SUB+=	WITH_PATESTS=""
 .endif
 
-pre-patch:
-# replace \r\n with \n
-	@${FIND} ${WRKSRC} -type f \
-		| ${XARGS} -x -n 10 \
-			${REINPLACE_CMD} -E \
-				-e 's|
||'
 post-patch:
 # replace obsolete headers, and fix up thread library
 	@${FIND} ${WRKSRC} -type f \

devel/initutil/Makefile

@@ -19,10 +19,9 @@ USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	include/InitUtil.h
+USE_DOS2UNIX=	InitUtil.h
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,
,," ${WRKSRC}/InitUtil.h
+PLIST_FILES=	include/InitUtil.h
 
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/InitUtil.h ${PREFIX}/include

games/exhaust-ma/Makefile

@@ -19,10 +19,9 @@ USE_GMAKE=	yes
 
 NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	bin/${PORTNAME}
+USE_DOS2UNIX=	yes
 
-post-patch:
-	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|
||'
+PLIST_FILES=	bin/${PORTNAME}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/exhaust ${PREFIX}/bin/${PORTNAME}

games/exhaust-ma/files/patch-Makefile

@@ -1,11 +1,11 @@
 --- Makefile.orig	Sun Jul 13 16:07:34 2003
 +++ Makefile	Mon Oct 10 22:52:31 2005
 @@ -1,8 +1,5 @@
- # $Id: Makefile,v 1.7 2003/07/13 10:23:18 martinus Exp $
- 
--CC = cc
--CFLAGS = ${OPT} ${DBG}
--OPT = -O -fomit-frame-pointer
- #DBG = -g -DDEBUG=2
- 
- # Recommended extra options for gcc:
+ # $Id: Makefile,v 1.7 2003/07/13 10:23:18 martinus Exp $
+ 
+-CC = cc
+-CFLAGS = ${OPT} ${DBG}
+-OPT = -O -fomit-frame-pointer
+ #DBG = -g -DDEBUG=2
+ 
+ # Recommended extra options for gcc:

german/selfhtml/Makefile

@@ -30,6 +30,9 @@ WRKSRC=		${WRKDIR}
 USE_ZIP=	yes
 NO_BUILD=	yes
 
+USE_DOS2UNIX=	yes
+DOS2UNIX_REGEX=	.*\.(css|dhtml|diverses|editorial|grafik|helferlein|htm|inter|intro|javascript|layouts|navigation|perl|php|projekt|quellen|servercgi|src|xml|xls|dtd)$$
+
 PORTDOCS=	\
 		index.htm \
 		css \
@@ -52,20 +55,6 @@ PORTDOCS=	\
 		src \
 		xml
 
-post-patch:
-# \r\n -> \n on text files
-	@${FIND} -E ${WRKSRC} \
-		-iregex \
-		".*\.(css|dhtml|diverses|editorial|grafik|helferlein|htm|inter|intro|javascript|layouts|navigation|perl|php|projekt|quellen|servercgi|src|xml|xls|dtd)$$" \
-		-type f -print0 \
-		| ${XARGS} -0 -n 5 -x \
-			${REINPLACE_CMD} -E \
-			-e 's|
||'
-# remove extraneous backup files
-	@${FIND} ${WRKSRC} -type f -name "*.bak" -print0 \
-		| ${XARGS} -0 -n 5 -x \
-			${RM} -f
-
 do-install:
 	@${MKDIR} ${DOCSDIR}
 # line taken from textproc/xerces-j maintained by hq@FreeBSD.org

graphics/py-opengl/Makefile

@@ -29,6 +29,8 @@ USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	PyOpenGL
 PYDISTUTILS_PKGVERSION=	${PORTVERSION:S/.b/b/}
 
+USE_DOS2UNIX=	yes
+
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_TKINTER)
@@ -37,7 +39,6 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkint
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e "s|
||"
 	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|<malloc\.h>|<stdlib.h>|g'
 	@${FIND} ${WRKSRC} -name "*.bak" -delete