57 files changed, 128 insertions, 129 deletions

diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 77c6ae8cd27f..fa7a3cfcfc07 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,10 +1,9 @@
-# ex:ts=8
 # New ports collection makefile for:    minicom
 # Version required:     1.74
 # Date created:         Fri Dec 01, 1995
 # Whom:                 obrien@cs.ucdavis.edu
 #
-# $Id: Makefile,v 1.9 1997/04/04 15:57:32 obrien Exp $
+# $Id: Makefile,v 1.10 1997/04/04 15:58:10 obrien Exp $
 #
 
 DISTNAME=	minicom-1.75
@@ -25,7 +24,7 @@ MAN1=		minicom.1 runscript.1 ascii-xfr.1
 .if !defined(BATCH)
 pre-install:
 	# this script creates a link from your comm port to /dev/modem
-	/bin/sh ${SCRIPTDIR}/create-dev-link
+	${SH} ${SCRIPTDIR}/create-dev-link
 .endif
 
 .include <bsd.port.mk>
diff --git a/editors/e93/Makefile b/editors/e93/Makefile
index 0e0341ee8d47..3fb3a2d75a00 100644
--- a/editors/e93/Makefile
+++ b/editors/e93/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 June 1995
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.10 1996/11/18 09:52:45 asami Exp $
+# $Id: Makefile,v 1.11 1997/03/06 04:09:59 asami Exp $
 #
 
 DISTNAME=	e93-1.2r6X
@@ -21,7 +21,7 @@ USE_X11=	yes
 IS_INTERACTIVE=	yes	# asks "ok?" about license
 
 pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} /bin/sh ${PKGDIR}/REQ ${PKGNAME} INSTALL
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 .endif
 
 do-install:
diff --git a/games/doom/Makefile b/games/doom/Makefile
index a643114eb78a..10abcbe6497d 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Dec  9 09:42:37 CST 1996
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.2 1996/12/12 05:22:21 asami Exp $
+# $Id: Makefile,v 1.3 1996/12/19 14:33:02 erich Exp $
 #
 
 DISTNAME=	doom-1.8
@@ -27,7 +27,7 @@ pre-install:
 	@sed 's,@PREFIX@,${PREFIX},' ${PKGDIR}/INSTALL.in > ${PKGDIR}/INSTALL
 
 post-install:
-	@/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 pre-clean:
 	@rm -f ${PKGDIR}/INSTALL
diff --git a/games/linuxdoom/Makefile b/games/linuxdoom/Makefile
index a643114eb78a..10abcbe6497d 100644
--- a/games/linuxdoom/Makefile
+++ b/games/linuxdoom/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Dec  9 09:42:37 CST 1996
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.2 1996/12/12 05:22:21 asami Exp $
+# $Id: Makefile,v 1.3 1996/12/19 14:33:02 erich Exp $
 #
 
 DISTNAME=	doom-1.8
@@ -27,7 +27,7 @@ pre-install:
 	@sed 's,@PREFIX@,${PREFIX},' ${PKGDIR}/INSTALL.in > ${PKGDIR}/INSTALL
 
 post-install:
-	@/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 pre-clean:
 	@rm -f ${PKGDIR}/INSTALL
diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index d30f8d0a2c3b..392c109dab18 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -4,7 +4,7 @@
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
 #
-# $Id: Makefile,v 1.13 1996/11/11 08:26:44 max Exp $
+# $Id: Makefile,v 1.14 1996/11/13 12:40:55 asami Exp $
 #
 
 DISTNAME=	Canna32p2
@@ -49,6 +49,6 @@ post-install:
 		chmod 755 ${STARTUP_SCRIPT} ;				\
 		chown bin.bin ${STARTUP_SCRIPT};			\
 	fi
-	@/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index d30f8d0a2c3b..392c109dab18 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -4,7 +4,7 @@
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
 #
-# $Id: Makefile,v 1.13 1996/11/11 08:26:44 max Exp $
+# $Id: Makefile,v 1.14 1996/11/13 12:40:55 asami Exp $
 #
 
 DISTNAME=	Canna32p2
@@ -49,6 +49,6 @@ post-install:
 		chmod 755 ${STARTUP_SCRIPT} ;				\
 		chown bin.bin ${STARTUP_SCRIPT};			\
 	fi
-	@/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index d30f8d0a2c3b..392c109dab18 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -4,7 +4,7 @@
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
 #
-# $Id: Makefile,v 1.13 1996/11/11 08:26:44 max Exp $
+# $Id: Makefile,v 1.14 1996/11/13 12:40:55 asami Exp $
 #
 
 DISTNAME=	Canna32p2
@@ -49,6 +49,6 @@ post-install:
 		chmod 755 ${STARTUP_SCRIPT} ;				\
 		chown bin.bin ${STARTUP_SCRIPT};			\
 	fi
-	@/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/dserver/Makefile b/japanese/dserver/Makefile
index 7ce1f5850811..71bb8b2ca9e6 100644
--- a/japanese/dserver/Makefile
+++ b/japanese/dserver/Makefile
@@ -3,7 +3,7 @@
 # Date created:		3 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.2 1997/01/30 07:49:54 max Exp $
+# $Id: Makefile,v 1.3 1997/01/30 09:12:38 max Exp $
 #
 
 DISTNAME=	dserver2.2betapl2
