replaced some commands by their ${COMMAND} counterparts

6 files changed, 24 insertions, 24 deletions

diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 14df5dd5dc5..ba2b3bda3f2 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 1999/12/02 20:26:39 bouyer Exp $
+# $NetBSD: Makefile,v 1.29 2000/01/02 03:36:52 wiz Exp $
 #
 
 DISTNAME=       MesaLib-3.0
@@ -30,23 +30,23 @@ ALL_TARGET=	sunos5-gcc
 .endif
 
 post-extract:
-	@chmod +r ${WRKSRC}/demos/*
-	@find ${WRKSRC} -type f -name "*~" | xargs ${RM} -f
+	@${CHMOD} +r ${WRKSRC}/demos/*
+	@${FIND} ${WRKSRC} -type f -name "*~" | xargs ${RM} -f
 
 do-install:
 .for file in ${MESA_LIBS}
 	${INSTALL_DATA} ${WRKSRC}/lib/${file}.a ${PREFIX}/lib
-	ranlib ${PREFIX}/lib/${file}.a
+	${RANLIB} ${PREFIX}/lib/${file}.a
 	${INSTALL_DATA} ${WRKSRC}/lib/${file}.so.${MESA_VERSION} ${PREFIX}/lib
 .endfor
 .for file in ${GLUT_LIBS}
 	${INSTALL_DATA} ${WRKSRC}/lib/${file}.a ${PREFIX}/lib
-	ranlib ${PREFIX}/lib/${file}.a
+	${RANLIB} ${PREFIX}/lib/${file}.a
 	${INSTALL_DATA} ${WRKSRC}/lib/${file}.so.${GLUT_VERSION} ${PREFIX}/lib
 .endfor
 .for file in GL GLU
-	@ln -f -s ${PREFIX}/lib/libMesa${file}.a ${PREFIX}/lib/lib${file}.a
-	@ln -f -s ${PREFIX}/lib/libMesa${file}.so.${MESA_VERSION} ${PREFIX}/lib/lib${file}.so.${MESA_VERSION}
+	@${LN} -f -s ${PREFIX}/lib/libMesa${file}.a ${PREFIX}/lib/lib${file}.a
+	@${LN} -f -s ${PREFIX}/lib/libMesa${file}.so.${MESA_VERSION} ${PREFIX}/lib/lib${file}.so.${MESA_VERSION}
 .endfor
 	@${MKDIR} ${PREFIX}/include/GL
 	${INSTALL_DATA} ${WRKSRC}/include/GL/* ${PREFIX}/include/GL
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index cc2477372bf..11ea12a62f3 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/12/12 07:59:39 rh Exp $
+# $NetBSD: Makefile,v 1.6 2000/01/02 03:36:52 wiz Exp $
 
 DISTNAME=		ClanLib-0.2.2
 CATEGORIES=		graphics games devel x11
@@ -38,11 +38,11 @@ post-patch:
 
 .include "../../mk/bsd.prefs.mk"
 
+.include "../../mk/bsd.pkg.mk"
+
 .if ${OPSYS} == "NetBSD"
-BROKEN_LIBZ!=ar t /usr/lib/libz.a | grep -w example.o || echo "false"
+BROKEN_LIBZ!=${AR} t /usr/lib/libz.a | ${GREP} -w example.o || ${ECHO} "false"
 .if !empty(BROKEN_LIBZ:Mexample.o)
 BROKEN= "Update to NetBSD 1.4.1, or recompile /usr/lib/libz without example.c"
 .endif
 .endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index 15079080205..59ee08a6616 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/09/20 04:58:29 sakamoto Exp $
+# $NetBSD: Makefile,v 1.6 2000/01/02 03:36:53 wiz Exp $
 
 DISTNAME=	Imaging-1.0b1
 PKGNAME=	py-imaging-1.0b1
@@ -34,10 +34,10 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/PIL
 	${INSTALL_DATA} ${WRKSRC}/libImaging/*.h ${PREFIX}/include/PIL
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	(cd ${WRKSRC}/PIL; find . -name \*.py\* -print \
+	(cd ${WRKSRC}/PIL; ${FIND} . -name \*.py\* -print \
 		| ${SED} -e 's,^./,lib/python1.5/site-packages/,g' \
 		>>${PLIST_SRC})
-	(cd ${PREFIX}; find include/PIL -type f -print >>${PLIST_SRC})
+	(cd ${PREFIX}; ${FIND} include/PIL -type f -print >>${PLIST_SRC})
 	${ECHO} "@dirrm include/PIL" >>${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index bb8126a6d68..f458734a706 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/12/02 03:03:30 sakamoto Exp $
+# $NetBSD: Makefile,v 1.6 2000/01/02 03:36:53 wiz Exp $
 # FreeBSD Id: Makefile,v 1.4 1999/05/19 09:41:06 tg Exp $
 
 DISTNAME=	sketch-0.6.3
@@ -19,7 +19,7 @@ SKETCHDOCS=	BUGS Doc NEWS PROJECTS README TODO
 SKETCHEXDIR=	${PREFIX}/share/examples/sketch
 
 echo:
-	echo ${LIBS}
+	${ECHO} ${LIBS}
 
 do-configure:
 	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index 242c84704ab..25093055e00 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/11/22 11:11:32 agc Exp $
+# $NetBSD: Makefile,v 1.10 2000/01/02 03:36:53 wiz Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/02/11 08:48:26 tg Exp
 #
 
@@ -33,13 +33,13 @@ post-install:
 	cd ${PREFIX}/share/doc/urt && (\
 	    ${GTAR} xf ${DISTDIR}/urt-doc.tar; \
 	    cd doc; \
-	    find -d . | cpio -dump ..; \
+	    ${FIND} -d . | cpio -dump ..; \
 	    cd ..; \
 	    ${RM} -rf doc)
 	cd ${PREFIX}/share/examples/urt && (\
 	    ${GTAR} xf ${DISTDIR}/urt-img.tar; \
-	    chown -R root:wheel . ; \
-	    find . -type d -exec chmod 775 '{}' \; ; \
-	    find . -type f -exec chmod 664 '{}' \;)
+	    ${CHOWN} -R root:wheel . ; \
+	    ${FIND} . -type d -exec ${CHMOD} 775 '{}' \; ; \
+	    ${FIND} . -type f -exec ${CHMOD} 664 '{}' \;)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index 2216b4ce689..26aa6d536e2 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/10/08 21:12:50 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2000/01/02 03:36:53 wiz Exp $
 #
 
 DISTNAME=       xart19980415
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/19980415
 USE_IMAKE=      yes
 
 post-extract:
-	find ${WRKSRC} -type d -print | xargs chmod 755
-	find ${WRKSRC} -type f -print | xargs chmod 644
+	${FIND} ${WRKSRC} -type d -print | xargs ${CHMOD} 755
+	${FIND} ${WRKSRC} -type f -print | xargs ${CHMOD} 644
 
 .include "../../mk/bsd.pkg.mk"