[pkgsrc/trunk]: pkgsrc Use find -print | xargs rather than find -exec.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Use find -print | xargs rather than find -exec.
From: tv <tv%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:13:27 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ecbdd819090c
branches:  trunk
changeset: 521384:ecbdd819090c
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Nov 10 17:34:09 2006 +0000

description:
Use find -print | xargs rather than find -exec.

diffstat:

 lang/tcl-tclX/Makefile            |   6 +++---
 lang/tk-tclX/Makefile             |   6 +++---
 mail/ja-squirrelmail/Makefile     |   8 ++++----
 mail/squirrelmail/Makefile        |   8 ++++----
 math/octave-current/Makefile      |   4 ++--
 math/octave/Makefile              |   4 ++--
 math/scilab/Makefile              |   6 +++---
 meta-pkgs/boost/Makefile.common   |   4 ++--
 multimedia/mplayer-share/Makefile |  10 +++++-----
 net/netdisco/Makefile             |   4 ++--
 10 files changed, 30 insertions(+), 30 deletions(-)

diffs (213 lines):

diff -r d8dfaeed8e19 -r ecbdd819090c lang/tcl-tclX/Makefile
--- a/lang/tcl-tclX/Makefile    Fri Nov 10 17:32:24 2006 +0000
+++ b/lang/tcl-tclX/Makefile    Fri Nov 10 17:34:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/04/06 06:22:15 reed Exp $
+# $NetBSD: Makefile,v 1.35 2006/11/10 17:34:09 tv Exp $
 #
 
 DISTNAME=      tclx8.3.5-src
@@ -55,8 +55,8 @@
        cd ${WRKSRC}/../tcl/unix && ${MAKE_ENV} ${MAKE} buildhelp
 
 post-install:
-       ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type d -exec ${CHMOD} ${PKGDIRMODE} '{}' \;
-       ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type f -exec ${CHMOD} ${DOCMODE} '{}' \;
+       ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+       ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type f -print | ${XARGS} ${CHMOD} ${DOCMODE}
        @${RM} ${PREFIX}/man/man3/TkX_Main.3
        @${RM} ${PREFIX}/man/man3/Tkx_Init.3
 # the above links are installed based on the contents of the man page.
diff -r d8dfaeed8e19 -r ecbdd819090c lang/tk-tclX/Makefile
--- a/lang/tk-tclX/Makefile     Fri Nov 10 17:32:24 2006 +0000
+++ b/lang/tk-tclX/Makefile     Fri Nov 10 17:34:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/02/26 21:14:57 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2006/11/10 17:34:47 tv Exp $
 #
 
 DISTNAME=      tclx8.3.5-src
@@ -80,8 +80,8 @@
        cd ${WRKSRC}/../tk/unix && ${MAKE_ENV} ${MAKE} buildhelp
 
 post-install:
-       ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type d -exec ${CHMOD} ${PKGDIRMODE} '{}' \;
-       ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type f -exec ${CHMOD} ${DOCMODE} '{}' \;
+       ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+       ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type f -print | ${XARGS} ${CHMOD} ${DOCMODE}
 
 #      @${RM} ${PREFIX}/man/man3/TkX_Main.3
 #      @${RM} ${PREFIX}/man/man3/Tkx_Init.3
diff -r d8dfaeed8e19 -r ecbdd819090c mail/ja-squirrelmail/Makefile
--- a/mail/ja-squirrelmail/Makefile     Fri Nov 10 17:32:24 2006 +0000
+++ b/mail/ja-squirrelmail/Makefile     Fri Nov 10 17:34:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/08/27 10:40:39 martti Exp $
+# $NetBSD: Makefile,v 1.34 2006/11/10 17:37:13 tv Exp $
 
 DISTNAME=      squirrelmail-1.4.8
 PKGNAME=       ja-${DISTNAME}
@@ -69,7 +69,7 @@
                ${WRKDIR:Q}/squirrelmail.conf.dist
 
 pre-configure:
-       ${FIND} ${WRKSRC:Q} \( -name "*.orig*" -o -name ".cvsignore" \) -exec ${RM} -f {} \;
+       ${FIND} ${WRKSRC:Q} \( -name "*.orig*" -o -name ".cvsignore" \) -print | ${XARGS} ${RM} -f
 
 do-install:
        ${INSTALL_DATA_DIR} ${EGDIR:Q}