@@ -43,6 +43,6 @@ post-install:
 	@${SED} s!PREFIX_DIR!${PREFIX}!g ${WRKSRC}/deinstall.sh.template \
 	  > ${PREFIX}/lib/dserver/deinstall.sh
 	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD-setup.euc ${PREFIX}/lib/dserver/doc/
-	@${SETENV} PKG_PREFIX=${PREFIX} /bin/sh ${PKGDIR}/REQ ${PKGNAME} INSTALL
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/dvi2ps/Makefile b/japanese/dvi2ps/Makefile
index 924ba31eee22..cf3db498a8ff 100644
--- a/japanese/dvi2ps/Makefile
+++ b/japanese/dvi2ps/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 Sep 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.3 1996/12/07 00:20:24 asami Exp $
+# $Id: Makefile,v 1.4 1996/12/30 08:23:07 max Exp $
 #
 
 DISTNAME=	dvi2ps-2.0j-gamma
@@ -40,6 +40,6 @@ post-install:
 	${INSTALL_SCRIPT} tools/psstrip ${PREFIX}/bin ;\
 	${INSTALL_SCRIPT} tools/MakePK ${PREFIX}/bin ;\
 	)
-	@/bin/sh ${PKGDIR}/REQ ${PKGNAME} INSTALL
+	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/elvis/Makefile b/japanese/elvis/Makefile
index a3a3574f7a33..52da9abf80c0 100644
--- a/japanese/elvis/Makefile
+++ b/japanese/elvis/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 October 1995
 # Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
-# $Id: Makefile,v 1.4 1996/12/03 13:07:58 obrien Exp $
+# $Id: Makefile,v 1.5 1997/01/04 15:34:28 max Exp $
 #
 
 DISTNAME=       elvis-1.8
@@ -30,7 +30,7 @@ do-configure:
 post-install:
 	@${MKDIR} ${PREFIX}/share/doc/jp-elvis
 	${INSTALL_DATA} ${WRKSRC}/README.j18 ${PREFIX}/share/doc/jp-elvis
-	@/bin/sh ${PKGDIR}/REQ ${PKGNAME} INSTALL
+	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
 		echo "Installing ${STARTUP_SCRIPT} startup file.";	\
 		echo '#!/bin/sh' > ${STARTUP_SCRIPT};			\
diff --git a/japanese/gp/Makefile b/japanese/gp/Makefile
index db6fef22717d..3fc4f3d3c0fd 100644
--- a/japanese/gp/Makefile
+++ b/japanese/gp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1997
 # Whom:			Kiriyama Kazuhiko<kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/04 02:13:17 asami Exp $
+# $Id: Makefile,v 1.2 1997/06/29 11:30:39 obrien Exp $
 #
 
 DISTNAME=	GP-2.01jp
@@ -27,7 +27,7 @@ pre-patch:
 	@${MKDIR} ${PATCHDIR}
 	@${SETENV} FILESDIR=${FILESDIR} PATCHDIR=${PATCHDIR} \
 		PREFIX=${PREFIX} SED=${SED} X11BASE=${X11BASE} \
-		/bin/sh ${FILESDIR}/pr-setup.sh
+		${SH} ${FILESDIR}/pr-setup.sh
 
 do-install:
 	@${MKDIR} ${PREFIX}/etc/GP-jp
diff --git a/japanese/jtex209-both/Makefile b/japanese/jtex209-both/Makefile
index 0a15cc1cf69c..18dff2f1dc9f 100644
--- a/japanese/jtex209-both/Makefile
+++ b/japanese/jtex209-both/Makefile
@@ -3,7 +3,7 @@
 # Date created:		4 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/11 08:42:46 asami Exp $
+# $Id: Makefile,v 1.2 1996/12/03 13:08:11 obrien Exp $
 #
 
 DISTNAME?=	jp-jlatex209-a17-n152
@@ -38,12 +38,12 @@ pre-build:
 .if defined(BATCH)
 	@(\
 	  cd ${WRKSRC} ; \
-	  /bin/sh ${FILESDIR}/select.sh ${FILESDIR} ${DISTDIR} ${PKGDIR} ${BATCH_TEX}; \
+	  ${SH} ${FILESDIR}/select.sh ${FILESDIR} ${DISTDIR} ${PKGDIR} ${BATCH_TEX}; \
 	)
 .else
 	@(\
 	  cd ${WRKSRC} ; \
-	  /bin/sh ${FILESDIR}/select.sh ${FILESDIR} ${DISTDIR} ${PKGDIR} SELECT ; \
+	  ${SH} ${FILESDIR}/select.sh ${FILESDIR} ${DISTDIR} ${PKGDIR} SELECT ; \
 	)
 .endif
 
@@ -51,7 +51,7 @@ post-install:
 .if !defined(BATCH)
 	@(\
 	  if [ -e /usr/local/share/tex/BOTH ] ;  \
-	    then /bin/sh ${FILESDIR}/linkselect.sh ; \
+	    then ${SH} ${FILESDIR}/linkselect.sh ; \
 	  fi \
 	)
 .endif
diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile
index 73d351122a6d..b7a9cbb4e948 100644
--- a/japanese/k12/Makefile
+++ b/japanese/k12/Makefile
@@ -3,7 +3,7 @@
 # Date created:		24 June 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/04/01 11:38:33 asami Exp $
