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...
avsm · Feb 11, 2000 · c5bdf44 · c5bdf44
1 parent 762cae3
commit c5bdf44
Show file tree

Hide file tree

Showing 96 changed files with 401 additions and 401 deletions.
diff --git 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>
diff --git 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=	[email protected]
 
 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>
diff --git 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>
diff --git 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=	[email protected]
 
 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

diff --git 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),

diff --git 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/

diff --git 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
 

diff --git 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}

diff --git a/chinese/cless/Makefile b/chinese/cless/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Thu Jan 18, 2000
 # Whom:                 Kevin Lo <[email protected]>
 #
-# $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>
diff --git 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

diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
@@ -3,7 +3,7 @@
 # Date created:        23 August 1999
 # Whom:                Alex Varju <[email protected]>
 #
-# $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>
diff --git 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

diff --git 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

diff --git 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