@@ -77,8 +77,8 @@
        ${INSTALL_DATA} ${WRKDIR:Q}/squirrelmail.conf.dist ${EGDIR:Q}/squirrelmail.conf
        ${CP} -R ${WRKSRC:Q}/* ${SMDIR:Q}
        ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
-       ${FIND} ${SMDIR} -type d -print -exec ${CHMOD} ${PKGDIRMODE} {} \;
-       ${FIND} ${SMDIR} -type f -print -exec ${CHMOD} ${SHAREMODE} {} \;
+       ${FIND} ${SMDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+       ${FIND} ${SMDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
        ${CHMOD} a+x ${SMDIR:Q}/config/conf.pl
        ${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/
        ${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/
diff -r d8dfaeed8e19 -r ecbdd819090c mail/squirrelmail/Makefile
--- a/mail/squirrelmail/Makefile        Fri Nov 10 17:32:24 2006 +0000
+++ b/mail/squirrelmail/Makefile        Fri Nov 10 17:34:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2006/08/27 10:41:37 martti Exp $
+# $NetBSD: Makefile,v 1.77 2006/11/10 17:38:47 tv Exp $
 
 DISTNAME=      squirrelmail-1.4.8
 #PKGREVISION=  1
@@ -64,7 +64,7 @@
                ${WRKDIR:Q}/squirrelmail.conf.dist
 
 pre-configure:
-       ${FIND} ${WRKSRC:Q} \( -name "*.orig*" -o -name ".cvsignore" \) -exec ${RM} -f {} \;
+       ${FIND} ${WRKSRC:Q} \( -name "*.orig*" -o -name ".cvsignore" \) -print | ${XARGS} ${RM} -f
 
 do-install:
        ${INSTALL_DATA_DIR} ${EGDIR:Q}
@@ -72,8 +72,8 @@
        ${INSTALL_DATA} ${WRKDIR:Q}/squirrelmail.conf.dist ${EGDIR:Q}/squirrelmail.conf
        ${CP} -R ${WRKSRC:Q}/* ${SMDIR:Q}
        ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
-       ${FIND} ${SMDIR} -type d -print -exec ${CHMOD} ${PKGDIRMODE} {} \;
-       ${FIND} ${SMDIR} -type f -print -exec ${CHMOD} ${SHAREMODE} {} \;
+       ${FIND} ${SMDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+       ${FIND} ${SMDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
        ${CHMOD} a+x ${SMDIR:Q}/config/conf.pl
        ${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/
        ${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/
diff -r d8dfaeed8e19 -r ecbdd819090c math/octave-current/Makefile
--- a/math/octave-current/Makefile      Fri Nov 10 17:32:24 2006 +0000
+++ b/math/octave-current/Makefile      Fri Nov 10 17:34:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/10/04 21:47:57 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2006/11/10 17:40:11 tv Exp $
 
 DISTNAME=      octave-${OCTAVE_VER}
 PKGNAME=       octave-current-${OCTAVE_VER}
@@ -55,7 +55,7 @@
 UNWRAP_FILES+= mkoctfile octave-bug src/oct-conf.h
 
 post-extract:
-       ${FIND} ${WRKSRC}/doc -type f -name '*.info*' -exec ${RM} -f {} \;
+       ${FIND} ${WRKSRC}/doc -type f -name '*.info*' -print | ${XARGS} ${RM} -f
        ${MKDIR} ${WRKSRC}/src/pic
 
 # substitute in the real path to various bits of the toolchain because
diff -r d8dfaeed8e19 -r ecbdd819090c math/octave/Makefile
--- a/math/octave/Makefile      Fri Nov 10 17:32:24 2006 +0000
+++ b/math/octave/Makefile      Fri Nov 10 17:34:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2006/10/04 21:47:57 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2006/11/10 17:40:11 tv Exp $
 
 DISTNAME=      octave-${OCTAVE_VER}
 CATEGORIES=    math
@@ -51,7 +51,7 @@
 UNWRAP_FILES+= mkoctfile octave-bug src/oct-conf.h
 
 post-extract:
-       ${FIND} ${WRKSRC}/doc -type f -name '*.info*' -exec ${RM} -f {} \;
+       ${FIND} ${WRKSRC}/doc -type f -name '*.info*' -print | ${XARGS} ${RM} -f
        ${MKDIR} ${WRKSRC}/src/pic
 
 # substitute in the real path to various bits of the toolchain because
diff -r d8dfaeed8e19 -r ecbdd819090c math/scilab/Makefile
--- a/math/scilab/Makefile      Fri Nov 10 17:32:24 2006 +0000
+++ b/math/scilab/Makefile      Fri Nov 10 17:34:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2006/05/12 12:39:32 joerg Exp $
+# $NetBSD: Makefile,v 1.71 2006/11/10 17:40:12 tv Exp $
 #
 
 DISTNAME=      ${SCIBASE}-src
@@ -88,8 +88,8 @@
 pre-install:
        cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} distclean
        cd ${WRKSRC}/examples && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} distclean
-       ${FIND} ${WRKSRC}/tests -name \*.blsav -exec ${RM} {} \;
-       ${FIND} ${WRKSRC}/examples -name \*.blsav -exec ${RM} {} \;
+       ${FIND} ${WRKSRC}/tests -name \*.blsav -print | ${XARGS} ${RM} -f
+       ${FIND} ${WRKSRC}/examples -name \*.blsav -print | ${XARGS} ${RM} -f
        ${MV} ${WRKSRC}/maple/maple2scilab.mpl ${WRKSRC}/maple/maple2scilab.mpl.bak
        ${SED} 's;${WRKSRC};${PREFIX}/lib/${SCIBASE};g' ${WRKSRC}/maple/maple2scilab.mpl.bak > \
                ${WRKSRC}/maple/maple2scilab.mpl
diff -r d8dfaeed8e19 -r ecbdd819090c meta-pkgs/boost/Makefile.common
--- a/meta-pkgs/boost/Makefile.common   Fri Nov 10 17:32:24 2006 +0000
+++ b/meta-pkgs/boost/Makefile.common   Fri Nov 10 17:34:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2006/06/25 17:06:08 rillig Exp $
+# $NetBSD: Makefile.common,v 1.9 2006/11/10 17:41:13 tv Exp $
 #
 
 BOOST_PACKAGE?=                undefined
@@ -37,7 +37,7 @@
 # future timestamp than the sources.  If this happens, print-PLIST does
 # not work.
 pre-configure:
-       @cd ${WRKSRC} && ${FIND} . -type f -exec ${TOUCH} {} \;
+       @cd ${WRKSRC} && ${FIND} . -type f -print | ${XARGS} ${TOUCH}
 
 # Generate a new user.hpp or use the installed one, depending on the
 # package we are building.
diff -r d8dfaeed8e19 -r ecbdd819090c multimedia/mplayer-share/Makefile
--- a/multimedia/mplayer-share/Makefile Fri Nov 10 17:32:24 2006 +0000
+++ b/multimedia/mplayer-share/Makefile Fri Nov 10 17:34:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/11/06 14:06:17 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/11/10 17:42:15 tv Exp $
 
 .include "Makefile.common"
 
@@ -18,9 +18,9 @@
        ${INSTALL_DATA} ${WRKSRC}/etc/input.conf ${DESTDIR}${PREFIX}/share/mplayer
        (cd ${WRKSRC}/DOCS && \
                ${PAX} -rwpppm * ${DESTDIR}${PREFIX}/share/mplayer/DOCS); \
-       ${FIND} ${DESTDIR}${PREFIX}/share/mplayer/DOCS -type d -exec ${CHMOD} \
-               ${PKGDIRMODE} \{\} \;
-       ${FIND} ${DESTDIR}${PREFIX}/share/mplayer/DOCS -type f -exec ${CHMOD} \
-               ${SHAREMODE} \{\} \;
+       ${FIND} ${DESTDIR}${PREFIX}/share/mplayer/DOCS -type d -print | \
+               ${XARGS} ${CHMOD} ${PKGDIRMODE}
+       ${FIND} ${DESTDIR}${PREFIX}/share/mplayer/DOCS -type f -print | \
+               ${XARGS} ${CHMOD} ${SHAREMODE}
 
 .include "../../mk/bsd.pkg.mk"
diff -r d8dfaeed8e19 -r ecbdd819090c net/netdisco/Makefile
--- a/net/netdisco/Makefile     Fri Nov 10 17:32:24 2006 +0000
+++ b/net/netdisco/Makefile     Fri Nov 10 17:34:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/06/30 09:54:42 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/11/10 17:42:48 tv Exp $
 #
 
 DISTNAME=              netdisco-0.94_with_mibs
@@ -123,7 +123,7 @@
                ${MV} ${WRKSRC:Q}/"$$i" ${WRKSRC:Q}/doc/; \
        done
        cd ${WRKSRC:Q} && \
-       ${FIND} . \( -name '*.orig' -o -name '*.bak' \) -exec ${RM} -f {} \;
+       ${FIND} . \( -name '*.orig' -o -name '*.bak' \) -print | ${XARGS} ${RM} -f
 
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC:Q}/bin/netdisco_daemon \
Prev by Date: [pkgsrc/trunk]: pkgsrc/x11/xpmicons For some reason, Interix "find ... -exec"...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Update lyx-qt.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/x11/xpmicons For some reason, Interix "find ... -exec"...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Update lyx-qt.
Indexes:
Home | Main Index | Thread Index | Old Index