From 62c4f995853d63741e3a47b361fd19dcd9bd9322 Mon Sep 17 00:00:00 2001
From: mat <mat@FreeBSD.org>
Date: Fri, 21 Oct 2016 13:13:27 +0000
Subject: Some more clever usage of printf \r.

The games/prboom-plus bits were not used anywhere.

Sponsored by:	Absolight
---
 games/apoolGL/Makefile             |  3 ++-
 games/pouetchess/Makefile          |  7 ++-----
 games/prboom-plus/Makefile.include | 12 ------------
 3 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'games')

diff --git a/games/apoolGL/Makefile b/games/apoolGL/Makefile
index 6cb95f712d67..b073f7623f08 100644
--- a/games/apoolGL/Makefile
+++ b/games/apoolGL/Makefile
@@ -15,13 +15,14 @@ LICENSE=	GPLv2+
 
 USE_SDL=	sdl
 USE_GL=		gl
+USES=		dos2unix
+DOS2UNIX_FILES=	ApoolGL.txt
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	ApoolGL.txt CHANGELOG OpenGL-Features
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|`${PRINTF} '\r'`$$||" ${WRKSRC}/ApoolGL.txt
 	@${REINPLACE_CMD} -e 's|SDL/||' ${WRKSRC}/*.c
 
 do-build:
diff --git a/games/pouetchess/Makefile b/games/pouetchess/Makefile
index 0ac9f3830652..268148c07e8a 100644
--- a/games/pouetchess/Makefile
+++ b/games/pouetchess/Makefile
@@ -12,7 +12,8 @@ COMMENT=	Open-source 3D chess game
 
 USE_SDL=	sdl image
 USE_GL=		gl
-USES=		gmake
+USES=		dos2unix gmake
+DOS2UNIX_GLOB=	*.cpp *.h Makefile config.ini
 
 WRKSRC=		${WRKDIR}/pouetChess_0.11
 
@@ -26,10 +27,6 @@ DESKTOP_ENTRIES="pouetChess" \
 		false
 
 post-patch:
-	@${FIND} ${WRKSRC} \( -name "*.cpp" -o -name "*.h" -o -name Makefile \
-		-o -name config.ini \) -exec ${REINPLACE_CMD} -e \
-		"s|$$(${PRINTF} '\r')$$||" {} \;
-
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e '/^LIBS/ s|$$| -L${LOCALBASE}/lib|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e '/CXX	/ d' ${WRKSRC}/Makefile
diff --git a/games/prboom-plus/Makefile.include b/games/prboom-plus/Makefile.include
index 79e888cfc9a4..af2935d30d7a 100644
--- a/games/prboom-plus/Makefile.include
+++ b/games/prboom-plus/Makefile.include
@@ -10,15 +10,3 @@ DMDIR?=		${LOCALBASE}/share/doom
 MAKE_ENV+=	DMDIR="${DMDIR}"
 PLIST_SUB+=	DMDIR="${DMDIR:S/${LOCALBASE}\///}"
 SUB_LIST+=	DMDIR="${DMDIR}"
-
-.if defined(USE_CRLF)
-.   if defined(USE_ZIP)
-EXTRACT_BEFORE_ARGS=	-aqo
-.   else
-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
-- 
cgit