Use $FIND with "-print". Noted by Georg Schwarz in PR pkg/24248

8 files changed, 21 insertions, 21 deletions

diff --git a/games/craft/Makefile b/games/craft/Makefile
index a268660f238..3b3b0afba4d 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/24 13:30:55 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/27 00:53:12 heinz Exp $
 
 DISTNAME=	craftcc35
 PKGNAME=	craft-3.5
@@ -15,9 +15,9 @@ USE_GNU_TOOLS+=	make
 USE_X11BASE=	yes
 
 post-extract:
-	@${FIND} ${WRKSRC} -type f -name '*~' | ${XARGS} ${RM} -f
+	@${FIND} ${WRKSRC} -type f -name '*~' -print | ${XARGS} ${RM} -f
 	@${LN} -fs ${FILESDIR}/Makefile ${WRKSRC}
-	for FILE in `find ${WRKSRC} -name "*.hc" -type f`; do	\
+	for FILE in `${FIND} ${WRKSRC} -name "*.hc" -type f -print`; do	\
 	  echo >>$$FILE "";					\
 	done
 
diff --git a/games/iso-pernangband/Makefile b/games/iso-pernangband/Makefile
index c88fa59efe6..b45bccb9d95 100644
--- a/games/iso-pernangband/Makefile
+++ b/games/iso-pernangband/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/24 13:30:56 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/27 00:53:11 heinz Exp $
 #
 
 DISTNAME=		iso-pern_src-0_2_6
@@ -42,7 +42,7 @@ do-install:
 		${PREFIX}/share/iso-pernangband
 	${CHOWN} -R bin:games ${PREFIX}/share/iso-pernangband
 	${CHMOD} -R 0664 ${PREFIX}/share/iso-pernangband
-	${FIND} ${PREFIX}/share/iso-pernangband -type d | ${XARGS} ${CHMOD} 0775
+	${FIND} ${PREFIX}/share/iso-pernangband -type d -print | ${XARGS} ${CHMOD} 0775
 	${INSTALL} -c -s -o bin -g games -m 2755 \
 		${WRKSRC}/testing \
 		${PREFIX}/bin/iso-pernangband
diff --git a/games/mirrormagic-sdl/Makefile b/games/mirrormagic-sdl/Makefile
index 3d065a30d35..fa56e543d11 100644
--- a/games/mirrormagic-sdl/Makefile
+++ b/games/mirrormagic-sdl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/24 13:30:56 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/27 00:53:11 heinz Exp $
 #
 
 DISTNAME=		mirrormagic-2.0.2
@@ -37,11 +37,11 @@ do-install:
 	${RM} -f ${WRKDIR}/PLIST
 .for levdir in Classic_Games
 	cd ${PREFIX} && \
-	${FIND} share/mirrormagic/levels/${levdir} -type f >>${WRKDIR}/PLIST
+	${FIND} share/mirrormagic/levels/${levdir} -type f -print >>${WRKDIR}/PLIST
 .endfor
 .for directory in graphics music sounds
 	cd ${PREFIX} && \
-	${FIND} share/mirrormagic/${directory} -type f >>${WRKDIR}/PLIST
+	${FIND} share/mirrormagic/${directory} -type f -print >>${WRKDIR}/PLIST
 .endfor
 	${CHOWN} -R games:games ${SCORE_PATH}
 
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index eae778e9cd6..7532674eb2a 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/24 13:30:56 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/27 00:53:11 heinz Exp $
 #
 
 DISTNAME=		mirrormagic-2.0.2
@@ -34,11 +34,11 @@ do-install:
 	${RM} -f ${WRKDIR}/PLIST
 .for levdir in Classic_Games
 	cd ${PREFIX} && \
-	${FIND} share/mirrormagic/levels/${levdir} -type f >>${WRKDIR}/PLIST
+	${FIND} share/mirrormagic/levels/${levdir} -type f -print >>${WRKDIR}/PLIST
 .endfor
 .for directory in graphics music sounds
 	cd ${PREFIX} && \