+# $Id: Makefile,v 1.2 1997/04/01 11:40:16 asami Exp $
 #
 
 DISTNAME=	jp-k12font-1.0
@@ -17,6 +17,6 @@ USE_X11=	yes
 NO_WRKSUBDIR=	yes
 
 post-install:
-	@/bin/sh ${PKGDIR}/REQ ${PKGNAME} INSTALL
+	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile
index 35117f687194..7665059a6291 100644
--- a/japanese/man-doc/Makefile
+++ b/japanese/man-doc/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 January 1997
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.4 1997/02/12 11:00:45 asami Exp $
+# $Id: Makefile,v 1.7 1997/07/11 10:26:33 max Exp $
 #
 
 DISTNAME=	jpman-${VERSION}c
@@ -28,7 +28,7 @@ do-install:
 		JPMANDIR=${JPMANDIR} EXTRACT_CMD=${EXTRACT_CMD} \
 		ECHO=${ECHO} RM=${RM} AWK=${AWK} \
 		GZIP_CMD="${GZIP_CMD}" SED=${SED} \
-		INSTALL_MAN="${INSTALL_MAN}" /bin/sh \
+		INSTALL_MAN="${INSTALL_MAN}" ${SH} \
 		${FILESDIR}/install-man MANCOMPRESSED  
 .else
 	@${SETENV} LANG="${LANG}" PREFIX=${PREFIX} WRKSRC=${WRKSRC} \
diff --git a/japanese/man/Makefile b/japanese/man/Makefile
index c1e682d14acd..f1cb010ba594 100644
--- a/japanese/man/Makefile
+++ b/japanese/man/Makefile
@@ -3,7 +3,7 @@
 # Date created:		4 December 1996
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.8 1997/05/20 04:27:31 asami Exp $
+# $Id: Makefile,v 1.9 1997/06/13 16:57:37 max Exp $
 #
 
 DISTNAME=	jp-man-1.1
@@ -59,7 +59,7 @@ post-install:
 	@${MKDIR} ${JMANELDIR}
 	@${INSTALL_DATA} ${FILESDIR}/jman.el ${JMANELDIR}
 	@${SETENV} CP=${CP} PKG_PREFIX=${PREFIX} \
-		/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 pre-clean:
 	@${RM} -f ${PATCHDIR}/patch-aa ${FILESDIR}/patch-xpg4
diff --git a/japanese/okphone/Makefile b/japanese/okphone/Makefile
index 823b86e2fc94..a73965d34b8a 100644
--- a/japanese/okphone/Makefile
+++ b/japanese/okphone/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 February 1996
 # Whom:			asami
 #
-# $Id: Makefile,v 1.6 1997/01/24 19:09:11 max Exp $
+# $Id: Makefile,v 1.7 1997/06/24 16:45:45 fenner Exp $
 #
 
 DISTNAME=	okphone-1.2
@@ -18,6 +18,6 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	asami@FreeBSD.ORG
 
 post-install:
-	@/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/ptex-base/Makefile b/japanese/ptex-base/Makefile
index bbc80044e8b3..6d07bf018d9a 100644
--- a/japanese/ptex-base/Makefile
+++ b/japanese/ptex-base/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Nov 1995
 # Whom:			Hideaki Ohmon <ohmon@sfc.keio.ac.jp>
 #
-# $Id: Makefile,v 1.16 1997/02/04 11:09:38 max Exp $
+# $Id: Makefile,v 1.17 1997/06/12 09:48:25 max Exp $
 #
 
 DISTNAME=	ptex3.1415.p2.1.4
@@ -99,7 +99,7 @@ do-build:
 
 pre-install:
 .if !defined(BATCH)
-	@/bin/sh ${PKGDIR}/REQ ${PKGNAME} INSTALL || \
+	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL || \
 	(echo "(Don't worry about the following \"*** Error code 1\"s)" ; \
 	 exit 1)
 .endif
diff --git a/japanese/ptex-common/Makefile b/japanese/ptex-common/Makefile
index bbc80044e8b3..6d07bf018d9a 100644
--- a/japanese/ptex-common/Makefile
+++ b/japanese/ptex-common/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Nov 1995
 # Whom:			Hideaki Ohmon <ohmon@sfc.keio.ac.jp>
 #
-# $Id: Makefile,v 1.16 1997/02/04 11:09:38 max Exp $
+# $Id: Makefile,v 1.17 1997/06/12 09:48:25 max Exp $
 #
 
 DISTNAME=	ptex3.1415.p2.1.4
@@ -99,7 +99,7 @@ do-build:
 
 pre-install:
 .if !defined(BATCH)
-	@/bin/sh ${PKGDIR}/REQ ${PKGNAME} INSTALL || \
+	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL || \
 	(echo "(Don't worry about the following \"*** Error code 1\"s)" ; \
 	 exit 1)
 .endif
diff --git a/japanese/vfghostscript/Makefile b/japanese/vfghostscript/Makefile
index 7967fdb4a87d..4ed3845e38ff 100644
--- a/japanese/vfghostscript/Makefile
+++ b/japanese/vfghostscript/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14 May 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.6 1996/11/18 10:24:17 asami Exp $
+# $Id: Makefile,v 1.7 1996/12/07 00:20:40 asami Exp $
 #
 
 DISTNAME=	ghostscript2.6.2
