Kill a large set of deprecated variables.

Thoroughly unsubtle, most mkdir -p should probably be INSTALL* at *install stage, and echo/ECHO_MSG is somewhat unsorted. It's quite possible I missed a few automated changes...
2000-02-11 01:09:59 +00:00 · 2000-02-11 01:09:59 +00:00 · a813079932
commit a813079932
parent 2b44b9412b
96 changed files with 401 additions and 401 deletions
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 1999/09/23 21:58:00 brad Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/11 01:09:59 espie Exp $

 DISTNAME=	xephem-3.2.2
 CATEGORIES=	astro
@ -29,24 +29,24 @@ do-install:
 	 ${SETENV} ${MAKE_ENV} \
 	 ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
 	@(cd ${WRKSRC}/GUI/xephem && \
-	 ${SED} -e 's,: .$$,: ${PREFIX}/lib/X11/xephem,' XEphem.ad > XEphem && \
+	 sed -e 's,: .$$,: ${PREFIX}/lib/X11/xephem,' XEphem.ad > XEphem && \
 	 ${INSTALL_DATA} XEphem ${PREFIX}/lib/X11/app-defaults)
-	@${MKDIR} ${PREFIX}/lib/X11/xephem
-	@${MKDIR} ${PREFIX}/lib/X11/xephem/auxil
+	@mkdir -p ${PREFIX}/lib/X11/xephem
+	@mkdir -p ${PREFIX}/lib/X11/xephem/auxil
 	@(cd ${WRKSRC}/GUI/xephem/auxil; \
 	   for f in *; do \
 	     ${INSTALL_DATA} $$f ${PREFIX}/lib/X11/xephem/auxil; \
 	   done)
-	@${MKDIR} ${PREFIX}/lib/X11/xephem/catalogs
+	@mkdir -p ${PREFIX}/lib/X11/xephem/catalogs
 	@(cd ${WRKSRC}/GUI/xephem/catalogs; \
 	   for f in *; do \
 	     ${INSTALL_DATA} $$f ${PREFIX}/lib/X11/xephem/catalogs; \
 	   done)