-	${FIND} share/mirrormagic/${directory} -type f >>${WRKDIR}/PLIST
+	${FIND} share/mirrormagic/${directory} -type f -print >>${WRKDIR}/PLIST
 .endfor
 	${CHOWN} -R games:games ${SCORE_PATH}
 
diff --git a/games/pysol/Makefile b/games/pysol/Makefile
index a8e421688ff..b8a1438ae89 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:39:16 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/27 00:53:11 heinz Exp $
 #
 
 DISTNAME=	pysol-4.81
@@ -32,9 +32,9 @@ do-install:
 post-install:
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	@(cd ${PREFIX}; \
-	  ${FIND} share/pysol \( -type f -or -type l \) | \
+	  ${FIND} share/pysol \( -type f -or -type l \) -print | \
 	    sort >> ${PLIST_SRC}; \
-	  for DIR in `${FIND} share/pysol -type d | sort -r`; do \
+	  for DIR in `${FIND} share/pysol -type d -print | sort -r`; do \
 	  ${ECHO} "@dirrm $$DIR" >> ${PLIST_SRC}; \
 	  done)
 
diff --git a/games/rocksndiamonds-levels/Makefile b/games/rocksndiamonds-levels/Makefile
index 097d49aaaae..050b9f5d21d 100644
--- a/games/rocksndiamonds-levels/Makefile
+++ b/games/rocksndiamonds-levels/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:39:20 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/27 00:53:11 heinz Exp $
 
 DISTNAME=	rocksndiamonds-levels-1.0
 CATEGORIES=	games x11
@@ -72,7 +72,7 @@ do-install:
 	${RM} -f ${WRKDIR}/PLIST
 .for levdir in DX_Boulderdash Emerald_Mine_Club Supaplex
 	cd ${PREFIX} && \
-	${FIND} share/rocksndiamonds/levels/${levdir} -type f >>${WRKDIR}/PLIST
+	${FIND} share/rocksndiamonds/levels/${levdir} -type f -print >>${WRKDIR}/PLIST
 .endfor
 	${CHOWN} -R games:games ${SCORE_PATH}
 
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index 57ca7d0822e..b27aa7c9a7d 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/11/11 12:32:36 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/27 00:53:11 heinz Exp $
 
 DISTNAME=	Rollemup
 PKGNAME=	rollemup-1.0
@@ -56,8 +56,8 @@ do-install:
 		${PREFIX}/${GAMES_DIR}/Rollemup
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	@(cd ${PREFIX}; \
-	  ${FIND} ${GAMES_DIR}/Rollemup -type f >> ${PLIST_SRC}; \
-	  for DIR in `${FIND} ${GAMES_DIR}/Rollemup -type d | sort -r`; do \
+	  ${FIND} ${GAMES_DIR}/Rollemup -type f -print >> ${PLIST_SRC}; \
+	  for DIR in `${FIND} ${GAMES_DIR}/Rollemup -type d -print | sort -r`; do \
 	    ${ECHO} "@dirrm $$DIR" >> ${PLIST_SRC}; \
 	  done)
 	@${CHOWN} ${ROOT_USER}:games ${PREFIX}/bin/Rollemup
diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile
index 6d5677b8241..8b2eab0e218 100644
--- a/games/tuxmath/Makefile
+++ b/games/tuxmath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/24 13:30:57 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/27 00:53:11 heinz Exp $
 #
 
 DISTNAME=	tuxmath-2001.09.07-0102
@@ -17,7 +17,7 @@ USE_GNU_TOOLS+=	make
 NO_CONFIGURE=	# defined
 
 pre-install:
-	${FIND} ${WRKSRC} -name CVS -type d  | ${XARGS} ${RM} -rf
+	${FIND} ${WRKSRC} -name CVS -type d  -print | ${XARGS} ${RM} -rf
 	${RM} -rf ${WRKSRC}/data/images/.xvpics
 	${RM} -rf ${WRKSRC}/data/images/status/.xvpics