@@ -63,11 +63,11 @@ pre-patch:
 	@${CP} ${WRKSRC}/unix-gcc.mak ${WRKSRC}/Makefile
 .if defined(BATCH)
 	@(cd ${WRKSRC} ; \
-	  /bin/sh ${FILESDIR}/printer.sh BATCH; \
+	  ${SH} ${FILESDIR}/printer.sh BATCH; \
 	 )
 .else
 	@(cd ${WRKSRC} ; \
-	  /bin/sh ${FILESDIR}/printer.sh; \
+	  ${SH} ${FILESDIR}/printer.sh; \
 	 )
 .endif
 	@${CAT} ${WRKSRC}/kfvflib.mak >> ${WRKSRC}/Makefile
diff --git a/korean/hanyangfonts/Makefile b/korean/hanyangfonts/Makefile
index b2b2ab0b2aea..c4af91223376 100644
--- a/korean/hanyangfonts/Makefile
+++ b/korean/hanyangfonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:         22 Mar 1997
 # Whom:                 Choi Jun Ho <junker@jazz.snu.ac.kr>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/03/30 00:04:10 max Exp $
 #
 
 DISTNAME=       hanyang-font-pcf
@@ -40,6 +40,6 @@ do-install:
 	${INSTALL_DATA} fonts.dir ${PREFIX}/lib/X11/fonts/korean/hanyang
 
 post-install:
-	@/bin/sh ${PKGDIR}/REQ ${PKGNAME} INSTALL;
+	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL;
 	
 .include <bsd.port.mk>
diff --git a/korean/pinetreefonts/Makefile b/korean/pinetreefonts/Makefile
index 074ea581cfdd..bf2dd041ebe9 100644
--- a/korean/pinetreefonts/Makefile
+++ b/korean/pinetreefonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 Mar 1997
 # Whom:			Choi Jun Ho <junker@jazz.snu.ac.kr>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/03/29 12:58:32 max Exp $
 #
 
 DISTNAME=       pinetree.precomposed-1.0
@@ -42,6 +42,6 @@ do-install:
 
 # to show a warning message to add fontpath for these fonts
 post-install:
-	@/bin/sh ${PKGDIR}/REQ ${PKGNAME} INSTALL
+	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 
 .include <bsd.port.mk>
diff --git a/lang/modula-3-lib/Makefile b/lang/modula-3-lib/Makefile
index 43e721b704a9..e60125cef58f 100644
--- a/lang/modula-3-lib/Makefile
+++ b/lang/modula-3-lib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		28 Oct 1996
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.6 1997/03/28 04:38:43 jdp Exp $
+# $Id: Makefile,v 1.7 1997/04/30 03:18:04 asami Exp $
 #
 
 DISTNAME=	modula-3-lib-3.6
@@ -61,12 +61,12 @@ temp_prefix=	${WRKSRC}/installed
 post-extract:
 .if !empty(have_boot)
 	@echo "Copying bootstrap modula-3 compiler from ${have_boot}"
-	@/bin/sh ${SCRIPTDIR}/copy_files ${FILESDIR}/T.boot installed \
+	@${SH} ${SCRIPTDIR}/copy_files ${FILESDIR}/T.boot installed \
 	    ${have_boot} ${WRKSRC}
 .endif
 .if !empty(have_gcc)
 	@echo "Copying gcc sources from ${have_gcc}"
-	@/bin/sh ${SCRIPTDIR}/copy_files ${FILESDIR}/T.gcc m3cc \
+	@${SH} ${SCRIPTDIR}/copy_files ${FILESDIR}/T.gcc m3cc \
 	    ${have_gcc} ${WRKSRC}
 .endif
 	@cd ${WRKSRC}/m3cc/gcc; \
@@ -110,7 +110,7 @@ do-build:
 
 pre-install:
 	@echo "Checking for conflicting shared libraries"
-	@PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@echo "Installing shared libraries"
diff --git a/lang/modula-3/Makefile b/lang/modula-3/Makefile
index dbb1bd689385..cbf3ce8f8060 100644
--- a/lang/modula-3/Makefile
+++ b/lang/modula-3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1996
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.14 1997/07/04 17:31:31 jdp Exp $
+# $Id: Makefile,v 1.15 1997/07/11 05:16:31 jdp Exp $
 #
 
 DISTNAME=	modula-3-3.6
@@ -43,7 +43,7 @@ do-install:
 		-e "/^share/d" ${PKGDIR}/PLIST | \
 		cpio -dump -R ${BINOWN}.${BINGRP} ${PREFIX}
 	@echo "Fixing absolute pathnames in installed files"
-	@/bin/sh ${SCRIPTDIR}/fix_pathnames ${temp_prefix} ${PREFIX}
+	@${SH} ${SCRIPTDIR}/fix_pathnames ${temp_prefix} ${PREFIX}
 	@echo "Rebuilding and shipping m3build with correct pathnames"
 	@cd ${WRKSRC}/m3/m3build; \
 	    LD_LIBRARY_PATH=${PREFIX}/lib/m3/FreeBSD2:$$LD_LIBRARY_PATH; \
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 1f0883b0e06d..19d51236c61a 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -3,7 +3,7 @@
 # Date released:		1 Jan 97
 # Whom:				Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.10 1997/07/03 05:57:39 asami Exp $