-	@${MKDIR} ${PREFIX}/lib/X11/xephem/tools
+	@mkdir -p ${PREFIX}/lib/X11/xephem/tools
 	@(cd ${WRKSRC}/GUI/xephem/tools; \
 	   for f in *; do \
 	     if [ -d $$f ]; then \
-	       ${MKDIR} ${PREFIX}/lib/X11/xephem/tools/$$f; \
+	       mkdir -p ${PREFIX}/lib/X11/xephem/tools/$$f; \
 	       (cd $$f; \
 	         for i in *; do \
 	           ${INSTALL_DATA} $$i ${PREFIX}/lib/X11/xephem/tools/$$f; \
@ -55,12 +55,12 @@ do-install:
 	       ${INSTALL_DATA} $$f ${PREFIX}/lib/X11/xephem/tools; \
 	     fi; \
 	   done)
-	@${ECHO} ""
-	@${ECHO} "*** The initial auxil, catalogs, and tools files have"
-	@${ECHO} "*** been placed in ${PREFIX}/lib/X11/xephem.  Move them"
-	@${ECHO} "*** where you will.  Once moved you MUST modify"
-	@${ECHO} "*** ${PREFIX}/lib/X11/app-defaults/XEphem"
-	@${ECHO} "*** At a minimum you must change XEphem.BaseDir."
-	@${ECHO} ""
+	@echo ""
+	@echo "*** The initial auxil, catalogs, and tools files have"
+	@echo "*** been placed in ${PREFIX}/lib/X11/xephem.  Move them"
+	@echo "*** where you will.  Once moved you MUST modify"
+	@echo "*** ${PREFIX}/lib/X11/app-defaults/XEphem"
+	@echo "*** At a minimum you must change XEphem.BaseDir."
+	@echo ""

 .include <bsd.port.mk>
--- a/audio/gogo/Makefile
+++ b/audio/gogo/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2000/01/31 01:19:39 beck Exp $
+# $OpenBSD: Makefile,v 1.2 2000/02/11 01:09:59 espie Exp $

 DISTNAME=	gogo224b	
 BUILD_DEPENDS=	nasm-0.98:${PORTSDIR}/devel/nasm
@ -11,9 +11,9 @@ MASTER_SITES=	http://www.kurims.kyoto-u.ac.jp/~shigeo/soft/gogo2/src/
 MAINTAINER=	beck@openbsd.org

 post-install:
-	@${MKDIR} ${PREFIX}/share/doc/gogo
+	@mkdir -p ${PREFIX}/share/doc/gogo
 	${INSTALL_MAN} ${WRKSRC}/*.txt ${PREFIX}/share/doc/gogo
-	@${MKDIR} ${PREFIX}/share/doc/gogo/japandoc
+	@mkdir -p ${PREFIX}/share/doc/gogo/japandoc
 	${INSTALL_DATA} ${WRKSRC}/japandoc/* ${PREFIX}/share/doc/gogo/japandoc

 .include <bsd.port.mk>
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 1999/09/06 18:23:45 brad Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/11 01:09:59 espie Exp $

 DISTNAME=       rplay-3.3.0
 CATEGORIES=	audio
@ -16,16 +16,16 @@ CONFIGURE_ARGS+= --sysconfdir=${SYSCONFDIR}
 post-configure:
 .for ff in rplay.conf.5 rplay.helpers.5 rplay.hosts.5 rplayd.8
 	@cd ${WRKSRC}/doc; \
-		${SED} -e "s,/usr/local/etc,${SYSCONFDIR},g" ${ff} >${ff}.tmp; \
-		${MV} ${ff}.tmp ${ff}
+		sed -e "s,/usr/local/etc,${SYSCONFDIR},g" ${ff} >${ff}.tmp; \
+		mv ${ff}.tmp ${ff}
 .endfor

 post-install:
 	@if [ ! -d /etc/rplay ]; then \
-		${ECHO} "Installing default configs..."; \
-		${MKDIR} /etc/rplay; \
-		${ECHO} localhost >/etc/rplay/rplay.hosts; \
-		${TOUCH} /etc/rplay/rplay.{conf,helpers,servers}; \
+		echo "Installing default configs..."; \
+		mkdir -p /etc/rplay; \
+		echo localhost >/etc/rplay/rplay.hosts; \
+		touch /etc/rplay/rplay.{conf,helpers,servers}; \
 	fi

 .include <bsd.port.mk>
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1999/09/26 21:09:50 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/11 01:09:59 espie Exp $

 DISTNAME=	tosha-0.6
 CATEGORIES=	audio
@ -8,8 +8,8 @@ MAINTAINER=	angelos@openbsd.org

 post-install:
 	@if [ -e /etc/tosharc ] ; then \
-		${ECHO} "===> You might wish to update /etc/tosharc"; \
-		${ECHO} "===> check ${PREFIX}/lib/tosha/tosharc.sample"; \
+		echo "===> You might wish to update /etc/tosharc"; \
+		echo "===> check ${PREFIX}/lib/tosha/tosharc.sample"; \
 	else \
 		cp ${PREFIX}/lib/tosha/tosharc.sample /etc/tosharc; \
 	fi
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/02/11 00:37:17 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2000/02/11 01:10:00 espie Exp $

 DISTNAME=	tracker-5.3
 CATEGORIES=	audio
@ -18,18 +18,18 @@ MAKE_FLAGS=	MACHINE=openbsd CC=$(CC) INSTALL="$(INSTALL)" \
 		COMPRESSION_FILE=/etc/compression_methods -f

 post-extract:
-	@${MKDIR} ${WRKSRC}/Arch/OpenBSD
-	@${CP} files/audio.c files/config.h ${WRKSRC}/Arch/OpenBSD
+	@mkdir -p ${WRKSRC}/Arch/OpenBSD
+	@cp files/audio.c files/config.h ${WRKSRC}/Arch/OpenBSD

 post-install:
-	@${MKDIR} ${PREFIX}/share/doc/tracker
-	@${MKDIR} ${PREFIX}/lib/tracker
+	@mkdir -p ${PREFIX}/share/doc/tracker
+	@mkdir -p ${PREFIX}/lib/tracker
 	@cd ${WRKSRC}/Docs && \
 	makeinfo --no-split tracker.texinfo -o tracker.info && \
 	$(INSTALL_MAN) tracker.info ${PREFIX}/info && \
-	${RM} -f tracker.info *.orig
-	${CP} -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker
-	${CP} ${WRKSRC}/Lib/compression_methods ${PREFIX}/lib/tracker/compression_methods.sample
+	rm -f tracker.info *.orig
+	cp -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker
+	cp ${WRKSRC}/Lib/compression_methods ${PREFIX}/lib/tracker/compression_methods.sample

 # there is a small test module included. This target tests that
 # - tracker correctly handles compressed files (only after install),
--- a/audio/waveplay/Makefile
+++ b/audio/waveplay/Makefile
@ -14,7 +14,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/waveplay ${PREFIX}/bin/waveplay

 post-install:
-	@${MKDIR} ${PREFIX}/share/doc/waveplay
+	@mkdir -p ${PREFIX}/share/doc/waveplay
 	@${STRIP} ${PREFIX}/bin/waveplay
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/waveplay/
 	${INSTALL_DATA} ${WRKSRC}/README.jp ${PREFIX}/share/doc/waveplay/
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1999/04/01 02:57:53 brad Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/11 01:10:00 espie Exp $

 DISTNAME=       bytebench-3.1
 CATEGORIES=	benchmarks
@ -9,9 +9,9 @@ MASTER_SITES=   ftp://ftp.inria.fr/system/benchmark/
 EXTRACT_SUFX=	.tar.Z

 do-install:
-		-${MKDIR} $(PREFIX)/lib/bytebench
+		-mkdir -p $(PREFIX)/lib/bytebench
 		for f in Makefile README Run doc pgms results testdir; \
-			do ${CP} -R $(WRKSRC)/$$f $(PREFIX)/lib/bytebench; done
+			do cp -R $(WRKSRC)/$$f $(PREFIX)/lib/bytebench; done
 		echo "#!/bin/sh"		   >  $(PREFIX)/bin/bytebench
 		echo "TMPDIR=\$${TMPDIR-/var/tmp}" >> $(PREFIX)/bin/bytebench
 		echo "RESULTDIR=/tmp"		   >> $(PREFIX)/bin/bytebench
@ -25,7 +25,7 @@ do-install:
 		chmod 755 $(PREFIX)/lib/bytebench/doc
 		chmod 755 $(PREFIX)/lib/bytebench/pgms
 		chmod 755 $(PREFIX)/lib/bytebench/pgms/*
-		${RM} -f $(PREFIX)/lib/bytebench/pgms/*.orig
+		rm -f $(PREFIX)/lib/bytebench/pgms/*.orig
 		chmod 755 $(PREFIX)/lib/bytebench/results
 		chmod 755 $(PREFIX)/lib/bytebench/testdir

--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1999/08/18 02:06:26 angelos Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/11 01:10:00 espie Exp $

 DISTNAME=	lmbench
 PKGNAME=	lmbench-1.1
@ -25,13 +25,13 @@ retest: build
 # Move it so patch doesn't get confused.
 #
 pre-patch:
-	@${MV} ${WRKSRC}/src/RCS ${WRKSRC}/src/RCS-
+	@mv ${WRKSRC}/src/RCS ${WRKSRC}/src/RCS-

 pre-install:
-	[ -d ${PREFIX}/lib/lmbench ] || ${MKDIR} ${PREFIX}/lib/lmbench
+	[ -d ${PREFIX}/lib/lmbench ] || mkdir -p ${PREFIX}/lib/lmbench

 do-install:
-	${CP} ${FILESDIR}/Makefile ${PREFIX}/lib/lmbench
+	cp ${FILESDIR}/Makefile ${PREFIX}/lib/lmbench
 	tar -C ${WRKSRC} -cf - Results bin scripts | \
 	  tar -C ${PREFIX}/lib/lmbench -xf -
 .for man in ${MAN1}
--- a/chinese/cless/Makefile
+++ b/chinese/cless/Makefile
@ -3,7 +3,7 @@
 # Date created:         Thu Jan 18, 2000
 # Whom:                 Kevin Lo <kevlo@openbsd.org>
 #
-# $OpenBSD: Makefile,v 1.1.1.1 2000/01/18 10:13:35 kevlo Exp $
+# $OpenBSD: Makefile,v 1.2 2000/02/11 01:10:00 espie Exp $
 #

 DISTNAME=       cless-290
@ -18,7 +18,7 @@ GNU_CONFIGURE=  yes
 CFLAGS+=        -DHANZI # LDFLAGS=-s datadir=/usr/local/lib/less

 post-install:
-	${MKDIR} ${PREFIX}/share/doc/cless
+	mkdir -p ${PREFIX}/share/doc/cless
 	${INSTALL_DATA} ${WRKSRC}/README.CLESS ${PREFIX}/share/doc/cless 

 .include <bsd.port.mk>
--- a/chinese/lunar/Makefile
+++ b/chinese/lunar/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 1999/11/18 03:52:15 kevlo Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/11 01:10:00 espie Exp $

 DISTNAME=	lunar-2.1
 PKGNAME=	zh-lunar-2.1
@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.ifcss.org/pub/software/unix/c-utils/  \
 ALL_TARGET=

 do-install:
-	@${MKDIR} ${PREFIX}/share/chinese
+	@mkdir -p ${PREFIX}/share/chinese
 	${INSTALL_PROGRAM} ${WRKSRC}/lunar ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/lunar.bitmap ${PREFIX}/share/chinese
 	${INSTALL_MAN} ${WRKSRC}/lunar.1 ${PREFIX}/man/man1
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@ -3,7 +3,7 @@
 # Date created:        23 August 1999
 # Whom:                Alex Varju <varju@webct.com>
 #
-# $OpenBSD: Makefile,v 1.2 2000/01/05 23:42:20 dugsong Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/11 01:10:00 espie Exp $
 # $FreeBSD: ports/palm/jpilot/Makefile,v 1.6 1999/11/11 22:40:39 sumikawa Exp $

 DISTNAME=	jpilot-0.96
@ -18,7 +18,7 @@ LIB_DEPENDS=	pisock.3:${PORTSDIR}/comms/pilot-link \
 USE_AUTOCONF=	yes

 post-install:
-	${MKDIR} ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/docs/plugin.html ${PREFIX}/share/doc/jpilot
+	mkdir -p ${PREFIX}/share/doc/jpilot
+	cp ${WRKSRC}/docs/plugin.html ${PREFIX}/share/doc/jpilot

 .include <bsd.port.mk>
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2000/02/11 00:37:19 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2000/02/11 01:10:01 espie Exp $
 #

 PKGNAME=	minicom-1.82.1
@ -20,7 +20,7 @@ WRKDIST=		${WRKDIR}/${PKGNAME}/src

 post-install:
 .if exists(/etc/minicom/minicom.users)
-	@${ECHO} "*** Found existing /etc/minicom/minicom.users -- not replacing."
+	@echo "*** Found existing /etc/minicom/minicom.users -- not replacing."
 .else
 	${INSTALL_DATA} ${WRKSRC}/minicom.users /etc/minicom
 .endif
--- a/converters/mimepp/Makefile
+++ b/converters/mimepp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1999/04/01 06:20:04 brad Exp $
+# $OpenBSD: Makefile,v 1.4 2000/02/11 01:10:01 espie Exp $

 DISTNAME=		mimepp-1.0
 CATEGORIES=		converters
@ -30,16 +30,16 @@ EXAMPLES=	attach.cpp attach.h basicmsg.cpp basicmsg.h exampl01.cpp \

 do-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/libmimepp.a ${PREFIX}/lib
-	@ ${MKDIR} ${PREFIX}/include/mimepp
+	@ mkdir -p ${PREFIX}/include/mimepp
 .for file in ${INCLUDE}
 	@ ${INSTALL_DATA} ${WRKSRC}/mimepp/${file} ${PREFIX}/include/mimepp
 .endfor
-	@ ${MKDIR} ${PREFIX}/share/doc/mimepp
+	@ mkdir -p ${PREFIX}/share/doc/mimepp
 .for file in ${DOC}
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/mimepp
 .endfor
 	@ ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/mimepp
-	@ ${MKDIR} ${PREFIX}/share/examples/mimepp
+	@ mkdir -p ${PREFIX}/share/examples/mimepp
 	@ ${INSTALL_DATA} ${FILESDIR}/Makefile ${PREFIX}/share/examples/mimepp
 .for file in ${EXAMPLES}
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/examples/mimepp
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2000/02/11 00:37:20 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2000/02/11 01:10:01 espie Exp $
 # $FreeBSD: Makefile,v 1.25 1998/04/22 08:28:07 asami Exp $

 DISTNAME=	postgresql-6.5.3
@ -71,7 +71,7 @@ MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
-		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
+		--with-template=`uname -s | tr '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} \
 		${TK_INCDIR}" ${WITH_TCL} --with-libraries=${PREFIX}/lib

@ -89,35 +89,35 @@ PGDATA=		/var/pgsql/data
 post-configure:
 .if defined(USE_TCL) && ${USE_TCL:U} == "YES"
 	@if [ x"${NO_SHARED_LIBS}" = "x" ]; then \
-		${CP} ${PKGDIR}/PLIST.tcl ${WRKDIR}/PLIST; \
+		cp ${PKGDIR}/PLIST.tcl ${WRKDIR}/PLIST; \
 	else \
-		${CP} ${PKGDIR}/PLIST.tcl.noshared ${WRKDIR}/PLIST; \
+		cp ${PKGDIR}/PLIST.tcl.noshared ${WRKDIR}/PLIST; \
 	fi
 .else
 	@if [ x"${NO_SHARED_LIBS}" = "x" ]; then \
-		${CP} ${PKGDIR}/PLIST ${WRKDIR}/PLIST; \
+		cp ${PKGDIR}/PLIST ${WRKDIR}/PLIST; \
 	else \
-		${CP} ${PKGDIR}/PLIST.noshared ${WRKDIR}/PLIST; \
+		cp ${PKGDIR}/PLIST.noshared ${WRKDIR}/PLIST; \
 	fi
 .endif

 .if defined(USE_TCL) && ${USE_TCL:U} == "YES"
 post-patch:
-	@${MV} ${WRKSRC}/bin/pgaccess/main.tcl \
+	@mv ${WRKSRC}/bin/pgaccess/main.tcl \
 		${WRKSRC}/bin/pgaccess/main.tcl.orig
-	@${SED} -e "s=wish=${LOCALBASE}/bin/wish8.0=" \
+	@sed -e "s=wish=${LOCALBASE}/bin/wish8.0=" \
 		${WRKSRC}/bin/pgaccess/main.tcl.orig \
 		> ${WRKSRC}/bin/pgaccess/main.tcl
 .endif

 pre-build:
-	@${MKDIR} ${WRKSRC}/pgwrap
-	@${CP} ${FILESDIR}/pgwrap.c ${FILESDIR}/pgwrap.h ${WRKSRC}/pgwrap
-	@${SED} -e "s,@PGUSER@,${PGUSER},g" -e "s,@PGBIN@,${PGBIN},g" \
+	@mkdir -p ${WRKSRC}/pgwrap
+	@cp ${FILESDIR}/pgwrap.c ${FILESDIR}/pgwrap.h ${WRKSRC}/pgwrap
+	@sed -e "s,@PGUSER@,${PGUSER},g" -e "s,@PGBIN@,${PGBIN},g" \
 		-e "s,@PGLIB@,${PGLIB},g" -e "s,@PGDATA@,${PGDATA},g" \
 		-e "s,@PREFIX@,${PREFIX},g" < ${FILESDIR}/Makefile.in \
 		> ${WRKSRC}/pgwrap/Makefile
-	@${SED} -e "s,@PREFIX@,${PREFIX},g" \
+	@sed -e "s,@PREFIX@,${PREFIX},g" \
 		< ${FILESDIR}/README.OpenBSD.in \
 		> ${WRKSRC}/../doc/README.OpenBSD
 	(cd ${WRKSRC}/pgwrap; ${MAKE} depend && ${MAKE})
@ -126,8 +126,8 @@ pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/pgsql

 post-install:
-	@${RMDIR} ${PREFIX}/pgsql/include/port/bsd
-	@${RMDIR} ${PREFIX}/pgsql/include/port
+	@rmdir ${PREFIX}/pgsql/include/port/bsd
+	@rmdir ${PREFIX}/pgsql/include/port
 	${INSTALL_PROGRAM} ${WRKSRC}/pgwrap/pgwrap ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pgsql
 	${INSTALL_DATA} ${WRKSRC}/../doc/FAQ* ${PREFIX}/share/doc/pgsql
--- a/devel/prc-tools/Makefile
+++ b/devel/prc-tools/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/02/11 00:37:21 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/11 01:10:01 espie Exp $

 DISTNAME=       prc-tools.0.5.0
 PKGNAME=	prc-tools-0.5.0
@ -38,16 +38,16 @@ STRIP=		build-prc \

 # check for "-m486" and bomb out if the user has it
 pre-build:
-		@if ${ECHO} ${CFLAGS} | ${GREP} -- "-m486" > /dev/null ; then \
-			${ECHO} "ERROR: You have \"-m486\" defined some-" ; \
-			${ECHO} "       where, either in /etc/make.conf" ; \
-			${ECHO} "       or in the CFLAGS environment" ; \
-			${ECHO} "       variable.  This will cause this" ; \
-			${ECHO} "       port to not build properly.  Please" ; \
-			${ECHO} "       fix this and re-run make." ; \
+		@if echo ${CFLAGS} | grep -- "-m486" > /dev/null ; then \
+			echo "ERROR: You have \"-m486\" defined some-" ; \
+			echo "       where, either in /etc/make.conf" ; \
+			echo "       or in the CFLAGS environment" ; \
+			echo "       variable.  This will cause this" ; \
+			echo "       port to not build properly.  Please" ; \
+			echo "       fix this and re-run make." ; \
 			exit 1 ; \
 		else \
-			${ECHO} "Your environment looks OK." ; \
+			echo "Your environment looks OK." ; \
 		fi

 # after we apply freebsd patches, apply prc-tool's patches to gcc/gdb/...
@ -56,21 +56,21 @@ post-patch:

 # the info files are redundant
 post-install:
-		${RM} -rf ${PREFIX}/info
+		rm -rf ${PREFIX}/info
 		(cd ${PREFIX}/bin; strip ${STRIP})
-		@${ECHO} ""
-		@${ECHO} "	To upgrade to the PalmOS3 SDK, download "
-		@${ECHO} "	http://palm.3com.com/devzone/tools/winsdk30.zip "
-		@${ECHO} "	and after unzipping it, move the directory 'Incs' "
-		@${ECHO} "	to ${PREFIX}/m68k-palmos-coff/include/, under "
-		@${ECHO} "	the name 'PalmOS3'. Then delete the link "
-		@${ECHO} "	PalmOS -> PalmOS2, and make a symbolic link "
-		@${ECHO} "	PalmOS -> PalmOS3 in the same directory. "
-		@${ECHO} ""
-		@${ECHO} "	You will need to rename the file PalmOS3/UI/Event.H "
-		@${ECHO} "	to PalmOS3/UI/Event.h, and remove the nested "
-		@${ECHO} "	comment at the begining of PalmOS3/UI/Category.h "
-		@${ECHO} "	Also, you should edit PalmOS3/System/Unix/unix_string.h "
-		@${ECHO} "	and change the include from StdArg.h to stdarg.h "
-		@${ECHO} ""
+		@echo ""
+		@echo "	To upgrade to the PalmOS3 SDK, download "
+		@echo "	http://palm.3com.com/devzone/tools/winsdk30.zip "
+		@echo "	and after unzipping it, move the directory 'Incs' "
+		@echo "	to ${PREFIX}/m68k-palmos-coff/include/, under "
+		@echo "	the name 'PalmOS3'. Then delete the link "
+		@echo "	PalmOS -> PalmOS2, and make a symbolic link "
+		@echo "	PalmOS -> PalmOS3 in the same directory. "
+		@echo ""
+		@echo "	You will need to rename the file PalmOS3/UI/Event.H "
+		@echo "	to PalmOS3/UI/Event.h, and remove the nested "
+		@echo "	comment at the begining of PalmOS3/UI/Category.h "
+		@echo "	Also, you should edit PalmOS3/System/Unix/unix_string.h "
+		@echo "	and change the include from StdArg.h to stdarg.h "
+		@echo ""
 .include <bsd.port.mk>
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2000/02/11 00:37:22 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2000/02/11 01:10:01 espie Exp $

 DISTNAME=	joe2.8
 PKGNAME=	joe-2.8
@ -17,10 +17,10 @@ MAKE_ENV+=	SYS_JOERC="/etc/joe" TERMINFO="1"
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/joe ${PREFIX}/bin
 	@cd ${PREFIX}/bin; \
-		${LN} -sf joe jmacs; \
-		${LN} -sf joe jpico; \
-		${LN} -sf joe jstar; \
-		${LN} -sf joe rjoe
+		ln -sf joe jmacs; \
+		ln -sf joe jpico; \
+		ln -sf joe jstar; \
+		ln -sf joe rjoe
 	${INSTALL_MAN} ${WRKSRC}/joe.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/joe
 	${INSTALL_DATA} ${WRKSRC}/jmacsrc ${PREFIX}/lib/joe
@ -29,11 +29,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/jstarrc ${PREFIX}/lib/joe
 	${INSTALL_DATA} ${WRKSRC}/rjoerc ${PREFIX}/lib/joe
 	@if [ ! -d /etc/joe ]; then \
-		${ECHO} "***"; \
-		${ECHO} "*** Finished installing joe."; \
-		${ECHO} "*** Default configuration files stored in ${PREFIX}/lib/joe."; \
-		${ECHO} "*** If you wish to change joe configuration, copy these"; \
-		${ECHO} "*** files to /etc/joe and edit them."; \
+		echo "***"; \
+		echo "*** Finished installing joe."; \
+		echo "*** Default configuration files stored in ${PREFIX}/lib/joe."; \
+		echo "*** If you wish to change joe configuration, copy these"; \
+		echo "*** files to /etc/joe and edit them."; \
 	fi

 .include <bsd.port.mk>
--- a/emulators/linux_lib/Makefile
+++ b/emulators/linux_lib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2000/02/10 20:39:40 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2000/02/11 01:10:02 espie Exp $
 # $NetBSD: Makefile,v 1.10 1998/04/24 09:07:55 agc Exp $
 # $FreeBSD Id: Makefile,v 1.19 1997/12/04 17:34:28 asami Exp $

@ -20,7 +20,7 @@ NO_PACKAGE=	yes
 EXTRACT_ONLY=

 pre-install:
-	@[ -d ${PREFIX} ] || ${MKDIR} ${PREFIX}
+	@[ -d ${PREFIX} ] || mkdir -p ${PREFIX}

 do-install:
 	@zcat ${DISTDIR}/${DISTNAME}.tar.gz | (cd ${PREFIX}; pax -r)
@ -28,18 +28,18 @@ do-install:
 post-install:
 # Creating usr/local/lib to prevent linux ldconfig from scanning OpenBSD
 # local libraries...
-	@${MKDIR} ${PREFIX}/usr/local/lib
+	@mkdir -p ${PREFIX}/usr/local/lib
 	${PREFIX}/sbin/ldconfig || /usr/bin/true
-	-@${RMDIR} ${PREFIX}/usr/local/lib ${PREFIX}/usr/local
-	${MKDIR} ${PREFIX}/usr/lib/zoneinfo
-	${LN} -sf /etc/localtime ${PREFIX}/usr/lib/zoneinfo/localtime
-	${MKDIR} ${PREFIX}/dev
-	${LN} -sf /dev/console ${PREFIX}/dev/tty0
-	${LN} -sf /dev/ttyC0 ${PREFIX}/dev/tty1
-	${LN} -sf /dev/ttyC1 ${PREFIX}/dev/tty2
-	${LN} -sf /dev/ttyC2 ${PREFIX}/dev/tty3
-	${LN} -sf /dev/ttyC3 ${PREFIX}/dev/tty4
-	${LN} -sf /dev/sound ${PREFIX}/dev/dsp
+	-@rmdir ${PREFIX}/usr/local/lib ${PREFIX}/usr/local
+	mkdir -p ${PREFIX}/usr/lib/zoneinfo
+	ln -sf /etc/localtime ${PREFIX}/usr/lib/zoneinfo/localtime
+	mkdir -p ${PREFIX}/dev
+	ln -sf /dev/console ${PREFIX}/dev/tty0
+	ln -sf /dev/ttyC0 ${PREFIX}/dev/tty1
+	ln -sf /dev/ttyC1 ${PREFIX}/dev/tty2
+	ln -sf /dev/ttyC2 ${PREFIX}/dev/tty3
+	ln -sf /dev/ttyC3 ${PREFIX}/dev/tty4
+	ln -sf /dev/sound ${PREFIX}/dev/dsp
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL

 .include <bsd.port.mk>
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1998/10/15 04:55:16 marc Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/11 01:10:02 espie Exp $
 #

 DISTNAME=		x48-0.4.0
@ -13,8 +13,8 @@ USE_IMAKE=		yes
 NO_INSTALL_MANPAGES=	yes

 post-install:
-	${MKDIR} ${PREFIX}/share/x48
-	${CP} ${WRKSRC}/README ${PREFIX}/share/x48/README-x48
-	${CP} ${WRKSRC}/doc/CARDS.doc ${WRKSRC}/doc/ROMDump.doc ${PREFIX}/share/x48
+	mkdir -p ${PREFIX}/share/x48
+	cp ${WRKSRC}/README ${PREFIX}/share/x48/README-x48
+	cp ${WRKSRC}/doc/CARDS.doc ${WRKSRC}/doc/ROMDump.doc ${PREFIX}/share/x48

 .include <bsd.port.mk>
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2000/02/11 00:37:23 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2000/02/11 01:10:02 espie Exp $
 # Author: Thomas Biskup <rpg@saranxis.ruhr.de>

 DISTNAME=	adom-g14
@ -26,7 +26,7 @@ ADOMOWN?=	games
 HISCORE_DIR=	/var/lib/adom

 pre-fetch:
-	@${ECHO} "Your kernel must have COMPAT_LINUX (GENERIC does)"
+	@echo "Your kernel must have COMPAT_LINUX (GENERIC does)"

 do-install:
 	@${INSTALL_DATA_DIR} ${ADOM_DOC}
--- a/games/bnetd/Makefile
+++ b/games/bnetd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 1999/11/11 03:48:53 kevlo Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/11 01:10:02 espie Exp $

 DISTNAME=	bnetd-0.4.19
 CATEGORIES=	games 
@ -17,7 +17,7 @@ do-install:
 	cd ${WRKSRC}/bin; ${INSTALL_PROGRAM} * ${PREFIX}/bin
 	cd ${WRKSRC}/sbin; ${INSTALL_PROGRAM} * ${PREFIX}/sbin
 	cd ${WRKSRC}/man; ${INSTALL_MAN}  bnchat.1 bnetd.1 bnftp.1 bnpass.1 ${PREFIX}/man/man1; ${INSTALL_MAN} bnetd.conf.4 bntext.4 bnmotd.txt.4 bnnews.txt.4 ${PREFIX}/man/man4
-	${MKDIR} ${PREFIX}/bnetd; ${CP} -R ${WRKSRC}/files ${WRKSRC}/users ${WRKSRC}/conf ${WRKSRC}/reports ${PREFIX}/bnetd
+	mkdir -p ${PREFIX}/bnetd; cp -R ${WRKSRC}/files ${WRKSRC}/users ${WRKSRC}/conf ${WRKSRC}/reports ${PREFIX}/bnetd


 .include <bsd.port.mk>
--- a/games/gnushogi/Makefile
+++ b/games/gnushogi/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1999/03/30 07:19:51 fgsch Exp $
+# $OpenBSD: Makefile,v 1.4 2000/02/11 01:10:02 espie Exp $
 #

 DISTNAME=	gnushogi-1.2p03
@ -25,14 +25,14 @@ do-build:
 	make gnushogix )

 do-install:
-	@${MKDIR} ${PREFIX}/share/gnushogi
+	@mkdir -p ${PREFIX}/share/gnushogi
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gnushogi ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gnushogir ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gnushogix ${PREFIX}/libexec
 	${INSTALL_DATA} ${WRKSRC}/src/gnushogi.bbk ${PREFIX}/share/gnushogi
 	${INSTALL_MAN} ${WRKSRC}/doc/gnushogi.1 ${PREFIX}/man/man6/gnushogi.6
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/gnushogi
+	@mkdir -p ${PREFIX}/share/doc/gnushogi
 .for doc in ${DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${PREFIX}/share/doc/gnushogi
 .endfor
--- a/games/slash/Makefile
+++ b/games/slash/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 1999/09/28 19:07:33 brad Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/11 01:10:02 espie Exp $

 DISTNAME=	slash-e8
 CATEGORIES=	games
@ -18,9 +18,9 @@ NHDIR=		${PREFIX}/lib/slashdir
 MAKE_ENV+= 	NHDIR=${NHDIR}

 post-extract:
-	@cd ${WRKDIR}; ${MV} nethack-3.2.2 ${DISTNAME}
-	@cd ${WRKDIR}; ${MV} dat/* ${DISTNAME}/dat
-	@${CP} ${FILESDIR}/blkmar.des ${WRKSRC}/dat
+	@cd ${WRKDIR}; mv nethack-3.2.2 ${DISTNAME}
+	@cd ${WRKDIR}; mv dat/* ${DISTNAME}/dat
+	@cp ${FILESDIR}/blkmar.des ${WRKSRC}/dat

 pre-patch:
 	@cd ${WRKSRC}; ${PATCH} -p1 -s < ${WRKDIR}/slashe8.dif
@ -30,19 +30,19 @@ pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh

 post-install:
-	@${MKDIR} ${PREFIX}/lib/X11/fonts/hack
-	@${MKDIR} ${PREFIX}/share/doc/nethack
+	@mkdir -p ${PREFIX}/lib/X11/fonts/hack
+	@mkdir -p ${PREFIX}/share/doc/nethack
 	@cd ${WRKSRC}/doc; ${CHMOD} 644 *.6
 	@cd ${WRKSRC}/doc; PREFIX='${PREFIX}' INSTALL_MAN='${INSTALL_MAN}' ${MAKE} manpages
 	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
 	@cd ${WRKSRC}/win/X11 && \
-	${SED} -e "s/^NetHack/Slash/; s/^!NetHack/!Slash/" <NetHack.ad > Slash && \
+	sed -e "s/^NetHack/Slash/; s/^!NetHack/!Slash/" <NetHack.ad > Slash && \
 	${INSTALL_DATA} Slash ${PREFIX}/lib/X11/app-defaults && \
 	${X11BASE}/bin/bdftopcf ibm.bdf | /usr/bin/gzip > ibm.pcf.gz && \
 	${X11BASE}/bin/bdftopcf nh10.bdf | /usr/bin/gzip > nh10.pcf.gz && \
 	${INSTALL_DATA} ibm.pcf.gz ${PREFIX}/lib/X11/fonts/hack && \
 	${INSTALL_DATA} nh10.pcf.gz ${PREFIX}/lib/X11/fonts/hack
 	${X11BASE}/bin/mkfontdir ${X11BASE}/lib/X11/fonts/hack
-	@${CAT} ${PKGDIR}/DESCR
+	@cat ${PKGDIR}/DESCR

 .include <bsd.port.mk>
--- a/games/starlanes/Makefile
+++ b/games/starlanes/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1999/09/28 21:07:47 brad Exp $
+# $OpenBSD: Makefile,v 1.4 2000/02/11 01:10:02 espie Exp $

 DISTNAME=	starlanes-1.2.2
 CATEGORIES=	games
@ -10,10 +10,10 @@ MAINTAINER=	angelos@openbsd.org
 ALL_TARGET=

 pre-build:
-	@${RM} ${WRKSRC}/starlanes
+	@rm ${WRKSRC}/starlanes

 do-install:
-	@${MKDIR} ${PREFIX}/share/doc/starlanes
+	@mkdir -p ${PREFIX}/share/doc/starlanes
 	${INSTALL_PROGRAM} ${WRKSRC}/starlanes ${PREFIX}/bin/starlanes
 	${INSTALL_MAN} ${WRKSRC}/starlanes.6 ${PREFIX}/man/man6
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/starlanes/COPYING
--- a/games/xbattle/Makefile
+++ b/games/xbattle/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1999/10/01 16:02:00 brad Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/11 01:10:03 espie Exp $

 DISTNAME=	xbattle-5.4.1
 CATEGORIES=	games
@ -9,13 +9,13 @@ MAINTAINER=	angelos@openbsd.org
 USE_IMAKE=	yes

 post-install:
-	@${MKDIR} $(PREFIX)/share/doc/xbattle
-	@${MKDIR} $(PREFIX)/share/xbattle
-	@${CP} $(WRKSRC)/tutorial* $(PREFIX)/share/doc/xbattle/ 
-	@${CP} $(WRKSRC)/README $(PREFIX)/share/doc/xbattle/ 
-	@${CP} -R $(WRKSRC)/xbas $(PREFIX)/share/xbattle/
-	@${CP} -R $(WRKSRC)/xbos $(PREFIX)/share/xbattle/
-	@${CP} -R $(WRKSRC)/xbts $(PREFIX)/share/xbattle/
+	@mkdir -p $(PREFIX)/share/doc/xbattle
+	@mkdir -p $(PREFIX)/share/xbattle
+	@cp $(WRKSRC)/tutorial* $(PREFIX)/share/doc/xbattle/ 
+	@cp $(WRKSRC)/README $(PREFIX)/share/doc/xbattle/ 
+	@cp -R $(WRKSRC)/xbas $(PREFIX)/share/xbattle/
+	@cp -R $(WRKSRC)/xbos $(PREFIX)/share/xbattle/
+	@cp -R $(WRKSRC)/xbts $(PREFIX)/share/xbattle/
 	@${CHMOD} 755 $(PREFIX)/share/doc/xbattle
 	@${CHMOD} 644 $(PREFIX)/share/doc/xbattle/*
 	@${CHMOD} 755 ${PREFIX}/share/xbattle
--- a/games/xdeblock/Makefile
+++ b/games/xdeblock/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/11 00:37:24 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/11 01:10:03 espie Exp $

 DISTNAME=	xdeblock
 PKGNAME=	xdeblock-1.0
@ -16,7 +16,7 @@ WRKDIST=	${WRKDIR}/xdeblo_v1.0
 NO_INSTALL_MANPAGES=	yes

 do-install:
-	@${MKDIR} ${PREFIX}/lib/X11/xdeblock/mapf
+	@mkdir -p ${PREFIX}/lib/X11/xdeblock/mapf
 	${INSTALL_PROGRAM} ${WRKSRC}/xdeblo ${PREFIX}/bin
 	@${CHMOD} 777 ${PREFIX}/lib/X11/xdeblock/mapf
 	${INSTALL_DATA} ${WRKSRC}/mapf/*.txt ${PREFIX}/lib/X11/xdeblock/mapf
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1999/10/02 22:24:54 brad Exp $
+# $OpenBSD: Makefile,v 1.4 2000/02/11 01:10:03 espie Exp $

 DISTNAME=	xjewel-1.6
 CATEGORIES=	games
@ -12,15 +12,15 @@ MAINTAINER=	angelos@openbsd.org
 USE_IMAKE=	yes

 pre-install:
-	@${MKDIR} ${PREFIX}/lib/xjewel.font
+	@mkdir -p ${PREFIX}/lib/xjewel.font
 	@(cd ${WRKSRC}/bitmaps; ${INSTALL_DATA} seven_seg.pcf.gz fonts.dir \
 		${PREFIX}/lib/xjewel.font)

 post-install:
-	@(${MV} ${PREFIX}/bin/xjewel ${PREFIX}/bin/xjewel_; \
-	  ${ECHO} "#!/bin/sh"				>  ${PREFIX}/bin/xjewel; \
-	  ${ECHO} "xset +fp ${PREFIX}/lib/xjewel.font"	>> ${PREFIX}/bin/xjewel; \
-	  ${ECHO} "xjewel_"				>> ${PREFIX}/bin/xjewel; \
+	@(mv ${PREFIX}/bin/xjewel ${PREFIX}/bin/xjewel_; \
+	  echo "#!/bin/sh"				>  ${PREFIX}/bin/xjewel; \
+	  echo "xset +fp ${PREFIX}/lib/xjewel.font"	>> ${PREFIX}/bin/xjewel; \
+	  echo "xjewel_"				>> ${PREFIX}/bin/xjewel; \
 	  ${CHMOD} ugo+x ${PREFIX}/bin/xjewel)

 .include <bsd.port.mk>
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1999/10/02 21:48:27 brad Exp $
+# $OpenBSD: Makefile,v 1.4 2000/02/11 01:10:03 espie Exp $

 DISTNAME=	xjig-2.4
 CATEGORIES=	games
@ -11,7 +11,7 @@ MAINTAINER=	angelos@openbsd.org
 MAKEFILE=	Makefile.Linux

 do-install:
-	@${MKDIR} ${PREFIX}/share/xjig
+	@mkdir -p ${PREFIX}/share/xjig
 	${INSTALL_PROGRAM} ${WRKSRC}/xjig ${PREFIX}/bin/xjig
 	${INSTALL_MAN} ${WRKSRC}/xjig.man ${PREFIX}/man/man1/xjig.1
 	${INSTALL_DATA} ${WRKSRC}/tina.gif ${PREFIX}/share/xjig
--- a/graphics/ggi/Makefile
+++ b/graphics/ggi/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 1999/03/24 03:10:06 brad Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/11 01:10:03 espie Exp $

 DISTNAME=       libggi-2.0b1
 CATEGORIES=     graphics
@ -24,7 +24,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static --with-gii=${PREFIX}/

 post-install:
-	${MKDIR} -p ${docdir}
+	mkdir -p ${docdir}
 	${INSTALL_DATA} ${WRKSRC}/README ${docdir}/README
 	${INSTALL_DATA} ${WRKSRC}/libggi.conf ${docdir}/libggi.conf.example
 	${INSTALL_DATA} ${WRKSRC}/extensions/misc/libggimisc.conf \
--- a/graphics/gii/Makefile
+++ b/graphics/gii/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1999/03/24 03:14:00 brad Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/11 01:10:03 espie Exp $

 DISTNAME=       libgii-0.1
 CATEGORIES=     graphics
@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --enable-static
 docdir=${PREFIX}/share/doc/gii

 post-install:
-	${MKDIR} -p ${docdir}
+	mkdir -p ${docdir}
 	${INSTALL_DATA} ${WRKSRC}/README ${docdir}
 	${INSTALL_DATA} ${WRKSRC}/libgii.conf ${docdir}/libgii.conf.example
 	${LDCONFIG} -m ${PREFIX}/lib
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/02/11 00:37:25 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/11 01:10:04 espie Exp $
 # $FreeBSD: Makefile,v 1.15 1999/08/25 06:14:08 obrien Exp $

 DISTNAME=	gqview-0.7.0.src
@ -20,7 +20,7 @@ ALL_TARGET=	gqview
 WRKDIST=	${WRKDIR}/${PKGNAME}

 post-install:
-	@${MKDIR} ${PREFIX}/share/doc/gqview
+	@mkdir -p ${PREFIX}/share/doc/gqview
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gqview/README

 .include <bsd.port.mk>
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1999/12/05 15:23:20 jakob Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/11 01:10:04 espie Exp $

 DISTNAME=	tgif-4.1.25
 CATEGORIES=	graphics
@ -17,12 +17,12 @@ DEMO_FILES=	an-sr-flip-flop.obj launch-demo-1.obj \
 READMES=	Copyright HISTORY README

 post-extract:
-	@${RM} -f ${WRKDIR}/${DISTNAME}/Tgif.tmpl
-	@${CP} ${WRKDIR}/${DISTNAME}/Tgif.tmpl-freebsd \
+	@rm -f ${WRKDIR}/${DISTNAME}/Tgif.tmpl
+	@cp ${WRKDIR}/${DISTNAME}/Tgif.tmpl-freebsd \
 		${WRKDIR}/${DISTNAME}/Tgif.tmpl

 post-install:
-	@${MKDIR} ${TGIFDOC}
+	@mkdir -p ${TGIFDOC}
 	(cd ${WRKSRC} ;\
 		${INSTALL_DATA} ${DEMO_FILES} ${TGIFDOC} ;\
 		${INSTALL_DATA} ${READMES} ${TGIFDOC} ;)
--- a/japanese/Wnn/Makefile
+++ b/japanese/Wnn/Makefile
@ -5,7 +5,7 @@
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
 # $FreeBSD: Makefile,v 1.19 1997/09/23 02:17:58 max Exp $
-# $OpenBSD: Makefile,v 1.6 2000/02/11 00:37:26 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/11 01:10:04 espie Exp $

 NEED_VERSION=	1.116
 DISTNAME=	Wnn4.2
@ -59,8 +59,8 @@ post-patch:
 pre-build:
 	for file in ${WRKSRC}/config/Project.tmpl \
 		${WRKSRC}/Contrib/dic/gerodic/Makefile; do \
-	  ${MV} $$file $$file.orig2; \
-	  ${SED} 's!^\([ ]*PREFIX = \).*$$!\1${PREFIX}!' \
+	  mv $$file $$file.orig2; \
+	  sed 's!^\([ ]*PREFIX = \).*$$!\1${PREFIX}!' \
 		$$file.orig2 > $$file; \
 	done

@ -80,7 +80,7 @@ post-install:
 		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 .if !defined(NOPORTDOCS)
 .if defined(PORT_DOCDIR)
-	${MKDIR} ${PORT_DOCDIR}
+	mkdir -p ${PORT_DOCDIR}
 	@(cd ${DOC_FROM}; tar cvf - manual manual.en | \
 		(cd ${PORT_DOCDIR}; tar xf -))
 	@chown -R bin.bin ${PORT_DOCDIR}
--- a/japanese/onew-wnn4/Makefile
+++ b/japanese/onew-wnn4/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/02/11 00:37:27 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/11 01:10:04 espie Exp $
 #

 DISTNAME=	jvim2.0r+onew2.2.10
@ -52,7 +52,7 @@ LIB_NAME=	libonew${INPUT_METHOD}.a
 PORT_DOCDIR=	${LOCALBASE}/share/doc/ja-onew${INPUT_METHOD}

 post-patch:
-	${SED}	-e 's,%LOCALBASE%,${LOCALBASE},g' \
+	sed	-e 's,%LOCALBASE%,${LOCALBASE},g' \
 		-e 's,%X11BASE%,${X11BASE},g' \
 		${ONEW_CONF} > ${WRKSRC}/ONEW_CONF

@ -60,12 +60,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/libonew.a ${LOCALBASE}/lib/${LIB_NAME}
 .if !defined(NOPORTDOCS)
 .if defined(PORT_DOCDIR)
-	${MKDIR} ${PORT_DOCDIR}
+	mkdir -p ${PORT_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.ONEW ${PORT_DOCDIR}
 .endif
 .endif
 .if defined(WNN6)
-	${MKDIR} ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6
+	mkdir -p ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6
 	for file in 1B_TOUPPER 1B_ZENHIRA 1B_ZENKATA 1B_newTOUPPER \
 			2A_CTRL 2B_DAKUTEN 2B_JIS 2B_ROMKANA 2_TCODE \
 			3B_HANKATA 3B_KATAKANA 3B_ZENKAKU autork \
@ -73,10 +73,10 @@ do-install:
 		${INSTALL_DATA} ${LOCALBASE}/lib/wnn/ja_JP/rk/$${file} \
 			 ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6; \
 	done
-	@${ECHO} "############################################################"
-	@${ECHO} "We install all files in ${LOCALBASE}/lib/wnn/ja_JP/rk/"
-	@${ECHO} "  into new directory ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6/"
-	@${ECHO} "############################################################"
+	@echo "############################################################"
+	@echo "We install all files in ${LOCALBASE}/lib/wnn/ja_JP/rk/"
+	@echo "  into new directory ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6/"
+	@echo "############################################################"
 .endif

 .include <bsd.port.mk>
--- a/lang/Gofer/Makefile
+++ b/lang/Gofer/Makefile
@ -3,7 +3,7 @@
 # Date created:		31 January 1998
 # Whom:			Don Schmidt
 #
-# $OpenBSD: Makefile,v 1.2 2000/02/11 00:37:27 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/11 01:10:04 espie Exp $
 #

 DISTNAME=	gofer230a
@ -19,7 +19,7 @@ LIBDIR=		${PREFIX}/lib/Gofer
 MAN1=		gofer.1

 do-install:
-	${MKDIR} ${LIBDIR}
+	mkdir -p ${LIBDIR}
 	${INSTALL_DATA} ${WRKDIR}/*.prelude ${LIBDIR}
 	${INSTALL_DATA} ${WRKDIR}/src/prelude.h ${LIBDIR}
 	${INSTALL_DATA} ${WRKDIR}/src/gofc.h ${LIBDIR}
@ -30,7 +30,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/src/gofer ${LIBDIR}
 	${INSTALL_PROGRAM} ${WRKDIR}/src/gofc ${LIBDIR}
 	${INSTALL_MAN} ${WRKDIR}/docs/gofer.1 ${PREFIX}/man/man1
-	${MKDIR} ${LIBDIR}/docs
+	mkdir -p ${LIBDIR}/docs
 	${INSTALL_DATA} ${WRKDIR}/docs/* ${LIBDIR}/docs

 .include <bsd.port.mk>
--- a/lang/egcs/stable/Makefile
+++ b/lang/egcs/stable/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2000/02/02 17:02:39 espie Exp $
+# $OpenBSD: Makefile,v 1.26 2000/02/11 01:10:04 espie Exp $

 # This is a configuration file for egcs, stable release.

@ -127,7 +127,7 @@ MASTER_SITES+= ftp://linux.cis.nctu.edu.tw/pub/packages/pcg/${DIRECTORY}
 pre-fetch:
 .if (${MACHINE_ARCH} == "i386")
 	@(cd /tmp && /usr/bin/as -k ${FILESDIR}/gas-bug/test-i386-gas.s) || \
-	(${ECHO} "Your gas has a bug, see ${FILESDIR}/gas-bug for details"; ${FALSE})
+	(echo "Your gas has a bug, see ${FILESDIR}/gas-bug for details"; exit 1)
 .endif

 #### 
@ -153,9 +153,9 @@ PATCH_LIST+=patch-java-*
 # get openbsd configuration files where they should be
 post-patch:
 		# avoid packaging include copies along...
-	find ${WRKSRC} -name \*.orig|xargs ${RM}
-	${CP} -R ${FILESDIR}/config/* ${WRKSRC}
-	${RM} -rf ${WRKSRC}/texinfo 
+	find ${WRKSRC} -name \*.orig|xargs rm
+	cp -R ${FILESDIR}/config/* ${WRKSRC}
+	rm -rf ${WRKSRC}/texinfo 
 # rebuild configure files after patching, then move source around !!!
 # XXX: don't try to autoconf the main configure file, it's not autoconf.
 	cd ${WRKSRC}/gcc && PATH=${PORTPATH} autoreconf
@ -222,7 +222,7 @@ do-build:
 	@(cd ${WRKBUILD}; \
 	${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET} 2>warnings) || \
 	(echo "*** Make bootstrap failed."; \
-	echo "*** Look at ${WRKBUILD}/warnings for errors"; ${FALSE})
+	echo "*** Look at ${WRKBUILD}/warnings for errors"; exit 1)

 ####
 # Install & tests section 
@ -236,8 +236,8 @@ post-build:
 	@(cd ${WRKBUILD}; ulimit -c 0; \
 	${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${MAKEFILE} check && \
 	${WRKSRC}/contrib/test_summary >${TEST_RESULT})
-	@${ECHO} "Please send the tests results to the egcs project"
-	@${ECHO} "By invoking make send-results"
+	@echo "Please send the tests results to the egcs project"
+	@echo "By invoking make send-results"

 send-results: 
 	[ -f ${TEST_RESULT} ] && sh ${TEST_RESULT}
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 1999/03/22 05:49:07 brad Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/11 01:10:05 espie Exp $

 DISTNAME=	guile-1.3
 CATEGORIES=	lang
@ -15,7 +15,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static

 post-install:
-	@${MKDIR} ${LOCALBASE}/share/aclocal/
+	@mkdir -p ${LOCALBASE}/share/aclocal/
 	@${INSTALL_DATA} ${WRKSRC}/guile.m4 ${LOCALBASE}/share/aclocal/
 	@${INSTALL_DATA} ${WRKSRC}/qthreads.m4 ${LOCALBASE}/share/aclocal/
 	${LDCONFIG} -m ${PREFIX}/lib
--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1999/11/05 03:12:02 kevlo Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/11 01:10:05 espie Exp $

 DISTNAME=	asmail-0.50
 CATEGORIES=	mail x11
@ -25,7 +25,7 @@ post-install:
 .for pixmap in ${PIXMAPS}
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/${pixmap} ${PREFIX}/include/X11/pixmaps
 .endfor
-	${MKDIR} ${PREFIX}/share/doc/asmail
+	mkdir -p ${PREFIX}/share/doc/asmail
 	${INSTALL_DATA} ${WRKSRC}/sample.asmailrc ${PREFIX}/share/doc/asmail
 	strip ${PREFIX}/bin/asmail

--- a/mail/checkpassword/Makefile
+++ b/mail/checkpassword/Makefile
@ -17,7 +17,7 @@ INSTALL_TARGET=	setup check
 NO_MTREE=	yes

 pre-build:
-	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	@${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
+	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@echo ${PREFIX} > ${WRKSRC}/conf-home

 .include <bsd.port.mk>
--- a/mail/dot-forward/Makefile
+++ b/mail/dot-forward/Makefile
@ -22,7 +22,7 @@ NO_MTREE=	yes
 RUN_DEPENDS=	${PREFIX}/bin/qmail-local:${PORTSDIR}/mail/qmail

 pre-build:
-	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	@${ECHO} ${PREFIX} > ${WRKSRC}/conf-qmail
+	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@echo ${PREFIX} > ${WRKSRC}/conf-qmail

 .include <bsd.port.mk>
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/01/26 11:54:13 peter Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/11 01:10:05 espie Exp $
 #

 DISTNAME=	exim-3.12
@ -10,9 +10,9 @@ MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
 DISTFILES=	exim-3.12.tar.gz exim-texinfo-3.10.tar.gz

 do-configure:
-	@${MKDIR} ${WRKSRC}/Local
-	@${CP} ${FILESDIR}/Makefile ${WRKSRC}/Local
-	@${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
+	@mkdir -p ${WRKSRC}/Local
+	@cp ${FILESDIR}/Makefile ${WRKSRC}/Local
+	@cp ${FILESDIR}/eximon.conf ${WRKSRC}/Local
 	@(cd ${WRKSRC}/doc ; \
 	for i in ../../exim-texinfo-3.10/doc/* ; do \
 		ln -sf $$i ; \
@ -23,7 +23,7 @@ pre-install:
 #	${INSTALL} -d /var/log/exim

 post-install:
-	@${CP} ${WRKSRC}/src/configure.default /etc/exim/configure.sample
+	@cp ${WRKSRC}/src/configure.default /etc/exim/configure.sample
 	@echo "EXIM is installed. You must now edit /etc/exim/configure"
 	@echo "and set the correct values for your system."
 	@echo
--- a/mail/ezmlm/Makefile
+++ b/mail/ezmlm/Makefile
@ -22,9 +22,9 @@ NO_MTREE=	yes
 RUN_DEPENDS=	${QMAILDIR}/bin/qmail-local:${PORTSDIR}/mail/qmail

 pre-build:
-	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	@${ECHO} ${PREFIX}/bin > ${WRKSRC}/conf-bin
-	@${ECHO} ${PREFIX}/man > ${WRKSRC}/conf-man
-	@${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
+	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@echo ${PREFIX}/bin > ${WRKSRC}/conf-bin
+	@echo ${PREFIX}/man > ${WRKSRC}/conf-man
+	@echo ${QMAILDIR} > ${WRKSRC}/conf-qmail

 .include <bsd.port.mk>
--- a/mail/fastforward/Makefile
+++ b/mail/fastforward/Makefile
@ -22,7 +22,7 @@ NO_MTREE=	yes
 RUN_DEPENDS=	${PREFIX}/bin/qmail-local:${PORTSDIR}/mail/qmail

 pre-build:
-	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	@${ECHO} ${PREFIX} > ${WRKSRC}/conf-qmail
+	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@echo ${PREFIX} > ${WRKSRC}/conf-qmail

 .include <bsd.port.mk>
--- a/mail/mess822/Makefile
+++ b/mail/mess822/Makefile
@ -22,8 +22,8 @@ NO_MTREE=	yes
 RUN_DEPENDS=	${QMAILDIR}/bin/qmail-local:${PORTSDIR}/mail/qmail

 pre-build:
-	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	@${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
-	@${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
+	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@echo ${PREFIX} > ${WRKSRC}/conf-home
+	@echo ${QMAILDIR} > ${WRKSRC}/conf-qmail

 .include <bsd.port.mk>
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2000/01/28 12:43:40 kevlo Exp $
+# $OpenBSD: Makefile,v 1.2 2000/02/11 01:10:06 espie Exp $

 DISTNAME=	qmail-1.03
 CATEGORIES=	mail
@ -27,13 +27,13 @@ SETUPFILES=	${WRKSRC}/config	${WRKSRC}/config-fast	\
 		${WRKSRC}/ipmeprint	${WRKSRC}/install

 pre-build:
-	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	@${ECHO} ${PREFIX} > ${WRKSRC}/conf-qmail
+	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@echo ${PREFIX} > ${WRKSRC}/conf-qmail
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${DISTNAME} PRE-INSTALL

 post-install:
-	@${MKDIR} ${PREFIX}/setup
-	@${CP} ${SETUPFILES} ${PREFIX}/setup
+	@mkdir -p ${PREFIX}/setup
+	@cp ${SETUPFILES} ${PREFIX}/setup
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL

 .include <bsd.port.mk>
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@ -24,7 +24,7 @@ NO_MTREE=	yes
 RUN_DEPENDS=	${QMAILDIR}/bin/qmail-local:${PORTSDIR}/mail/qmail

 pre-build:
-	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	@${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
+	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@echo ${PREFIX} > ${WRKSRC}/conf-home

 .include <bsd.port.mk>
--- a/mail/rblsmtpd/Makefile
+++ b/mail/rblsmtpd/Makefile
@ -21,7 +21,7 @@ NO_MTREE=	yes
 RUN_DEPENDS=	tcpserver:${PORTSDIR}/net/ucspi-tcp

 pre-build:
-	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	@${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
+	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@echo ${PREFIX} > ${WRKSRC}/conf-home

 .include <bsd.port.mk>
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@ -23,8 +23,8 @@ RUN_DEPENDS=	tcpclient:${PORTSDIR}/net/ucspi-tcp
 RUN_DEPENDS+=	${QMAILDIR}/bin/qmail-local:${PORTSDIR}/mail/qmail/qmail

 pre-build:
-	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	@${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
-	@${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
+	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@echo ${PREFIX} > ${WRKSRC}/conf-home
+	@echo ${QMAILDIR} > ${WRKSRC}/conf-qmail

 .include <bsd.port.mk>
--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1999/10/26 04:56:37 turan Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/11 01:10:06 espie Exp $

 BROKEN=		bad packing lists

@ -20,7 +20,7 @@ pre-configure:
 	@ln -sf ../sounds ${WRKSRC}

 pre-install:
-	@${MKDIR} ${LOCALBASE}/share/sounds
-	@${MKDIR} ${X11BASE}/include/X11/pixmaps
+	@mkdir -p ${LOCALBASE}/share/sounds
+	@mkdir -p ${X11BASE}/include/X11/pixmaps

 .include <bsd.port.mk>
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1999/04/09 02:27:16 brad Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/11 01:10:06 espie Exp $
 # $NetBSD: Makefile,v 1.2 1998/07/04 09:19:04 mycroft Exp $
 #

@ -18,10 +18,10 @@ USE_X11=	YES
 GNU_CONFIGURE=	YES

 pre-configure:
-	@${CP} -f ${FILESDIR}/config.cache ${WRKSRC}
+	@cp -f ${FILESDIR}/config.cache ${WRKSRC}

 post-install:
-	${MKDIR} ${PREFIX}/share/doc/xfmail
+	mkdir -p ${PREFIX}/share/doc/xfmail
 	${INSTALL_DATA} ${WRKSRC}/Copyright ${PREFIX}/share/doc/xfmail

 .include <bsd.port.mk>
--- a/math/maple/Makefile
+++ b/math/maple/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/10 09:38:03 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/11 01:10:06 espie Exp $
 # Original from: Marc Espie
 # XXX This port installs in a somewhat unusual way.

@ -55,14 +55,14 @@ do-fetch:
 			mkdir -p ${FULLDISTDIR}/`dirname $$file`;\
 			ln -sf ${CDROM}/$$file ${FULLDISTDIR}/$$file;\
 		else\
-			${ECHO} "File $$file not found. Is your cdrom mounted as ${CDROM} ?";\
+			echo "File $$file not found. Is your cdrom mounted as ${CDROM} ?";\
 		fi\
 	done

 MAPLE_SCRIPTS=maple march mint updtsrc xmaple

 do-install:
-	@mkdir -p ${MAPLE_DIR} || ${ECHO} "${MAPLE_DIR} already exists"
+	@mkdir -p ${MAPLE_DIR} || echo "${MAPLE_DIR} already exists"
 	@cd ${MAPLE_DIR} && yes | ${FULLDISTDIR}/install
 	@echo "But this installation script does it for you"
 	@for file in ${MAPLE_SCRIPTS}; do\
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2000/02/11 00:37:29 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/11 01:10:07 espie Exp $

 DISTNAME=	imm.source
 PKGNAME=	imm-3.5a1
@ -17,9 +17,9 @@ USE_X11=	yes
 WRKDIST=		${WRKDIR}/mnm

 post-extract:
-	@${MKDIR} ${WRKSRC}/openbsd
-	@${CP} ${FILESDIR}/Makefile.work ${WRKSRC}/Makefile
-	@${CP} ${FILESDIR}/Makefile.openbsd ${WRKSRC}/src
+	@mkdir -p ${WRKSRC}/openbsd
+	@cp ${FILESDIR}/Makefile.work ${WRKSRC}/Makefile
+	@cp ${FILESDIR}/Makefile.openbsd ${WRKSRC}/src

 # The included makefile doesn't have an "install" target.
 do-install:
@ -28,7 +28,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/openbsd/lscomp ${PREFIX}/bin
 # and no man pages at all yet.
 # But include the very limited documentation
-	@${MKDIR} ${PREFIX}/share/doc/imm
+	@mkdir -p ${PREFIX}/share/doc/imm
 .if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/imm
 	${INSTALL_DATA} ${WRKSRC}/imm_readme.txt ${PREFIX}/share/doc/imm
--- a/mbone/rtptools/Makefile
+++ b/mbone/rtptools/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1999/09/02 21:52:50 brad Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/11 01:10:07 espie Exp $

 DISTNAME=	rtptools-1.9
 CATEGORIES=	mbone
@ -12,15 +12,15 @@ BINFILES=	rtpdump rtpplay rtpsend rtptrans
 DOCFILES=	README CHANGES.html rtptools.html

 post-extract:
-	@${LN} -s ${WRKSRC}/freebsd ${WRKSRC}/openbsd
-	@${LN} -s ${WRKSRC}/Makefile.freebsd ${WRKSRC}/Makefile.openbsd
+	@ln -s ${WRKSRC}/freebsd ${WRKSRC}/openbsd
+	@ln -s ${WRKSRC}/Makefile.freebsd ${WRKSRC}/Makefile.openbsd

 do-install:
 .for i in ${BINFILES}
 	${INSTALL_PROGRAM} ${WRKSRC}/openbsd/${i} ${PREFIX}/bin
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/rtptools
+	mkdir -p ${PREFIX}/share/doc/rtptools
 .for i in ${DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/rtptools
 .endfor
--- a/mbone/speak_freely/Makefile
+++ b/mbone/speak_freely/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1999/09/21 15:22:53 brad Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/11 01:10:07 espie Exp $

 DISTNAME=	speak_freely-7.1
 CATEGORIES=	mbone audio security
@ -16,7 +16,7 @@ MAKE_ENV+=	CCFLAGS=-DM_LITTLE_ENDIAN
 .endif

 post-install:
-	@${MKDIR} ${PREFIX}/lib/speak_freely
+	@mkdir -p ${PREFIX}/lib/speak_freely
 	@$(INSTALL_DATA) ${WRKSRC}/busy.au ${WRKSRC}/ring.au \
 		${PREFIX}/lib/speak_freely

--- a/misc/cdrecord/Makefile
+++ b/misc/cdrecord/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 1999/09/27 02:56:52 niklas Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/11 01:10:07 espie Exp $

 DISTNAME=	cdrecord-1.6.1
 CATEGORIES=	misc
@ -17,7 +17,7 @@ MAKE_ENV=	MAKEPROG=gmake
 # we instead explicitly install what we want.
 OBJDIR=		OBJ/${MACHINE}-openbsd-$(CC)
 do-install:
-	@${MKDIR} ${PREFIX}/share/doc/cdrecord
+	@mkdir -p ${PREFIX}/share/doc/cdrecord
 	${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/${OBJDIR}/cdrecord ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cdrecord
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@ -3,8 +3,8 @@
 # Date created:		July 13 1999
 # Whom:			Angelos D. Keromytis
 #
-# $Id: Makefile,v 1.3 1999/11/03 05:24:13 kevlo Exp $
-# $OpenBSD: Makefile,v 1.3 1999/11/03 05:24:13 kevlo Exp $
+# $Id: Makefile,v 1.4 2000/02/11 01:10:07 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2000/02/11 01:10:07 espie Exp $
 #

 DISTNAME=	magicpoint-1.05a
@ -48,11 +48,11 @@ SAMPLES=	README README.jp cloud.gif dad.eps dad.gif default.mgp \
 post-install:
 	(cd ${WRKSRC}/contrib/xmindpath; make install)
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/mgp
+	mkdir -p ${PREFIX}/share/doc/mgp
 	for i in $(DOCS); do \
 		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/mgp; \
 	done
-	${MKDIR} ${PREFIX}/share/doc/mgp/sample
+	mkdir -p ${PREFIX}/share/doc/mgp/sample
 	for i in $(SAMPLES); do \
 		${INSTALL_DATA} ${WRKSRC}/sample/$$i ${PREFIX}/share/doc/mgp/sample; \
 	done
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@ -3,7 +3,7 @@
 # Date created:         May 20 1998
 # Whom:                 Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.1.1.1 1998/05/20 08:12:40 angelos Exp $
+# $OpenBSD: Makefile,v 1.2 2000/02/11 01:10:07 espie Exp $
 #

 DISTNAME=	tkman-2.0.6
@ -19,7 +19,7 @@ RUN_DEPENDS=	rman:${PORTSDIR}/textproc/rman \

 .if !defined(NOPORTDOCS)
 post-install:
-	@${MKDIR} ${PREFIX}/share/doc/tkman
+	@mkdir -p ${PREFIX}/share/doc/tkman
 	${INSTALL_DATA} ${WRKSRC}/tkman-help.html ${PREFIX}/share/doc/tkman
 .endif

--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1999/06/22 00:31:38 brad Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/11 01:10:08 espie Exp $

 DISTNAME=	arpwatch-2.1a4
 CATEGORIES=	net
@ -15,7 +15,7 @@ INSTALL_TARGET=	install install-man

 post-install:
 	@if [ ! -d ${PREFIX}/arpwatch ]; then \
-		${MKDIR} ${PREFIX}/arpwatch; \
+		mkdir -p ${PREFIX}/arpwatch; \
 		chmod 775 ${PREFIX}/arpwatch; \
 		chown root.operator ${PREFIX}/arpwatch;	\
 	fi
--- a/net/bing/Makefile
+++ b/net/bing/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1999/04/06 19:52:48 rohee Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/11 01:10:08 espie Exp $
 # Original from: Ejovi Nuwere <ejovi@ejovi.net>

 DISTNAME=	bing-1.0.4
@ -11,7 +11,7 @@ MAN8= 		bing.8

 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/bing
+	@mkdir -p ${PREFIX}/share/doc/bing
 	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/bing
 .endif

--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@ -3,7 +3,7 @@
 # Date created:		26 Mar 1999
 # Whom:                 Jim Mock <jim@FreeBSD.org>
 #
-# $OpenBSD: Makefile,v 1.1.1.1 1999/12/14 05:22:46 dugsong Exp $
+# $OpenBSD: Makefile,v 1.2 2000/02/11 01:10:08 espie Exp $

 DISTNAME=	gaim-0.9.10

@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --disable-esd

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gaim ${PREFIX}/bin
-	@${ECHO} "===>  Installing pixmaps"
+	@echo "===>  Installing pixmaps"
 	${INSTALL_DATA_DIR} ${PREFIX}/share/gaim/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/share/gaim/pixmaps

--- a/net/icmpinfo/Makefile
+++ b/net/icmpinfo/Makefile
@ -3,7 +3,7 @@
 # Date created:			  Mon June 23, 1997
 # Whom:				  Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.1.1.1 1998/04/29 02:53:28 angelos Exp $
+# $OpenBSD: Makefile,v 1.2 2000/02/11 01:10:08 espie Exp $
 #

 DISTNAME=	icmpinfo-1.11
@ -21,7 +21,7 @@ do-install:
 	/bin/chmod 4555 ${PREFIX}/bin/icmpinfo
 	${INSTALL_MAN} ${WRKSRC}/icmpinfo.man ${PREFIX}/man/man1/${MAN1}
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/icmpinfo
+	@mkdir -p ${PREFIX}/share/doc/icmpinfo
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/icmpinfo
 .endif

--- a/net/irc/Makefile
+++ b/net/irc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1999/03/10 17:45:51 brad Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/11 01:10:09 espie Exp $
 # $FreeBSD: Makefile,v 1.19 1998/12/09 20:15:29 billf Exp $

 DISTNAME=       irc2.10.1
@ -30,8 +30,8 @@ MAN8=           ircd.8 iauth.8 ircdwatch.8
 GNU_CONFIGURE=	yes

 post-patch:
-	${SED} -e s,!!SYSLOG_FACILITY!!,$(SYSLOG_FACILITY), $(WRKSRC)/support/config.h.dist > $(WRKSRC)/support/config.h.dist.new
-	${MV} $(WRKSRC)/support/config.h.dist.new $(WRKSRC)/support/config.h.dist
+	sed -e s,!!SYSLOG_FACILITY!!,$(SYSLOG_FACILITY), $(WRKSRC)/support/config.h.dist > $(WRKSRC)/support/config.h.dist.new
+	mv $(WRKSRC)/support/config.h.dist.new $(WRKSRC)/support/config.h.dist

 do-build:
 	@(cd ${WRKSRC}/`${WRKSRC}/support/config.guess` && \
@ -42,8 +42,8 @@ do-install:
 	 ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})

 pre-install:
-	@${MKDIR} ${PREFIX}/lib/ircd
-	@${TOUCH} ${PREFIX}/lib/ircd/users ${PREFIX}/lib/ircd/opers \
+	@mkdir -p ${PREFIX}/lib/ircd
+	@touch ${PREFIX}/lib/ircd/users ${PREFIX}/lib/ircd/opers \
 		${PREFIX}/lib/ircd/rejects

 .include <bsd.port.mk>
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@ -1,6 +1,6 @@
 #
 # $FreeBSD: ports/net/nam/Makefile,v 1.3 1999/11/29 03:46:08 steve Exp $
-# $OpenBSD: Makefile,v 1.2 2000/02/11 00:37:33 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/11 01:10:09 espie Exp $
 #

 DISTNAME=	nam-src-1.0a7
@ -23,6 +23,6 @@ ALL_TARGET=
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nam ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/nam.1 ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/examples/nam
+	mkdir -p ${PREFIX}/share/examples/nam
 	${INSTALL_DATA} ${WRKSRC}/ex/* ${PREFIX}/share/examples/nam
 .include <bsd.port.mk>
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@ -1,6 +1,6 @@
 #
 # $FreeBSD: ports/net/ns/Makefile,v 1.3 1999/11/28 18:31:26 steve Exp $
-# $OpenBSD: Makefile,v 1.2 2000/02/11 00:37:33 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/11 01:10:09 espie Exp $
 #

 DISTNAME=	ns-src-2.1b5
@ -24,6 +24,6 @@ ALL_TARGET=
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/ns.1 ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/examples/ns2
+	mkdir -p ${PREFIX}/share/examples/ns2
 	${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${PREFIX}/share/examples/ns2
 .include <bsd.port.mk>
--- a/net/pchar/Makefile
+++ b/net/pchar/Makefile
@ -3,7 +3,7 @@
 # Date created:			  Thu Dec 16, 1999
 # Whom:				  Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.2 2000/01/24 23:42:04 angelos Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/11 01:10:09 espie Exp $
 # $FreeBSD: ports/net/pchar/Makefile,v 1.1.1.1 1999/11/04 08:33:26 obrien Exp $
 #

@ -21,7 +21,7 @@ do-install:
 	@/usr/bin/perl -pi.orig -e 's/pchar 1/pchar 8/g' ${WRKSRC}/pchar.8
 	${INSTALL_MAN} ${WRKSRC}/pchar.8 ${PREFIX}/man/man8/pchar.8
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/pchar
+	@mkdir -p ${PREFIX}/share/doc/pchar
 	cd ${WRKSRC} ; ${INSTALL_DATA} README FAQ ${PREFIX}/share/doc/pchar
 .endif

--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1999/09/21 19:32:01 brad Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/11 01:10:10 espie Exp $
 # $FreeBSD: Makefile,v 1.1.1.1 1998/04/04 04:58:25 obrien Exp $

 DISTNAME=	sniffit.0.3.5
@ -21,7 +21,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sniffit ${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/sniffit.5 ${PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/sniffit.8 ${PREFIX}/man/man8
-	${MKDIR} ${PREFIX}/share/doc/sniffit
+	mkdir -p ${PREFIX}/share/doc/sniffit
 	${INSTALL_MAN} ${WRKSRC}/README.FIRST ${PREFIX}/share/doc/sniffit

 .include <bsd.port.mk>
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2000/02/03 03:58:54 kevlo Exp $
+# $OpenBSD: Makefile,v 1.2 2000/02/11 01:10:10 espie Exp $

 DISTNAME=	snort-1.5.1
 CATEGORIES=	net security
@ -15,6 +15,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/snort.8 ${PREFIX}/man/man8
 	${INSTALL_DATA_DIR} ${PREFIX}/share/snort
 	${INSTALL_DATA} ${WRKSRC}/*-lib ${PREFIX}/share/snort
-	@${ECHO} "===> Rule examples installed in ${PREFIX}/share/snort"
+	@echo "===> Rule examples installed in ${PREFIX}/share/snort"

 .include <bsd.port.mk>
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1999/10/29 09:40:16 turan Exp $
+# $OpenBSD: Makefile,v 1.4 2000/02/11 01:10:10 espie Exp $
 #

 DISTNAME=	ucd-snmp-3.6.2
@ -34,7 +34,7 @@ SBIN=		snmpd snmptrapd
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
 	( cd ${PREFIX}/sbin; strip ${SBIN} )
-	@${MKDIR} ${PREFIX}/share/examples/ucd-snmp
+	@mkdir -p ${PREFIX}/share/examples/ucd-snmp
 	@for F in ${WRKSRC}/etc/* ; do \
 		${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done

--- a/net/ucspi-tcp/Makefile
+++ b/net/ucspi-tcp/Makefile
@ -19,7 +19,7 @@ INSTALL_TARGET=	setup check
 NO_MTREE=	yes

 pre-build:
-	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	@${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
+	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@echo ${PREFIX} > ${WRKSRC}/conf-home

 .include <bsd.port.mk>
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2000/02/11 00:37:34 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/11 01:10:10 espie Exp $
 # $FreeBSD: Makefile,v 1.10 1999/02/18 16:05:47 steve Exp $

 DISTNAME=       vnc-3.3.2r3_unixsrc
@ -25,16 +25,16 @@ post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
 	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
 	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
-	${SED}  -e s%/usr/local/vnc/classes%${PREFIX}/share/vnc/classes% \
+	sed  -e s%/usr/local/vnc/classes%${PREFIX}/share/vnc/classes% \
 		< ${WRKSRC}/vncserver \
 		> ${WRKSRC}/vncserver.local
 	${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver
 # The documentation comes with bogus ownerships; this is a little leaky security-wise
-	${MKDIR} ${PREFIX}/share/doc/vnc
+	mkdir -p ${PREFIX}/share/doc/vnc
 	tar -C ${PREFIX}/share/doc/vnc -xzf ${DISTDIR}/vnc-3.3.2_doc.tgz
 	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/vnc
 # Go install Java classes
-	${MKDIR} ${PREFIX}/share/vnc
-	${CP} -R ${WRKSRC}/classes ${PREFIX}/share/vnc
+	mkdir -p ${PREFIX}/share/vnc
+	cp -R ${WRKSRC}/classes ${PREFIX}/share/vnc

 .include <bsd.port.mk>
--- a/net/wide-dhcp/Makefile
+++ b/net/wide-dhcp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1999/04/09 04:11:52 brad Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/11 01:10:10 espie Exp $

 DISTNAME=       dhcp-1.4.0p3
 PKGNAME=        wide-dhcp-1.4.0.3
@ -13,18 +13,18 @@ MAKE_ENV=	OSTYPE=`uname`
 post-install:
 .if !defined(NOPORTDOCS)
 	@if [ ! -d ${PREFIX}/share/doc/dhcp ]; then \
-		${MKDIR} ${PREFIX}/share/doc/dhcp; \
+		mkdir -p ${PREFIX}/share/doc/dhcp; \
 	fi
 	@if [ ! -d ${PREFIX}/share/examples/dhcp ]; then \
-		${MKDIR} ${PREFIX}/share/examples/dhcp; \
+		mkdir -p ${PREFIX}/share/examples/dhcp; \
 	fi
-	@${CP} ${WRKSRC}/README ${PREFIX}/share/doc/dhcp/
-	@${CP} ${WRKSRC}/README.jis ${PREFIX}/share/doc/dhcp/
-	@${CP} ${WRKSRC}/db_sample/dhcpdb.pool ${PREFIX}/share/examples/dhcp/dhcpdb.pool.sample
-	@${CP} ${WRKSRC}/db_sample/dhcpdb.relay ${PREFIX}/share/examples/dhcp/dhcpdb.relay.sample
-	@${CP} ${WRKSRC}/db_sample/dhcpdb.server ${PREFIX}/share/examples/dhcp/dhcpdb.server.sample
-	@${CP} ${WRKSRC}/db_sample/intro.dhcp ${PREFIX}/share/doc/dhcp/
-	@${CP} ${WRKSRC}/db_sample/intro.dhcp.jis ${PREFIX}/share/doc/dhcp/
+	@cp ${WRKSRC}/README ${PREFIX}/share/doc/dhcp/
+	@cp ${WRKSRC}/README.jis ${PREFIX}/share/doc/dhcp/
+	@cp ${WRKSRC}/db_sample/dhcpdb.pool ${PREFIX}/share/examples/dhcp/dhcpdb.pool.sample
+	@cp ${WRKSRC}/db_sample/dhcpdb.relay ${PREFIX}/share/examples/dhcp/dhcpdb.relay.sample
+	@cp ${WRKSRC}/db_sample/dhcpdb.server ${PREFIX}/share/examples/dhcp/dhcpdb.server.sample
+	@cp ${WRKSRC}/db_sample/intro.dhcp ${PREFIX}/share/doc/dhcp/
+	@cp ${WRKSRC}/db_sample/intro.dhcp.jis ${PREFIX}/share/doc/dhcp/
 .endif
 	@echo "***"
 	@echo "*** Don't forget to enable kernel BPF support!"
--- a/news/plor/Makefile
+++ b/news/plor/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1999/04/06 19:48:00 rohee Exp $
+# $OpenBSD: Makefile,v 1.4 2000/02/11 01:10:10 espie Exp $
 # Original from: Ejovi Nuwere <ejovi@ejovi.net>

 DISTNAME=	plor-0.3.2
@ -15,7 +15,7 @@ DOCFILES=	../AUTHORS ../NEWS TODO plor-1.html plor-2.html \

 post-install:
 .if !defined{NOPORTDOCS}
-	@${MKDIR} ${PREFIX}/share/doc/plor
+	@mkdir -p ${PREFIX}/share/doc/plor
 .for f in ${DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${PREFIX}/share/doc/plor
 .endfor
--- a/plan9/rc/Makefile
+++ b/plan9/rc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1999/11/30 00:48:44 brad Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/11 01:10:11 espie Exp $

 WITH_EDITLINE=	yes
 DISTNAME=	rc-1.6
@ -38,7 +38,7 @@ pre-fetch:

 pre-configure:
 .if defined(WITH_EDITLINE) && ${WITH_EDITLINE:U} == YES
-	@${ECHO_MSG} "===>  Compiling editline"
+	@echo "===>  Compiling editline"
 	(cd ${EDITLINE} && make)
 .endif

--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2000/02/11 00:37:35 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2000/02/11 01:10:11 espie Exp $

 DISTNAME=	ghostscript-5.10
 CATEGORIES=	print
@ -66,17 +66,17 @@ pre-fetch:
 .endif

 post-extract:
-	@${TOUCH} ${WRKSRC}/adler32.c
-	@${TOUCH} ${WRKSRC}/deflate.c
-	@${TOUCH} ${WRKSRC}/trees.c
-	@${TOUCH} ${WRKSRC}/adler32.o
-	@${TOUCH} ${WRKSRC}/deflate.o
-	@${TOUCH} ${WRKSRC}/trees.o
-	@${LN} -sf ${JPEG_DIR} ${WRKSRC}/jpeg-6b
-	@${LN} -sf ${PNG_DIR} ${WRKSRC}/libpng
-	@cd ${WRKSRC} && ${MV} devs.mak devs.mak.keep
+	@touch ${WRKSRC}/adler32.c
+	@touch ${WRKSRC}/deflate.c
+	@touch ${WRKSRC}/trees.c
+	@touch ${WRKSRC}/adler32.o
+	@touch ${WRKSRC}/deflate.o
+	@touch ${WRKSRC}/trees.o
+	@ln -sf ${JPEG_DIR} ${WRKSRC}/jpeg-6b
+	@ln -sf ${PNG_DIR} ${WRKSRC}/libpng
+	@cd ${WRKSRC} && mv devs.mak devs.mak.keep
 	@cd ${WRKSRC} && ${SETENV} unzip -La ${DISTDIR}/${HP850_DRV}
-	@cd ${WRKSRC} && ${RM} devs.mak && ${MV} devs.mak.keep devs.mak
+	@cd ${WRKSRC} && rm devs.mak && mv devs.mak.keep devs.mak
 	@cp ${DISTDIR}/${PDFENCRYPT} ${WRKSRC}

 do-configure:
@ -89,7 +89,7 @@ do-configure:
 .endif

 pre-install:
-	@${MKDIR} ${PREFIX}/share/ghostscript ${PREFIX}/share/ghostscript/fonts \
+	@mkdir -p ${PREFIX}/share/ghostscript ${PREFIX}/share/ghostscript/fonts \
 		${PREFIX}/bin ${PREFIX}/man/man1
 	(cd ${PREFIX}/share/ghostscript/fonts ; \
 			${TAR} -xzf ${DISTDIR}/${GS_FONTS_STD} ; \
--- a/print/mpage/Makefile
+++ b/print/mpage/Makefile
@ -3,7 +3,7 @@
 # Version required:     mpage 2.5
 # Date created:         August, 10th 1999
 # Whom:                 Ian McWilliam
-# $OpenBSD: Makefile,v 1.3 1999/11/03 01:22:10 turan Exp $
+# $OpenBSD: Makefile,v 1.4 2000/02/11 01:10:11 espie Exp $


 DISTNAME=	mpage-2.5
@ -18,16 +18,16 @@ NO_PACKAGE=	package must be made manually with three paper sizes
 fetch-depends:
 .if !defined(NO_WARNINGS)
 .if !defined(PAGESIZE)
-	@${ECHO} ""
-	@${ECHO} You must define your favorite page size:
-	@${ECHO} PAGE_LETTER for US letter
-	@${ECHO} PAGE_LEGAL for legal
-	@${ECHO} PAGE_A4 for European/Australian A4
-	@${ECHO} ""
-	@${ECHO} by setting the enivonment variable PAGESIZE=PAGE_A4
-	@${ECHO} or by the command \"make PAGESIZE=PAGE_A4\"
-	@${ECHO} ""
-	@${FALSE}
+	@echo ""
+	@echo You must define your favorite page size:
+	@echo PAGE_LETTER for US letter
+	@echo PAGE_LEGAL for legal
+	@echo PAGE_A4 for European/Australian A4
+	@echo ""
+	@echo by setting the enivonment variable PAGESIZE=PAGE_A4
+	@echo or by the command \"make PAGESIZE=PAGE_A4\"
+	@echo ""
+	@exit 1
 .endif
 .endif

--- a/print/pkfonts/Makefile
+++ b/print/pkfonts/Makefile
@ -2,7 +2,7 @@
 # Date created:		May 17 1998
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.4 1999/10/31 06:27:48 turan Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/11 01:10:11 espie Exp $
 #

 NEED_VERSION=	1.116
@ -49,12 +49,12 @@ pre-fetch:
 .endif

 do-extract:
-	${MKDIR} ${WRKDIR}
+	mkdir -p ${WRKDIR}

 do-install:
-	${MKDIR} ${PREFIX}/lib/fonts
+	mkdir -p ${PREFIX}/lib/fonts
 	tar -C ${PREFIX}/lib/fonts -xzf ${FULLDISTDIR}/${DISTFILES}
-	@${CP} ${PKGDIR}/${RESOLUTION}.list ${PKGDIR}/PLIST 
+	@cp ${PKGDIR}/${RESOLUTION}.list ${PKGDIR}/PLIST 

 pre-clean:
 	@rm -f ${PKGDIR}/PLIST  # created by do-install above
--- a/russian/cyrproxy/Makefile
+++ b/russian/cyrproxy/Makefile
@ -1,5 +1,5 @@
 # $FreeBSD: ports/russian/cyrproxy/Makefile,v 1.4 1999/08/31 01:46:57 peter Exp $
-# $OpenBSD: Makefile,v 1.1.1.1 2000/01/26 07:35:48 form Exp $
+# $OpenBSD: Makefile,v 1.2 2000/02/11 01:10:11 espie Exp $

 DISTNAME=		cyrproxy-1.4.2
 CATEGORIES=		russian net www
@ -10,7 +10,7 @@ MAINTAINER=		form@openbsd.org
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/cyrproxy
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cyrproxy
-#	${MKDIR} ${PREFIX}/www/cgi-bin
+#	mkdir -p ${PREFIX}/www/cgi-bin
 	${INSTALL_PROGRAM} ${WRKSRC}/cyrproxy ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/tcpspy ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/cyrcoder/cyrtrans ${PREFIX}/bin
--- a/security/cops/Makefile
+++ b/security/cops/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1999/04/06 19:44:57 rohee Exp $
+# $OpenBSD: Makefile,v 1.4 2000/02/11 01:10:11 espie Exp $
 # Original from: Ejovi Nuwere <ejovi@ejovi.net>

 DISTNAME=	cops_104
@ -27,8 +27,8 @@ do-build:
 	(cd ${WRKSRC} ; make EXECUTABLE="${EXECUTABLE}" C_SRC="${C_SRC}")

 do-install:
-	(cd ${WRKDIR} ; rm -rf ${PREFIX}/cops ; ${MKDIR} ${PREFIX}/cops ; \
-	${CP} -R ${DISTNAME}/* ${PREFIX}/cops ; \
+	(cd ${WRKDIR} ; rm -rf ${PREFIX}/cops ; mkdir -p ${PREFIX}/cops ; \
+	cp -R ${DISTNAME}/* ${PREFIX}/cops ; \
 	chmod -R go-rwx ${PREFIX}/cops ; \
 	rm -rf ${PREFIX}/cops/*.old ${PREFIX}/cops/src)

--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/11 00:37:36 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/11 01:10:12 espie Exp $
 # Original from: Ejovi Nuwere <ejovi@ejovi.net>

 DISTNAME=	crack5.0
@ -19,7 +19,7 @@ pre-configure:
 .if !defined(USE_DES)
 	@/bin/mv -f ${WRKSRC}/src/libdes ${WRKSRC}/src/libdes.notused
 	@/bin/mv -f ${WRKSRC}/src/util/elcid.c ${WRKSRC}/src/util/elcid.c.orig
-	@${CP} -p ${WRKSRC}/src/util/elcid.c,bsd ${WRKSRC}/src/util/elcid.c
+	@cp -p ${WRKSRC}/src/util/elcid.c,bsd ${WRKSRC}/src/util/elcid.c
 .endif

 pre-build:
@ -36,8 +36,8 @@ do-build:
 .endif

 do-install:
-	@${MKDIR} ${PREFIX}/crack
-	@${RM} -f ${WRKSRC}/Run/*
+	@mkdir -p ${PREFIX}/crack
+	@rm -f ${WRKSRC}/Run/*
 	@(cd ${WRKSRC} ; tar cf - . | (cd ${PREFIX}/crack; tar xfBp -))


--- a/security/socks5/Makefile
+++ b/security/socks5/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2000/02/11 00:37:37 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2000/02/11 01:10:12 espie Exp $

 DISTNAME=	socks5-v1.0r10
 PKGNAME=	socks5-1.0.10
@ -35,18 +35,18 @@ MAN5=		libsocks5.conf.5 socks5.conf.5

 do-fetch:
 	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
-	  ${ECHO} ""; \
-	  ${ECHO} "NEC requires that you grab the dist files from their"; \
-	  ${ECHO} "web site at http://www.socks.nec.com.  Please make sure"; \
-	  ${ECHO} "you have ${DISTNAME}${EXTRACT_SUFX} in ${DISTDIR}"; \
-	  ${ECHO} "and run make again."; \
-	  ${ECHO} ""; \
+	  echo ""; \
+	  echo "NEC requires that you grab the dist files from their"; \
+	  echo "web site at http://www.socks.nec.com.  Please make sure"; \
+	  echo "you have ${DISTNAME}${EXTRACT_SUFX} in ${DISTDIR}"; \
+	  echo "and run make again."; \
+	  echo ""; \
 	  exit 1;\
 	fi

 post-install:
-	${MKDIR} ${PREFIX}/lib/socks
-	${MKDIR} ${PREFIX}/share/doc/socks
+	mkdir -p ${PREFIX}/lib/socks
+	mkdir -p ${PREFIX}/share/doc/socks
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/lib/socks
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/socks
 	${LDCONFIG} -m ${PREFIX}/lib
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@ -3,7 +3,7 @@
 # Date created:         17 November 1997
 # Whom:                 gene
 #
-# $OpenBSD: Makefile,v 1.4 1997/12/13 01:03:08 gene Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/11 01:10:12 espie Exp $
 #

 DISTNAME=       es-0.9-alpha1
@ -14,12 +14,12 @@ MASTER_SITES=   ftp://ftp.sys.toronto.edu/pub/es/
 MAINTAINER=	gene@OpenBSD.ORG

 post-install:
-	@$(ECHO)
-	@$(ECHO) "Finished installing $(DISTNAME)"
-	@$(ECHO) "To complete the install, you should notify the system"
-	@$(ECHO) "that $(PREFIX)/bin/es is a valid shell by adding it to"
-	@$(ECHO) "/etc/shells."
-	@$(ECHO) "If you are unfamiliar with this file, consult the shells(5)"
-	@$(ECHO) "manual page."
+	@echo
+	@echo "Finished installing $(DISTNAME)"
+	@echo "To complete the install, you should notify the system"
+	@echo "that $(PREFIX)/bin/es is a valid shell by adding it to"
+	@echo "/etc/shells."
+	@echo "If you are unfamiliar with this file, consult the shells(5)"
+	@echo "manual page."

 .include <bsd.port.mk>
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@ -3,7 +3,7 @@
 # Date created:         17 November 1997
 # Whom:                 gene
 #
-# $OpenBSD: Makefile,v 1.5 1998/04/12 22:26:30 marc Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/11 01:10:12 espie Exp $
 #

 DISTNAME=	scsh-0.5.1
@ -23,14 +23,14 @@ MAN1=		scsh.1
 post-install:
 	(cd ${WRKSRC} ; \
 	 ${INSTALL_DATA} README RELEASE NEWS COPYING ${PREFIX}/lib/scsh/doc)
-	${RM} -f ${PREFIX}/share/doc/scsh
-	$(LN) -fs ${PREFIX}/lib/scsh/doc ${PREFIX}/share/doc/scsh
-	@$(ECHO)
-	@$(ECHO) "Finished installing $(DISTNAME)"
-	@$(ECHO) "To complete the install, you should notify the system"
-	@$(ECHO) "that $(PREFIX)/bin/scsh is a valid shell by adding it to"
-	@$(ECHO) "/etc/shells."
-	@$(ECHO) "If you are unfamiliar with this file, consult the shells(5)"
-	@$(ECHO) "manual page."
+	rm -f ${PREFIX}/share/doc/scsh
+	ln -fs ${PREFIX}/lib/scsh/doc ${PREFIX}/share/doc/scsh
+	@echo
+	@echo "Finished installing $(DISTNAME)"
+	@echo "To complete the install, you should notify the system"
+	@echo "that $(PREFIX)/bin/scsh is a valid shell by adding it to"
+	@echo "/etc/shells."
+	@echo "If you are unfamiliar with this file, consult the shells(5)"
+	@echo "manual page."

 .include <bsd.port.mk>
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@ -3,7 +3,7 @@
 # Date created:		2 Apr 1997
 # Whom:			ejovi
 #
-# $OpenBSD: Makefile,v 1.6 1999/11/17 08:46:13 kevlo Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/11 01:10:12 espie Exp $
 #

 DISTNAME=		LPRng-3.6.12
@ -41,7 +41,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/lpd.perms ${PREFIX}/lib/lpd.perms-sample
 	test -f /etc/lpd.conf || ${INSTALL_DATA} ${WRKSRC}/lpd.conf /etc
 	test -f /etc/lpd.perms || ${INSTALL_DATA} ${WRKSRC}/lpd.perms /etc
-	${MKDIR} ${PREFIX}/share/doc/LPRng
+	mkdir -p ${PREFIX}/share/doc/LPRng
 	(cd ${WRKSRC}/HOWTO && ${INSTALL_DATA} ${HTMLFILES} \
 		${PREFIX}/share/doc/LPRng )
 	@cat ${PKGDIR}/MESSAGE
--- a/sysutils/apc-upsd/Makefile
+++ b/sysutils/apc-upsd/Makefile
@ -2,7 +2,7 @@
 # Date created:         28 Dec 1999
 # Whom:                 Kevin Lo <kevlo@openbsd.org>
 #
-# $OpenBSD: Makefile,v 1.2 2000/02/11 00:37:38 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/11 01:10:12 espie Exp $
 #

 DISTNAME=       apc-upsd
@ -21,7 +21,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/apc-upsd ${PREFIX}/sbin

 post-install:
-	@${MKDIR} ${PREFIX}/share/doc/apc-upsd
+	@mkdir -p ${PREFIX}/share/doc/apc-upsd
 	${INSTALL_DATA} ${WRKSRC}/../doc/smart-protocol ${PREFIX}/share/doc/apc-upsd

 	if [ ! -f /etc/apc-upsd.conf ] ; then \
--- a/sysutils/mkhybrid/Makefile
+++ b/sysutils/mkhybrid/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 1999/04/18 23:52:41 turan Exp $
+# $OpenBSD: Makefile,v 1.2 2000/02/11 01:10:12 espie Exp $
 #
 # Based on FreeBSD port by Murray Stokely <murray@cdrom.com>

@ -17,7 +17,7 @@ post-build:

 post-install:
 	cd ${WRKSRC}/diag && make install
-	${MKDIR} ${PREFIX}/share/mkhybrid
+	mkdir -p ${PREFIX}/share/mkhybrid
 	${INSTALL_DATA} ${FILESDIR}/macmaping.tbl ${PREFIX}/share/mkhybrid

 .include <bsd.port.mk>
--- a/textproc/agrep/Makefile
+++ b/textproc/agrep/Makefile
@ -3,7 +3,7 @@
 # Date created:			  December 1, 1997
 # Whom:				  Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.3 1998/04/12 23:23:00 marc Exp $
+# $OpenBSD: Makefile,v 1.4 2000/02/11 01:10:13 espie Exp $
 #

 DISTNAME=	agrep-2.04
@ -23,7 +23,7 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/agrep ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/agrep.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/agrep
+	@mkdir -p ${PREFIX}/share/doc/agrep
 	@${INSTALL_MAN} ${WRKSRC}/agrep.algorithms ${PREFIX}/share/doc/agrep
 .endif

--- a/textproc/c2html/Makefile
+++ b/textproc/c2html/Makefile
@ -3,7 +3,7 @@
 # Date created:				December 1, 1997
 # Whom:					Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.2 1999/07/20 16:41:47 jakob Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/11 01:10:13 espie Exp $
 #

 DISTNAME=		c2html-0.6.1
@ -20,7 +20,7 @@ MAN1=			c2html.1
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/c2html ${PREFIX}/bin
 	@ ${INSTALL_MAN} ${WRKSRC}/c2html.1 ${PREFIX}/man/man1
-	@ ${MKDIR} ${PREFIX}/share/doc/c2html
+	@ mkdir -p ${PREFIX}/share/doc/c2html
 .for file in COPYING README
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/c2html
 .endfor
--- a/textproc/isearch/Makefile
+++ b/textproc/isearch/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1999/11/03 01:24:54 turan Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/11 01:10:13 espie Exp $
 # Original from: Ejovi Nuwere <ejovi@ejovi.net> 

 BROKEN=		C++ syntax errors, index.cxx:533: ANSI C++ forbids declaration PhraseLength with no type
@ -17,7 +17,7 @@ post-install:
 	strip ${PREFIX}/bin/Iindex
 	strip ${PREFIX}/bin/Iutil
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/Isearch
+	mkdir -p ${PREFIX}/share/doc/Isearch
 	${INSTALL_MAN} ${WRKSRC}/html/*.html ${PREFIX}/share/doc/Isearch
 .endif

--- a/textproc/mgdiff/Makefile
+++ b/textproc/mgdiff/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1999/05/04 03:03:46 brad Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/11 01:10:13 espie Exp $

 DISTNAME=	mgdiff
 PKGNAME=	mgdiff-1.0
@ -12,7 +12,7 @@ USE_MOTIF=	yes
 USE_IMAKE=      yes

 post-install:
-	@${MKDIR} ${PREFIX}/lib/X11/mgdiff
+	@mkdir -p ${PREFIX}/lib/X11/mgdiff
 	@${INSTALL_DATA} ${WRKSRC}/mgdiff.x[bp]m ${PREFIX}/lib/X11/mgdiff
 	@${INSTALL_MAN} ${WRKSRC}/mgdiff.man ${PREFIX}/man/man1/mgdiff.1

--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/11 00:37:39 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/11 01:10:13 espie Exp $
 #
 # Amaya, the W3C http://www.w3.org browser
 #
@ -29,7 +29,7 @@ USE_GMAKE	= yes
 CONFIGURE_ARGS	= -with-amaya

 do-configure:
-	${MKDIR} ${WRKBUILD} && cd ${WRKBUILD} && ../configure ${CONFIGURE_ARGS}
+	mkdir -p ${WRKBUILD} && cd ${WRKBUILD} && ../configure ${CONFIGURE_ARGS}

 .include <bsd.port.mk>

--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/02 02:34:02 kevlo Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/11 01:10:13 espie Exp $

 DISTNAME=	bluefish-0.3.5
 CATEGORIES=	www 
@ -22,7 +22,7 @@ CONFIGURE_ENV=  GTK_CONFIG="${GTK_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		CFLAGS="-I${LOCALBASE}/include"
 do-install:
-	@${MKDIR} ${PREFIX}/lib/bluefish
+	@mkdir -p ${PREFIX}/lib/bluefish
 	${INSTALL_PROGRAM} ${WRKSRC}/src/bluefish ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/data/php3_functions ${PREFIX}/lib/bluefish
 	${INSTALL_DATA} ${WRKSRC}/data/rxml_functions ${PREFIX}/lib/bluefish
@ -34,9 +34,9 @@ do-install:
 post-install:
 	@strip ${PREFIX}/bin/bluefish
 .if !defined(NOPORTDOCS)
-	@${ECHO} "===>   Installing bluefish docs in ${PREFIX}/share/doc/bluefish"
-	@${ECHO} "===>   A manual is available online at http://bluefish.linuxbox.com/manual/"
-	@${MKDIR} ${PREFIX}/share/doc/bluefish && ${CHMOD} a+rx ${PREFIX}/share/doc/bluefish
+	@echo "===>   Installing bluefish docs in ${PREFIX}/share/doc/bluefish"
+	@echo "===>   A manual is available online at http://bluefish.linuxbox.com/manual/"
+	@mkdir -p ${PREFIX}/share/doc/bluefish && ${CHMOD} a+rx ${PREFIX}/share/doc/bluefish
 	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bluefish
 .endif

--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/02/11 00:37:39 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/11 01:10:13 espie Exp $
 #
 # From: $NetBSD: Makefile,v 1.13 1998/08/04 13:09:21 fvdl Exp $
 #	but modified to use lesstif 0.86.0...
@ -33,16 +33,16 @@ MAKE_ENV+=	BUILD_OPT=1

 .if !defined(NO_WARNINGS)
 pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "*** Please see ${FILESDIR}/README for general caveats"
-	@${ECHO} ""
+	@echo ""
+	@echo "*** Please see ${FILESDIR}/README for general caveats"
+	@echo ""
 .endif

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dist/${MOZ_OBJDIR}/bin/moz-export ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/dist/${MOZ_OBJDIR}/bin/mozilla-export ${PREFIX}/bin
-	${LN} -sf ${PREFIX}/bin/moz-export ${PREFIX}/bin/mozilla
-	${MKDIR} ${MOZ_LIBDIR}
+	ln -sf ${PREFIX}/bin/moz-export ${PREFIX}/bin/mozilla
+	mkdir -p ${MOZ_LIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/dist/${MOZ_OBJDIR}/bin/*.so* ${MOZ_LIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/dist/${MOZ_OBJDIR}/lib/*.so* ${MOZ_LIBDIR}

--- a/www/weblint/Makefile
+++ b/www/weblint/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2000/01/12 08:45:42 kevlo Exp $
+# $OpenBSD: Makefile,v 1.2 2000/02/11 01:10:14 espie Exp $

 DISTNAME=	  	weblint-1.020	
 CATEGORIES=     	www
@ -10,8 +10,8 @@ MASTER_SITES=		ftp://ftp.weblint.org/pub/weblint/ \

 post-install:
 .if !defined(NOPORTDOCS)
-	@${ECHO} "==>   Installing weblint docs in ${PREFIX}/share/doc/weblint"
-	@${MKDIR} ${PREFIX}/share/doc/weblint && ${CHMOD} a+rx ${PREFIX}/share/doc/weblint
+	@echo "==>   Installing weblint docs in ${PREFIX}/share/doc/weblint"
+	@mkdir -p ${PREFIX}/share/doc/weblint && ${CHMOD} a+rx ${PREFIX}/share/doc/weblint
 	@${INSTALL_DATA} ${WRKSRC}/weblint.ps ${PREFIX}/share/doc/weblint
 	@${INSTALL_DATA} ${WRKSRC}/weblintrc ${PREFIX}/share/doc/weblint
 	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/weblint	
--- a/x11/asclock/Makefile
+++ b/x11/asclock/Makefile
@ -3,7 +3,7 @@
 # Date created:        May 19 1998
 # Whom:                Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.1.1.1 1998/05/19 05:49:06 angelos Exp $
+# $OpenBSD: Makefile,v 1.2 2000/02/11 01:10:14 espie Exp $
 #

 DISTNAME=	asclock
@ -19,7 +19,7 @@ USE_IMAKE=	yes

 pre-configure:
 	(cd ${WRKSRC}; \
-	${ECHO} ${ASCLOCK_LANG} | ${WRKSRC}/configure > /dev/null)
+	echo ${ASCLOCK_LANG} | ${WRKSRC}/configure > /dev/null)
 	@${ECHO_MSG} "*****************  NOTE  *****************"
 	@${ECHO_MSG} "*                                        *"
 	@${ECHO_MSG} "*  You can choose languages for asclock. *"
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 1999/11/14 22:29:00 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/11 01:10:14 espie Exp $

 DISTNAME=	bricons
 PKGNAME=	bricons-3.0
@ -14,7 +14,7 @@ USE_IMAKE=	yes
 post-install:
 	${INSTALL_DATA} $(WRKDIR)/bricons/Xbricons $(PREFIX)/lib/X11/app-defaults/
 	${INSTALL_DATA} $(WRKDIR)/bricons/bitmaps/* $(PREFIX)/include/X11/bitmaps/
-	${MKDIR} $(PREFIX)/include/X11/pixmaps
+	mkdir -p $(PREFIX)/include/X11/pixmaps
 	${INSTALL_DATA} $(WRKDIR)/bricons/*.xpm $(PREFIX)/include/X11/pixmaps/
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "     Use ./files/DOTbriconsrc as an example. This  file"
--- a/x11/mouseclock/Makefile
+++ b/x11/mouseclock/Makefile
@ -3,7 +3,7 @@
 # Date created:		May 19 1998
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.2 1998/05/19 06:22:26 angelos Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/11 01:10:14 espie Exp $
 #

 DISTNAME=	mouseclock-1.0
@ -20,7 +20,7 @@ NO_INSTALL_MANPAGES= yes

 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/mouseclock
+	@mkdir -p ${PREFIX}/share/doc/mouseclock
 	@${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/mouseclock
 .endif

--- a/x11/xmold/Makefile
+++ b/x11/xmold/Makefile
@ -3,7 +3,7 @@
 # Date created:        December 21, 1997
 # Whom:                Don Schmidt
 #
-# $OpenBSD: Makefile,v 1.1.1.1 1998/01/24 21:50:36 don Exp $
+# $OpenBSD: Makefile,v 1.2 2000/02/11 01:10:14 espie Exp $
 #

 DISTNAME=	xmold
@ -16,7 +16,7 @@ MAINTAINER=	don@OpenBSD.ORG
 USE_IMAKE=	yes

 do-install:
-	@${MKDIR} -p ${PREFIX}/bin
+	@mkdir -p ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/xmold ${PREFIX}/bin

 .include <bsd.port.mk>