svn commit: r424413 - in head/games: apoolGL pouetchess prboom-plus
Mathieu Arnold
mat at FreeBSD.org
Fri Oct 21 13:13:28 UTC 2016
Author: mat
Date: Fri Oct 21 13:13:27 2016
New Revision: 424413
URL: https://svnweb.freebsd.org/changeset/ports/424413
Log:
Some more clever usage of printf \r.
The games/prboom-plus bits were not used anywhere.
Sponsored by: Absolight
Modified:
head/games/apoolGL/Makefile (contents, props changed)
head/games/pouetchess/Makefile (contents, props changed)
head/games/prboom-plus/Makefile.include (contents, props changed)
Modified: head/games/apoolGL/Makefile
==============================================================================
--- head/games/apoolGL/Makefile Fri Oct 21 13:09:22 2016 (r424412)
+++ head/games/apoolGL/Makefile Fri Oct 21 13:13:27 2016 (r424413)
@@ -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:
Modified: head/games/pouetchess/Makefile
==============================================================================
--- head/games/pouetchess/Makefile Fri Oct 21 13:09:22 2016 (r424412)
+++ head/games/pouetchess/Makefile Fri Oct 21 13:13:27 2016 (r424413)
@@ -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
Modified: head/games/prboom-plus/Makefile.include
==============================================================================
--- head/games/prboom-plus/Makefile.include Fri Oct 21 13:09:22 2016 (r424412)
+++ head/games/prboom-plus/Makefile.include Fri Oct 21 13:13:27 2016 (r424413)
@@ -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
More information about the svn-ports-all
mailing list