+# $Id: Makefile,v 1.11 1997/07/08 02:45:57 peter Exp $
 #
 
 DISTNAME=	exmh-2.0delta
@@ -44,10 +44,10 @@ MAN1=		exmh.1
 do-build:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} \
 		WISH=${PREFIX}/bin/${WISH} WRKSRC=${WRKSRC} \
-		FILESDIR=${FILESDIR} /bin/sh ${SCRIPTDIR}/build
+		FILESDIR=${FILESDIR} ${SH} ${SCRIPTDIR}/build
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} \
-		WRKSRC=${WRKSRC} /bin/sh ${SCRIPTDIR}/install
+		WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/install
 
 .include <bsd.port.mk>
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 2e528959c68b..fc17baf0ff54 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -3,7 +3,7 @@
 # Date created:			23 Sep 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.17 1997/06/02 18:33:30 max Exp $
+# $Id: Makefile,v 1.18 1997/06/24 20:59:30 max Exp $
 #
 
 DISTNAME=		mailagent-3.0@56
@@ -34,7 +34,7 @@ MAN1=			edusers.1 mailagent.1 maildist.1  \
 PERLPATH?=		${PREFIX}/bin
 
 pre-extract:
-	@if [ `/bin/sh -c umask` != 0022 ]; then \
+	@if [ `${SH} -c umask` != 0022 ]; then \
 	  echo "Please set umask to 022 before running make,"; \
 	  echo "or mailagent will not build successfully."; \
 	  false; fi
diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile
index d5cdac77e79e..176581b84b54 100644
--- a/mail/poppassd/Makefile
+++ b/mail/poppassd/Makefile
@@ -3,7 +3,7 @@
 # Date Created:	21 August 1996
 # Whom:	Andrew Stevenson <andrew@ugh.net.au> based heavily on the changes by Stephen Melvin <melvin@zytek.com>
 #
-# $Id: Makefile,v 1.3 1996/11/17 07:42:55 obrien Exp $
+# $Id: Makefile,v 1.4 1997/06/13 22:30:19 max Exp $
 #
 
 DISTNAME=	pwserve-4
@@ -16,7 +16,7 @@ MAINTAINER=	andrew@ugh.net.au
 EXTRACT_CMD=	/bin/cat
 EXTRACT_SUFX=	
 EXTRACT_BEFORE_ARGS=	
-EXTRACT_AFTER_ARGS=	| /usr/bin/sed -e '1,16d' | /bin/sh
+EXTRACT_AFTER_ARGS=	| /usr/bin/sed -e '1,16d' | ${SH}
 WRKSRC=			${WRKDIR}/poppassd
 ALL_TARGET=	poppassd
 MAN8=		poppassd.8
diff --git a/mail/youbin/Makefile b/mail/youbin/Makefile
index 630deae959ea..31c7c699e9d7 100644
--- a/mail/youbin/Makefile
+++ b/mail/youbin/Makefile
@@ -3,7 +3,7 @@
 # Date created:			09 Aug 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.8 1997/04/21 04:05:14 max Exp $
+# $Id: Makefile,v 1.9 1997/04/21 10:09:14 max Exp $
 #
 
 DISTNAME=	youbin-2.13
@@ -31,6 +31,6 @@ post-install:
 		echo "fi" >> ${STARTUP_SCRIPT} ;			\
 		chmod 755 ${STARTUP_SCRIPT} ;				\
 	fi
-	@${SETENV} PKG_PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/math/simpack/Makefile b/math/simpack/Makefile
index d2120d1bce53..4fb4207b3582 100644
--- a/math/simpack/Makefile
+++ b/math/simpack/Makefile
@@ -3,7 +3,7 @@
 # Date created:        5 June 1997
 # Whom:                Ruslan Shevchenko <rssh@cki.ipri.kiev.ua>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/06/10 08:50:17 asami Exp $
 #
 
 DISTNAME=	simpack-3.0
@@ -20,7 +20,7 @@ post-build: create-libs create-scripts
 do-install: do-install-bin do-install-include do-install-lib do-install-doc
 
 post-install:
-	@/bin/sh ${PKGDIR}/REQ
+	@${SH} ${PKGDIR}/REQ
 	@${LDCONFIG} -m ${PREFIX}/lib
 
 do-install-bin:
diff --git a/math/wingz/Makefile b/math/wingz/Makefile
index 2e5eab2f9700..d60ca27f9dcc 100644
--- a/math/wingz/Makefile
+++ b/math/wingz/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Wed Nov 27 09:15:10 CST 1996
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.2 1996/12/05 00:43:55 asami Exp $
+# $Id: Makefile,v 1.3 1997/05/28 05:33:09 fenner Exp $
 #
 
 DISTNAME=	Wingz-142
@@ -21,6 +21,6 @@ NO_WRKSUBDIR=	yes
 USE_X11=	yes
 
 post-install:
-	@/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/math/wingz3/Makefile b/math/wingz3/Makefile
index 2e5eab2f9700..d60ca27f9dcc 100644
--- a/math/wingz3/Makefile
+++ b/math/wingz3/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Wed Nov 27 09:15:10 CST 1996
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.2 1996/12/05 00:43:55 asami Exp $
+# $Id: Makefile,v 1.3 1997/05/28 05:33:09 fenner Exp $
 #
 
 DISTNAME=	Wingz-142
