svn commit: r438356 - in head: emulators/i386-wine emulators/i386-wine-devel lang/smalltalk

[Mathieu Arnold]

Author: mat
Date: Wed Apr 12 13:31:05 2017
New Revision: 438356
URL: https://svnweb.freebsd.org/changeset/ports/438356

Log:
  fix ports using xargs directly.
  
  Sponsored by:	Absolight

Modified:
  head/emulators/i386-wine-devel/Makefile.i386   (contents, props changed)
  head/emulators/i386-wine/Makefile.i386   (contents, props changed)
  head/lang/smalltalk/Makefile   (contents, props changed)

Modified: head/emulators/i386-wine-devel/Makefile.i386
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.i386	Wed Apr 12 13:21:39 2017	(r438355)
+++ head/emulators/i386-wine-devel/Makefile.i386	Wed Apr 12 13:31:05 2017	(r438356)
@@ -37,7 +37,7 @@ post-install-script:
 	${REINPLACE_CMD} -e 's!lib/!lib32/!g' ${TMPPLIST}
 	# Install bounce script to access the 32-bit executables
 	${INSTALL_SCRIPT} ${SLAVEDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine
-	for i in `grep ^bin ${TMPPLIST} | xargs -n1 basename` ; do \
+	for i in `grep ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \
 		[ "$${i}" = "wine" ] || ${LN} -f ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/$${i} ; \
 		echo bin32/$${i} >> ${TMPPLIST} ; \
 	done
@@ -52,7 +52,7 @@ post-install-script:
 	done
 	# Find all soft dependencies (via strings(1))
 	grep -v '[@%]' ${TMPPLIST} | sed "s!^!${STAGEDIR}${PREFIX}/!g" | \
-	xargs -n1 file -F' ' | grep ELF | cut -f1 -d' ' | xargs strings | \
+	${XARGS} -n1 file -F' ' | grep ELF | cut -f1 -d' ' | ${XARGS} strings | \
 	grep '^lib.*\.so' | sort -u > ${WRKDIR}/winesoftlibs
 	for i in `cat ${WRKDIR}/winesoftlibs` ; do \
 		if [ -e ${LOCALBASE}/lib/$${i} ] && [ -z "`grep $${i} ${TMPPLIST}`" ]; then \
@@ -62,8 +62,8 @@ post-install-script:
 	done
 	# Find all libraries that are linked too (via ldd(1))
 	grep -v '[@%]' ${TMPPLIST} | sed "s!^!${STAGEDIR}${PREFIX}/!g" | \
-	xargs -n1 file -F' ' | grep ELF | cut -f1 -d' ' | \
-	env LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib32:${LD_LIBRARY_PATH} xargs ldd -f '%p\n' \
+	${XARGS} -n1 file -F' ' | grep ELF | cut -f1 -d' ' | \
+	env LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib32:${LD_LIBRARY_PATH} ${XARGS} ldd -f '%p\n' \
 	| sort -u | grep -v '^\(/usr\)\?/lib' | grep -v "^${STAGEDIR}${PREFIX}/lib32/libwine.so" \
 	| grep -v "^${STAGEDIR}${PREFIX}/lib32/wine" > ${WRKDIR}/winelibs
 	for i in `cat ${WRKDIR}/winelibs` ; do \

Modified: head/emulators/i386-wine/Makefile.i386
==============================================================================
--- head/emulators/i386-wine/Makefile.i386	Wed Apr 12 13:21:39 2017	(r438355)
+++ head/emulators/i386-wine/Makefile.i386	Wed Apr 12 13:31:05 2017	(r438356)
@@ -37,7 +37,7 @@ post-install-script:
 	${REINPLACE_CMD} -e 's!lib/!lib32/!g' ${TMPPLIST}
 	# Install bounce script to access the 32-bit executables
 	${INSTALL_SCRIPT} ${SLAVEDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine
-	for i in `grep ^bin ${TMPPLIST} | xargs -n1 basename` ; do \
+	for i in `grep ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \
 		[ "$${i}" = "wine" ] || ${LN} -f ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/$${i} ; \
 		echo bin32/$${i} >> ${TMPPLIST} ; \
 	done
@@ -52,7 +52,7 @@ post-install-script:
 	done
 	# Find all soft dependencies (via strings(1))
 	grep -v '[@%]' ${TMPPLIST} | sed "s!^!${STAGEDIR}${PREFIX}/!g" | \
-	xargs -n1 file -F' ' | grep ELF | cut -f1 -d' ' | xargs strings | \
+	${XARGS} -n1 file -F' ' | grep ELF | cut -f1 -d' ' | ${XARGS} strings | \
 	grep '^lib.*\.so' | sort -u > ${WRKDIR}/winesoftlibs
 	for i in `cat ${WRKDIR}/winesoftlibs` ; do \
 		if [ -e ${LOCALBASE}/lib/$${i} ] && [ -z "`grep $${i} ${TMPPLIST}`" ]; then \
@@ -62,8 +62,8 @@ post-install-script:
 	done
 	# Find all libraries that are linked too (via ldd(1))
 	grep -v '[@%]' ${TMPPLIST} | sed "s!^!${STAGEDIR}${PREFIX}/!g" | \
-	xargs -n1 file -F' ' | grep ELF | cut -f1 -d' ' | \
-	env LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib32:${LD_LIBRARY_PATH} xargs ldd -f '%p\n' \
+	${XARGS} -n1 file -F' ' | grep ELF | cut -f1 -d' ' | \
+	env LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib32:${LD_LIBRARY_PATH} ${XARGS} ldd -f '%p\n' \
 	| sort -u | grep -v '^\(/usr\)\?/lib' | grep -v "^${STAGEDIR}${PREFIX}/lib32/libwine.so" \
 	| grep -v "^${STAGEDIR}${PREFIX}/lib32/wine" > ${WRKDIR}/winelibs
 	for i in `cat ${WRKDIR}/winelibs` ; do \

Modified: head/lang/smalltalk/Makefile
==============================================================================
--- head/lang/smalltalk/Makefile	Wed Apr 12 13:21:39 2017	(r438355)
+++ head/lang/smalltalk/Makefile	Wed Apr 12 13:31:05 2017	(r438356)
@@ -66,7 +66,7 @@ post-install:
 	@${LN} -sf gst-load.1 ${STAGEDIR}${MANPREFIX}/man/man1/gst-reload.1
 	@${MKDIR} ${STAGEDIR}${DATADIR}/gtk
 	${INSTALL_DATA} ${WRKSRC}/*.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp
-	@${LS} -1 ${STAGEDIR}${PREFIX}/bin/gst* |grep -v config|xargs ${STRIP_CMD}
+	@${LS} -1 ${STAGEDIR}${PREFIX}/bin/gst* |grep -v config|${XARGS} ${STRIP_CMD}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/smalltalk/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgst.so