Do not use commands directly, use ${COMMAND} instead.

Remove continuous blank lines.

1 files changed, 27 insertions, 30 deletions

diff --git a/Makefile b/Makefile
index 8c3ff209f0b..a68095f5c67 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2002/12/01 05:51:33 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.50 2002/12/15 02:49:37 salo Exp $
 #
 
 .include "mk/bsd.prefs.mk"
@@ -64,7 +64,7 @@ _PKGSRCDIR=${.CURDIR}
 .endif
 
 index:
-	@rm -f ${.CURDIR}/INDEX
+	@${RM} -f ${.CURDIR}/INDEX
 	@${MAKE} ${.CURDIR}/INDEX
 
 ${.CURDIR}/INDEX:
@@ -73,41 +73,40 @@ ${.CURDIR}/INDEX:
 	@${ECHO} " Done."
 
 print-index:	${.CURDIR}/INDEX
-	@awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nArch:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10); }' < ${.CURDIR}/INDEX
+	@${AWK} -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nArch:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10); }' < ${.CURDIR}/INDEX
 
 search:	${.CURDIR}/INDEX
 .if !defined(key)
 	@${ECHO} "The search target requires a keyword parameter,"
 	@${ECHO} "e.g.: \"${MAKE} search key=somekeyword\""
 .else
-	@grep ${key} ${.CURDIR}/INDEX | awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nArch:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10); }'
+	@${GREP} ${key} ${.CURDIR}/INDEX | ${AWK} -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nArch:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10); }'
 .endif
 
-
 #
 # Generate list of all packages by extracting information from
 # the category/README.html pages
 #
 readme-all:
 	@if [ -f README-all.html ]; then \
-		mv README-all.html README-all.html.BAK ; \
+		${MV} README-all.html README-all.html.BAK ; \
 	fi
 	@${MAKE} README-all.html
-	@if cmp -s README-all.html README-all.html.BAK ; then \
-		mv README-all.html.BAK README-all.html ; \
+	@if ${CMP} -s README-all.html README-all.html.BAK ; then \
+		${MV} README-all.html.BAK README-all.html ; \
 	else \
-		rm -f README-all.html.BAK ; \
+		${RM} -f README-all.html.BAK ; \
 	fi
 
 README-all.html:
-	@rm -f $@.new
-	@rm -f $@.newsorted
+	@${RM} -f $@.new
+	@${RM} -f $@.newsorted
 	@${ECHO} -n "Processing categories for $@:"
 .for category in ${SUBDIR}
 	@if [ -f ${category}/README.html ]; then \
 		${ECHO} -n ' ${category}' ; \
-		grep '^<TR>' ${category}/README.html \
-		| sed -e 's|"|"${category}/|' \
+		${GREP} '^<TR>' ${category}/README.html \
+		| ${SED} -e 's|"|"${category}/|' \
 		      -e 's| <TD>| <TD>(<A HREF="${category}/README.html">${category}</A>) <TD>|' \
 		      -e 's|<TR>|<TR VALIGN=TOP>|' \
 		      -e 's|<TD VALIGN=TOP>|<TD>|' \
@@ -115,37 +114,35 @@ README-all.html:
 	fi
 .endfor
 	@${ECHO} "."
-	@sort -f -t '">' +2 <$@.new >$@.newsorted
-	@wc -l $@.newsorted | awk '{ print $$1 }'  >$@.npkgs
-	@cat templates/README.all \
+	@${SORT} -f -t '">' +2 <$@.new >$@.newsorted
+	@${WC} -l $@.newsorted | ${AWK} '{ print $$1 }'  >$@.npkgs
+	@${CAT} templates/README.all \
 	| ${SED} \
 		-e '/%%NPKGS%%/r$@.npkgs' \
 		-e '/%%NPKGS%%/d' \
 		-e '/%%PKGS%%/r$@.newsorted' \
 		-e '/%%PKGS%%/d' \
 		> $@
-	@rm -f $@.npkgs
-	@rm -f $@.new
-	@rm -f $@.newsorted
-
-
+	@${RM} -f $@.npkgs
+	@${RM} -f $@.new
+	@${RM} -f $@.newsorted
 
 readme-ipv6:
 	@if [ -f README-IPv6.html ]; then \
-		mv README-IPv6.html README-IPv6.html.BAK ; \
+		${MV} README-IPv6.html README-IPv6.html.BAK ; \
 	fi
 	@${MAKE} README-IPv6.html
-	@if cmp -s README-IPv6.html README-IPv6.html.BAK  ; then \
-		mv README-IPv6.html.BAK README-IPv6.html ; \
+	@if ${CMP} -s README-IPv6.html README-IPv6.html.BAK  ; then \
+		${MV} README-IPv6.html.BAK README-IPv6.html ; \
 	else \
-		rm -f README-IPv6.html.BAK ; \
+		${RM} -f README-IPv6.html.BAK ; \
 	fi
 
 README-IPv6.html:
-	@grep -l '^BUILD_DEFS.*=.*USE_INET6' */*/Makefile \
-	 | sed s,Makefile,, >$@.pkgs
-	@fgrep -f $@.pkgs README-all.html | sort -t/ +1 >$@.trs
-	@cat templates/README.ipv6 \
+	@${GREP} -l '^BUILD_DEFS.*=.*USE_INET6' */*/Makefile \
+	 | ${SED} s,Makefile,, >$@.pkgs
+	@${FGREP} -f $@.pkgs README-all.html | ${SORT} -t/ +1 >$@.trs
+	@${CAT} templates/README.ipv6 \
 	| ${SED} \
 		-e '/%%TRS%%/r$@.trs' \
 		-e '/%%TRS%%/d' \
@@ -155,5 +152,5 @@ README-IPv6.html:
 
 show-host-specific-pkgs:
 	@${ECHO} "HOST_SPECIFIC_PKGS= \\";					\
-	${MAKE} show-pkgsrc-dir | awk '/^===/ { next; } { printf("%s \\\n", $$1) }'; \
+	${MAKE} show-pkgsrc-dir | ${AWK} '/^===/ { next; } { printf("%s \\\n", $$1) }'; \
 	${ECHO} ""