@@ -21,6 +21,6 @@ NO_WRKSUBDIR=	yes
 USE_X11=	yes
 
 post-install:
-	@/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 3805c780855d..a26efecb3b5d 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -7,7 +7,7 @@
 # Date created:         31 July 1995
 # Whom:                 faulkner@cactus.org
 #
-# $Id: Makefile,v 1.8 1997/01/24 10:20:50 asami Exp $
+# $Id: Makefile,v 1.9 1997/05/29 01:15:39 ache Exp $
 #
 
 DISTNAME=       ast53unx
@@ -22,7 +22,7 @@ DISTFILES=      ${EXTRACT_ONLY} ${EPHEM}
 
 MAINTAINER=     ache@FreeBSD.ORG
 
-EXTRACT_CMD=    /bin/sh
+EXTRACT_CMD=    ${SH}
 EXTRACT_ARGS=
 DIST_SUBDIR=    astrolog
 ALL_TARGET=     astrolog
diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile
index 732a1191ec1e..5e5f40a176ea 100644
--- a/misc/mmv/Makefile
+++ b/misc/mmv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		2 Feb 1995
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.14 1996/12/08 11:55:03 max Exp $
+# $Id: Makefile,v 1.15 1996/12/08 12:02:01 max Exp $
 #
 
 DISTNAME=	mmv
@@ -33,7 +33,7 @@ do-extract:
 	 uncompress ${WRKDIR}/tmp/*; \
 	 cd ${WRKDIR}; \
 	 for file in tmp/part0* ; do \
-	     /bin/sh ${SCRIPTDIR}/unshar $$file; \
+	     ${SH} ${SCRIPTDIR}/unshar $$file; \
 	 done ; \
 	 ${CAT} mmv.c.? >mmv.c ; ${RM} mmv.c.? )
 
diff --git a/net/bb/Makefile b/net/bb/Makefile
index 5f6599b288a3..e1c01d15eba6 100644
--- a/net/bb/Makefile
+++ b/net/bb/Makefile
@@ -3,7 +3,7 @@
 # Date created:         So  17 Nov 1996 16:59:23 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.15 1997/03/04 05:14:57 asami Exp $
+# $Id: Makefile,v 1.16 1997/05/04 03:26:54 max Exp $
 #
 
 DISTNAME=	bb
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	${PREFIX}/sbin/httpd:${PORTSDIR}/www/apache
 #NO_CDROM=	"It can't be sold"
 
 post-configure:
-	( cd ${WRKSRC}/doc; /bin/sh bbconfig freebsd )
+	( cd ${WRKSRC}/doc; ${SH} bbconfig freebsd )
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 do-install:
diff --git a/net/cap/Makefile b/net/cap/Makefile
index 37a7222a8066..5e4071339bfa 100644
--- a/net/cap/Makefile
+++ b/net/cap/Makefile
@@ -3,7 +3,7 @@
 # Date created:			09 Nov 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1996/12/01 12:08:47 max Exp $
+# $Id: Makefile,v 1.2 1997/06/10 16:28:36 max Exp $
 #
 
 DISTNAME=	cap60.pl100
@@ -100,6 +100,6 @@ post-install:
 	@ln -fs ${PREFIX}/man/man3/CAP.3${GZ} ${PREFIX}/man/man3/${f}.3${GZ}
 .endfor
 	@ln -fs ${PREFIX}/man/man8/papif.8${GZ} ${PREFIX}/man/man8/papof.8${GZ}
-	@/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include "bsd.port.mk"
diff --git a/net/cvsup-mirror/Makefile b/net/cvsup-mirror/Makefile
index 12a69e97a2a0..ea85f8b5bdac 100644
--- a/net/cvsup-mirror/Makefile
+++ b/net/cvsup-mirror/Makefile
@@ -3,7 +3,7 @@
 # Date created:		01 February 1997
 # Whom:			jdp
 #
-# $Id: Makefile,v 1.1.1.1 1997/02/02 04:11:33 jdp Exp $
+# $Id: Makefile,v 1.2 1997/02/06 06:50:40 asami Exp $
 #
 
 DISTNAME=	cvsup-mirror-1.0
@@ -41,6 +41,6 @@ do-install:
 	@${CP} /dev/null ${base}/.start_server
 
 post-install:
-	@PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 15d368b16921..016802415e01 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
+# $Id: Makefile,v 1.4 1997/06/14 09:36:28 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.0
@@ -56,10 +56,10 @@ post-extract:
 do-configure:
 .if defined(BATCH)
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure.batch
+		${SH} ${SCRIPTDIR}/configure.batch
 .else
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure
+		${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-install:
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 15d368b16921..016802415e01 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
+# $Id: Makefile,v 1.4 1997/06/14 09:36:28 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.0
@@ -56,10 +56,10 @@ post-extract:
 do-configure:
 .if defined(BATCH)
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure.batch
+		${SH} ${SCRIPTDIR}/configure.batch
 .else
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure
+		${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-install:
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 15d368b16921..016802415e01 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
+# $Id: Makefile,v 1.4 1997/06/14 09:36:28 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.0
@@ -56,10 +56,10 @@ post-extract:
 do-configure:
 .if defined(BATCH)
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure.batch
+		${SH} ${SCRIPTDIR}/configure.batch
 .else
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure
+		${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-install:
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index 15d368b16921..016802415e01 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
+# $Id: Makefile,v 1.4 1997/06/14 09:36:28 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.0
@@ -56,10 +56,10 @@ post-extract:
 do-configure:
 .if defined(BATCH)
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure.batch
+		${SH} ${SCRIPTDIR}/configure.batch
 .else
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure
+		${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-install:
diff --git a/print/ghostscript55/Makefile b/print/ghostscript55/Makefile
index 15d368b16921..016802415e01 100644
--- a/print/ghostscript55/Makefile
+++ b/print/ghostscript55/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
+# $Id: Makefile,v 1.4 1997/06/14 09:36:28 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.0
@@ -56,10 +56,10 @@ post-extract:
 do-configure:
 .if defined(BATCH)
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure.batch
+		${SH} ${SCRIPTDIR}/configure.batch
 .else
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure
+		${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-install:
diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index 15d368b16921..016802415e01 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
+# $Id: Makefile,v 1.4 1997/06/14 09:36:28 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.0
@@ -56,10 +56,10 @@ post-extract:
 do-configure:
 .if defined(BATCH)
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure.batch
+		${SH} ${SCRIPTDIR}/configure.batch
 .else
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure
+		${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-install:
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 15d368b16921..016802415e01 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
+# $Id: Makefile,v 1.4 1997/06/14 09:36:28 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.0
@@ -56,10 +56,10 @@ post-extract:
 do-configure:
 .if defined(BATCH)
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure.batch
+		${SH} ${SCRIPTDIR}/configure.batch
 .else
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure
+		${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-install:
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 15d368b16921..016802415e01 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
+# $Id: Makefile,v 1.4 1997/06/14 09:36:28 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.0
@@ -56,10 +56,10 @@ post-extract:
 do-configure:
 .if defined(BATCH)
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure.batch
+		${SH} ${SCRIPTDIR}/configure.batch
 .else
 	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure
+		${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-install:
diff --git a/print/ghostview/Makefile b/print/ghostview/Makefile
index e4362a31ecf1..791add1e05cb 100644
--- a/print/ghostview/Makefile
+++ b/print/ghostview/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.8 1996/11/18 10:25:35 asami Exp $
+# $Id: Makefile,v 1.9 1997/01/14 09:11:49 asami Exp $
 #
 
 DISTNAME=	ghostview-1.5
@@ -15,6 +15,6 @@ MAINTAINER=	ports@FreeBSD.org
 USE_IMAKE=	yes
 
 post-install:
-	@/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/print/gv/Makefile b/print/gv/Makefile
index fdfcb0037ff3..cf90a77a74f3 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 Apr 1996
 # Whom:			tg@freebsd.org
 #
-# $Id: Makefile,v 1.14 1997/06/11 05:02:06 asami Exp $
+# $Id: Makefile,v 1.15 1997/06/23 07:35:15 tg Exp $
 #
 
 DISTNAME=	gv-3.5.8
@@ -20,6 +20,6 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@(cd ${WRKSRC}; ${MAKE} install.doc)
 .endif
-	@/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index 8e1f921a966c..3d32e718dad6 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 December 1996
 # Whom:			Bernd Rosauer <br@schiele-ct.de>
 #
-# $Id: Makefile,v 1.17 1997/02/27 09:05:09 tg Exp $
+# $Id: Makefile,v 1.18 1997/04/13 00:33:24 obrien Exp $
 #
 
 DISTNAME=	teTeX-src-0.4
@@ -51,6 +51,6 @@ pre-install:
 post-install:
 	@(cd ${PREFIX}/bin ; /bin/ln -sf virtex latex)
 	@(cd ${PREFIX}/bin ; /bin/ln -sf virtex tex)
-	@${SETENV} PREFIX=${PREFIX} /bin/sh files/install-note
+	@${SETENV} PREFIX=${PREFIX} ${SH} ${FILESDIR}/install-note
 
 .include <bsd.port.mk>
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 8e1f921a966c..3d32e718dad6 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 December 1996
 # Whom:			Bernd Rosauer <br@schiele-ct.de>
 #
-# $Id: Makefile,v 1.17 1997/02/27 09:05:09 tg Exp $
+# $Id: Makefile,v 1.18 1997/04/13 00:33:24 obrien Exp $
 #
 
 DISTNAME=	teTeX-src-0.4
@@ -51,6 +51,6 @@ pre-install:
 post-install:
 	@(cd ${PREFIX}/bin ; /bin/ln -sf virtex latex)
 	@(cd ${PREFIX}/bin ; /bin/ln -sf virtex tex)
-	@${SETENV} PREFIX=${PREFIX} /bin/sh files/install-note
+	@${SETENV} PREFIX=${PREFIX} ${SH} ${FILESDIR}/install-note
 
 .include <bsd.port.mk>
diff --git a/vietnamese/vnterm/Makefile b/vietnamese/vnterm/Makefile
index d7ca6ba30c4d..9cc9a731b2b8 100644
--- a/vietnamese/vnterm/Makefile
+++ b/vietnamese/vnterm/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Sat July 20, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.4 1996/12/09 00:53:13 obrien Exp $
+# $Id: Makefile,v 1.5 1996/12/09 07:25:52 obrien Exp $
 #
 
 DISTNAME=	vnterm3.3
@@ -32,7 +32,7 @@ post-install:
 		${PREFIX}/lib/X11/fonts/vietnamese ; \
 	)
 	@${SETENV} PKG_PREFIX=${PREFIX} \
-		/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/vnterm \
 		&& chmod a+rx ${PREFIX}/share/doc/vnterm
diff --git a/www/w3-4/Makefile b/www/w3-4/Makefile
index 0d5c81b0e8ec..dcde25b1901a 100644
--- a/www/w3-4/Makefile
+++ b/www/w3-4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 December 1996
 # Whom:			MITA Yoshio <mita@ee.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/01/04 00:36:48 max Exp $
+# $Id: Makefile,v 1.4 1997/06/10 09:58:45 asami Exp $
 #
 
 DISTNAME=	w3-2.2.26
@@ -64,7 +64,7 @@ post-install:
 		INFODIR=${INFODIR} INFOFILE=${INFOFILE} \
 		ELISPDIR=${ELISPDIR} ADDIR=${ADDIR} \
 		DIRSECTION="${DIRSECTION}" \
-		/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL  
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL  
 
 pre-clean:
 	@${RM} -f ${FILESDIR}/DEINSTALL ${FILESDIR}/INSTALL \
diff --git a/www/w3/Makefile b/www/w3/Makefile
index 0d5c81b0e8ec..dcde25b1901a 100644
--- a/www/w3/Makefile
+++ b/www/w3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 December 1996
 # Whom:			MITA Yoshio <mita@ee.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/01/04 00:36:48 max Exp $
+# $Id: Makefile,v 1.4 1997/06/10 09:58:45 asami Exp $
 #
 
 DISTNAME=	w3-2.2.26
@@ -64,7 +64,7 @@ post-install:
 		INFODIR=${INFODIR} INFOFILE=${INFOFILE} \
 		ELISPDIR=${ELISPDIR} ADDIR=${ADDIR} \
 		DIRSECTION="${DIRSECTION}" \
-		/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL  
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL  
 
 pre-clean:
 	@${RM} -f ${FILESDIR}/DEINSTALL ${FILESDIR}/INSTALL \
diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile
index 8e53cf2e2add..f4e050bc19f1 100644
--- a/x11-fonts/etlfonts/Makefile
+++ b/x11-fonts/etlfonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:		3 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/01/02 19:18:24 max Exp $
+# $Id: Makefile,v 1.2 1997/01/02 19:32:25 max Exp $
 #
 
 DISTNAME=	non-cjk
@@ -21,6 +21,6 @@ post-extract:
 	@gunzip ${WRKSRC}/*.gz
 
 post-install:
-	@/bin/sh ${PKGDIR}/REQ ${PKGNAME} INSTALL
+	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 762d65969b7c..01198a8b1d16 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.30 1997/06/09 12:45:23 jmz Exp $
+# $Id: Makefile,v 1.31 1997/06/10 12:33:48 jmz Exp $
 #
 
 DISTNAME=	xc
@@ -25,7 +25,7 @@ INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 
 pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL \
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL \
 		${PKGNAME} PRE-INSTALL
 
 post-install:
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 762d65969b7c..01198a8b1d16 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.30 1997/06/09 12:45:23 jmz Exp $
+# $Id: Makefile,v 1.31 1997/06/10 12:33:48 jmz Exp $
 #
 
 DISTNAME=	xc
@@ -25,7 +25,7 @@ INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 
 pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL \
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL \
 		${PKGNAME} PRE-INSTALL
 
 post-install:
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 762d65969b7c..01198a8b1d16 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.30 1997/06/09 12:45:23 jmz Exp $
+# $Id: Makefile,v 1.31 1997/06/10 12:33:48 jmz Exp $
 #
 
 DISTNAME=	xc
@@ -25,7 +25,7 @@ INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 
 pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL \
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL \
 		${PKGNAME} PRE-INSTALL
 
 post-install:
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 762d65969b7c..01198a8b1d16 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.30 1997/06/09 12:45:23 jmz Exp $
+# $Id: Makefile,v 1.31 1997/06/10 12:33:48 jmz Exp $
 #
 
 DISTNAME=	xc
@@ -25,7 +25,7 @@ INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 
 pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL \
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL \
 		${PKGNAME} PRE-INSTALL
 
 post-install:
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 762d65969b7c..01198a8b1d16 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.30 1997/06/09 12:45:23 jmz Exp $
+# $Id: Makefile,v 1.31 1997/06/10 12:33:48 jmz Exp $
 #
 
 DISTNAME=	xc
@@ -25,7 +25,7 @@ INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 
 pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL \
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL \
 		${PKGNAME} PRE-INSTALL
 
 post-install:
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index 762d65969b7c..01198a8b1d16 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.30 1997/06/09 12:45:23 jmz Exp $
+# $Id: Makefile,v 1.31 1997/06/10 12:33:48 jmz Exp $
 #
 
 DISTNAME=	xc
@@ -25,7 +25,7 @@ INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 
 pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL \
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL \
 		${PKGNAME} PRE-INSTALL
 
 post-install: