Back out previous. Pointed out by uebayasi@ and martti@.

28 files changed, 67 insertions, 67 deletions

diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 1ab281f92cf..c44b4f16d70 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2007/09/25 08:31:52 hira Exp $
+# $NetBSD: Makefile,v 1.36 2007/09/25 10:03:52 hira Exp $
 
 DISTNAME=	p7zip_4.55_src_all
 PKGNAME=	p7zip-4.55
@@ -55,9 +55,9 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${PREFIX}/lib/7z
 	${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* ${PREFIX}/lib/7z/Codecs
 	${INSTALL_LIB} ${WRKSRC}/bin/Formats/* ${PREFIX}/lib/7z/Formats
-	${LN} -s ${PREFIX}/lib/7z/7z ${PREFIX}/bin
+	ln -s ${PREFIX}/lib/7z/7z ${PREFIX}/bin
 .else
-	${LN} -s 7za ${PREFIX}/bin/7z
+	ln -s 7za ${PREFIX}/bin/7z
 .endif
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/p7zip
 	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/*.* ${PREFIX}/share/doc/p7zip
diff --git a/chat/finch/Makefile b/chat/finch/Makefile
index d2a59ef3510..d31cd693860 100644
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/09/25 08:31:53 hira Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/25 10:03:52 hira Exp $
 #
 
 PKGNAME=	finch-${PIDGIN_VERSION}
@@ -33,7 +33,7 @@ BUILD_DIRS=finch
 pre-build:
 	# XXX Find a cleaner way.
 	${TEST} -r ${WRKSRC}/libpurple/libpurple.la || \
-	  ${LN} -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
+	  ln -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
 
 post-install:
 	${INSTALL_MAN_DIR} ${DESTDIR:Q}${PREFIX:Q}/man/man1
diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index 2af6d986a25..c5fa44ac98b 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/09/25 08:31:53 hira Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/25 10:03:52 hira Exp $
 #
 
 PKGNAME=		pidgin-${PIDGIN_VERSION}
@@ -29,7 +29,7 @@ CHECK_WRKREF_SKIP=	bin/pidgin
 pre-build:
 	# XXX Find a cleaner way.
 	${TEST} -r ${WRKSRC}/libpurple/libpurple.la || \
-	  ${LN} -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
+	  ln -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
 
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 846e2655bab..739500a240b 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2007/09/25 08:49:03 hira Exp $
+# $NetBSD: Makefile,v 1.61 2007/09/25 10:07:05 hira Exp $
 
 DISTNAME=	mgetty1.1.31-Jul24
 PKGNAME=	mgetty-1.1.31
@@ -63,6 +63,6 @@ post-extract:
 	cd ${WRKSRC} && cp policy.h-dist policy.h
 
 do-configure:
-	${MV} ${WRKSRC}/doc/fax.1in ${WRKSRC}/doc/sendfax.1in
+	mv ${WRKSRC}/doc/fax.1in ${WRKSRC}/doc/sendfax.1in
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/obexapp/Makefile b/comms/obexapp/Makefile
index 14090086b42..93833998fc4 100644
--- a/comms/obexapp/Makefile
+++ b/comms/obexapp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/09/25 08:49:04 hira Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/25 10:07:05 hira Exp $
 #
 
 DISTNAME=	obexapp-1.4.7
@@ -27,7 +27,7 @@ USE_GNU_ICONV=		yes
 
 # because the directory name conflicts with the rc.d script
 post-extract:
-	${MV} ${WRKDIR}/obexapp ${WRKDIR}/${DISTNAME}
+	mv ${WRKDIR}/obexapp ${WRKDIR}/${DISTNAME}
 
 .include "../../comms/openobex/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 48556842a9b..cec5acf08d9 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2007/09/25 08:31:53 hira Exp $
+# $NetBSD: Makefile,v 1.35 2007/09/25 10:03:52 hira Exp $
 
 DISTNAME=	freetds-0.63
 PKGREVISION=	4
@@ -38,7 +38,7 @@ PLIST_SRC=	${PKGDIR}/PLIST ${WRKDIR}/.PLIST.doc
 # easily changing the installation directory for the documentation.
 #
 pre-build:
-	cd ${WRKSRC}/doc/doc && ${LN} -s ${PKGNAME_NOREV:Q} ${PKGBASE:Q}
+	cd ${WRKSRC}/doc/doc && ln -s ${PKGNAME_NOREV:Q} ${PKGBASE:Q}
 
 # Dynamically generate PLIST entries for the documentation.  This target
 # may need to be modified for future FreeTDS releases.
diff --git a/databases/pgtclng/Makefile b/databases/pgtclng/Makefile
index 6ce794b19dc..a931181226f 100644
--- a/databases/pgtclng/Makefile
+++ b/databases/pgtclng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/09/25 08:31:53 hira Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/25 10:03:52 hira Exp $
 #
 
 VER=		1.5.3
@@ -27,4 +27,4 @@ PGTCLLIBNAME		= libpgtcl${VER:C/\.//g}.so
 .include "../../mk/bsd.pkg.mk"
 
 post-install:
-	cd ${PREFIX}/lib && ${LN} -s pgtcl${VER}/${PGTCLLIBNAME} libpgtcl.so
+	cd ${PREFIX}/lib && ln -s pgtcl${VER}/${PGTCLLIBNAME} libpgtcl.so
diff --git a/devel/flex/Makefile b/devel/flex/Makefile
index 1640e11b176..db8a01ebcf4 100644
--- a/devel/flex/Makefile
+++ b/devel/flex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/09/25 08:31:53 hira Exp $
+# $NetBSD: Makefile,v 1.26 2007/09/25 10:03:52 hira Exp $
 
 DISTNAME=		flex-2.5.33
 PKGREVISION=		2
@@ -28,7 +28,7 @@ USE_TOOLS+=		gmake	# bmake has problems with the test suite
 .endif
 
 post-install:
-	cd ${DESTDIR:Q}${PREFIX:Q}/bin && ${LN} -s flex flex++
+	cd ${DESTDIR:Q}${PREFIX:Q}/bin && ln -s flex flex++
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index e3c4402be72..e05d1ab8de8 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2007/09/25 08:49:05 hira Exp $
+# $NetBSD: Makefile,v 1.80 2007/09/25 10:07:05 hira Exp $
 
 .include "Makefile.common"
 PKGREVISION=	1
@@ -31,10 +31,10 @@ SUBST_SED.ti+=		-e '/^screen-256color/,/^$$/d'
 post-configure:
 	cd ${WRKSRC}/man;					\
 	for f in *.1m; do					\
-		${MV} -f $${f} `${BASENAME} $${f} .1m`.1; 	\
+		mv -f $${f} `${BASENAME} $${f} .1m`.1; 	\
 	done;							\
 	for f in *.3x; do					\
-		${MV} -f $${f} `${BASENAME} $${f} .3x`.3; 	\
+		mv -f $${f} `${BASENAME} $${f} .3x`.3; 	\
 	done
 
 post-install:
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index f026520d717..a8cbfb21937 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2007/09/25 08:49:05 hira Exp $
+# $NetBSD: Makefile,v 1.50 2007/09/25 10:07:05 hira Exp $
 
 DISTNAME=		bochs-2.3
 CATEGORIES=		emulators
@@ -112,6 +112,6 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 
 pre-configure:
 	${SED} ${BOCHSRC_SUBST} <${WRKSRC}/.bochsrc >${WRKSRC}/.bochsrc.new
-	${MV} ${WRKSRC}/.bochsrc.new ${WRKSRC}/.bochsrc
+	mv ${WRKSRC}/.bochsrc.new ${WRKSRC}/.bochsrc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile
index 22c462691d3..77473732114 100644
--- a/emulators/xm7/Makefile
+++ b/emulators/xm7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/09/25 08:49:05 hira Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/25 10:07:05 hira Exp $
 #
 
 DISTNAME=		xm71010s
@@ -27,7 +27,7 @@ MAKE_FILE=		makefile.x11
 INSTALLATION_DIRS=	bin
 
 post-extract:
-	cd ${WRKDIR} && ${MV} linux/* vm
+	cd ${WRKDIR} && mv linux/* vm
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/vm/xm7 ${PREFIX}/bin
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 3a6f714c6f8..2a6f3a00fb9 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2007/09/25 08:49:05 hira Exp $
+# $NetBSD: Makefile,v 1.39 2007/09/25 10:07:06 hira Exp $
 
 DISTNAME=	asc-source-1.16.4.0
 PKGNAME=	${DISTNAME:S/-source//}
@@ -30,7 +30,7 @@ CPPFLAGS.NetBSD+=	-D_UNICODE_BROKEN_
 UNLIMIT_RESOURCES=	datasize
 
 post-extract:
-	${MV} ${WRKDIR}/*.mp3 ${WRKSRC}/data/music
+	mv ${WRKDIR}/*.mp3 ${WRKSRC}/data/music
 
 # bug in 1.16.4.0, remove on update
 post-install:
diff --git a/games/craft/Makefile b/games/craft/Makefile
index adeda7eacbd..0fcf0f5776b 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/09/25 08:31:53 hira Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/25 10:03:52 hira Exp $
 
 DISTNAME=	craftcc35
 PKGNAME=	craft-3.5
@@ -28,7 +28,7 @@ SUBST_SED.buttons=	-e 's+buttons+${PREFIX}/share/craft/buttons+'
 
 post-extract:
 	find ${WRKSRC} -type f -name '*~' -print | xargs rm -f
-	${LN} -fs ${FILESDIR}/Makefile ${WRKSRC}
+	ln -fs ${FILESDIR}/Makefile ${WRKSRC}
 	for f in `find ${WRKSRC} -name "*.hc" -type f -print`; do	\
 	  ${ECHO} "" >>$$f;						\
 	done
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index da3fc8ede75..cd2de7865d7 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/09/25 08:49:05 hira Exp $
+# $NetBSD: Makefile,v 1.28 2007/09/25 10:07:06 hira Exp $
 
 DISTNAME=	gtkballs-3.1.5
 PKGREVISION=	5
@@ -24,7 +24,7 @@ CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/gtkballs-scores \
 			${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
 
 post-install:
-	${MV} ${PREFIX}/${PKGMANDIR}/man6/gtkballs.6x ${PREFIX}/${PKGMANDIR}/man6/gtkballs.6
+	mv ${PREFIX}/${PKGMANDIR}/man6/gtkballs.6x ${PREFIX}/${PKGMANDIR}/man6/gtkballs.6
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/gimp-fix-ca/Makefile b/graphics/gimp-fix-ca/Makefile
index 96cd8af6003..4afbff3fe8e 100644
--- a/graphics/gimp-fix-ca/Makefile
+++ b/graphics/gimp-fix-ca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/09/25 08:31:53 hira Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/25 10:03:53 hira Exp $
 #
 
 DISTNAME=		gimp-fix-ca-2.1.0
@@ -19,7 +19,7 @@ INSTALLATION_DIRS=	lib/gimp/2.0/plug-ins
 USE_TOOLS+=		pkg-config
 
 pre-build:
-	${LN} -sf ${LOCALBASE}/bin/gimptool-2.0 \
+	ln -sf ${LOCALBASE}/bin/gimptool-2.0 \
 		${BUILDLINK_DIR}/bin/gimptool
 
 do-build:
diff --git a/graphics/libscigraphica/Makefile b/graphics/libscigraphica/Makefile
index 512050ad62b..2771baa782a 100644
--- a/graphics/libscigraphica/Makefile
+++ b/graphics/libscigraphica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/09/25 08:31:54 hira Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/25 10:03:53 hira Exp $
 #
 
 DISTNAME=	libscigraphica-2.1.1
@@ -18,7 +18,7 @@ GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE+=	libscigraphica-2.0.pc.in
 
 pre-configure:
-	${LN} -s ${PYTHONBIN} ${TOOLS_DIR}/bin/python
+	ln -s ${PYTHONBIN} ${TOOLS_DIR}/bin/python
 
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numarray/buildlink3.mk"
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index 62244a73019..ccc9a2e9330 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2007/09/25 08:31:54 hira Exp $
+# $NetBSD: Makefile,v 1.43 2007/09/25 10:03:53 hira Exp $
 #
 
 DISTNAME=	scigraphica-2.1.0
@@ -26,7 +26,7 @@ USE_LIBTOOL=		YES
 PTHREAD_AUTO_VARS=	yes
 
 pre-configure:
-	${LN} -s ${PYTHONBIN} ${TOOLS_DIR}/bin/python
+	ln -s ${PYTHONBIN} ${TOOLS_DIR}/bin/python
 
 .include "../../lang/python/application.mk"
 .include "../../graphics/libscigraphica/buildlink3.mk"
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index 80b961df4d1..fb3a6306b3d 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2007/09/25 08:31:54 hira Exp $
+# $NetBSD: Makefile,v 1.58 2007/09/25 10:03:53 hira Exp $
 
 DISTNAME=	xpm-3.4k
 PKGREVISION=	7
@@ -23,7 +23,7 @@ USE_IMAKE=	yes
 post-install:
 	cd ${PREFIX}/lib && \
 	rm -f libXpm.so.4 && \
-	${LN} -s libXpm.so.4.11 libXpm.so.4
+	ln -s libXpm.so.4.11 libXpm.so.4
 .endif
 
 .if !empty(LOWER_OPSYS:Mirix5*)
diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index d7ced1eabd4..14125e07398 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2007/08/16 00:31:21 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2007/09/25 10:07:06 hira Exp $
 
 DISTNAME=	f2c-20001205
 PKGREVISION=	9
@@ -51,11 +51,11 @@ post-extract:
 			${GUNZIP_CMD} $$f ; \
 		fi ; \
 	done
-	@${MV} ${WRKSRC}/libf77 ${WRKSRC}/libf77.sh
-	@${MV} ${WRKSRC}/libi77 ${WRKSRC}/libi77.sh
+	@mv ${WRKSRC}/libf77 ${WRKSRC}/libf77.sh
+	@mv ${WRKSRC}/libi77 ${WRKSRC}/libi77.sh
 	@cd ${WRKSRC} ; ${SH} libf77.sh ; ${SH} libi77.sh
 	@${RM} ${WRKSRC}/src/index.html
-	@${MV} ${WRKSRC}/src/.depend  ${WRKSRC}/src/depend.orig
+	@mv ${WRKSRC}/src/.depend  ${WRKSRC}/src/depend.orig
 	@${GUNZIP_CMD} ${WRKSRC}/src/*.gz
 
 do-configure:
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 1b592ae5e22..4607ba0ab81 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2007/09/25 08:31:54 hira Exp $
+# $NetBSD: Makefile,v 1.63 2007/09/25 10:03:53 hira Exp $
 
 DISTNAME=	tcl${TCL_VERSION}-src
 PKGNAME=	tcl-${TCL_VERSION}
@@ -65,7 +65,7 @@ INSTALLATION_DIRS+=	include/tcl/generic
 INSTALLATION_DIRS+=	lib/tcl
 
 post-install:
-	cd ${DESTDIR:Q}${PREFIX:Q}/bin && ${LN} -s tclsh8.4 tclsh
+	cd ${DESTDIR:Q}${PREFIX:Q}/bin && ln -s tclsh8.4 tclsh
 	${INSTALL_DATA} ${WRKSRC}/unix/tclUnixPort.h \
 		${DESTDIR:Q}${PREFIX:Q}/include/tcl/unix
 .for f in	regex.h tcl.h tclCompile.h tclDecls.h tclIO.h		\
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 27e5764a3c0..1c8f593b82b 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2007/09/25 08:49:05 hira Exp $
+# $NetBSD: Makefile,v 1.91 2007/09/25 10:07:06 hira Exp $
 
 DISTNAME=	squirrelmail-1.4.10a
 PKGREVISION=	2
@@ -86,7 +86,7 @@ do-install:
 	chmod a+x ${SMDIR:Q}/config/conf.pl
 	${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/
 	${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/
-	${MV} ${PREFIX}/share/squirrelmail/contrib/conf.pl.8 \
+	mv ${PREFIX}/share/squirrelmail/contrib/conf.pl.8 \
 	  ${PREFIX}/${PKGMANDIR}/man8/squirrelmail-conf.pl.8
 
 .include "../../lang/php/phpversion.mk"
diff --git a/net/samba/Makefile b/net/samba/Makefile
index a521c5f5344..d636cec3bf9 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.173 2007/09/25 08:31:54 hira Exp $
+# $NetBSD: Makefile,v 1.174 2007/09/25 10:03:53 hira Exp $
 
 .include "Makefile.mirrors"
 
@@ -140,7 +140,7 @@ install-samba-lib-symlinks:
 .for l in ${SMBLIBS}
 	for v in ${SMBVERSION.${l}}; do					\
 		(cd ${SAMBA_LIBDIR} && rm -f lib${l}.so.$$v &&		\
-			${LN} -s lib${l}.so lib${l}.so.$$v);		\
+			ln -s lib${l}.so lib${l}.so.$$v);		\
 	done
 .endfor
 
diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile
index 6a4ae2f496e..ce764ce26ca 100644
--- a/parallel/sge/Makefile
+++ b/parallel/sge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/09/25 08:31:54 hira Exp $
+# $NetBSD: Makefile,v 1.28 2007/09/25 10:03:53 hira Exp $
 #
 
 PKGNAME=		sge-6.0.11
@@ -123,13 +123,13 @@ do-install:
 	cd ${WRKSRC}/source && \
 		${ECHO} "Y" | ${SETENV} LOCALBASE=${LOCALBASE} SGE_ROOT=${SGE_ROOT} ./scripts/distinst -local -allall -nobdb -noopenssl ${SGE_ARCH}
 	for f in archive checkpoint deadlock dump load printlog recover stat upgrade verify ; do \
-		${LN} -s ${LOCALBASE}/bin/db4_$${f} ${SGE_ROOT}/utilbin/${SGE_ARCH}/db_$${f} ; done
-	${LN} -s ${LOCALBASE}/bin/berkeley_db4_svc ${SGE_ROOT}/utilbin/${SGE_ARCH}/berkeley_db_svc
-	${LN} -s ${SSL_PREFIX}/bin/openssl ${SGE_ROOT}/utilbin/${SGE_ARCH}/openssl
+		ln -s ${LOCALBASE}/bin/db4_$${f} ${SGE_ROOT}/utilbin/${SGE_ARCH}/db_$${f} ; done
+	ln -s ${LOCALBASE}/bin/berkeley_db4_svc ${SGE_ROOT}/utilbin/${SGE_ARCH}/berkeley_db_svc
+	ln -s ${SSL_PREFIX}/bin/openssl ${SGE_ROOT}/utilbin/${SGE_ARCH}/openssl
 	cd ${SGE_ROOT} && ${SETENV} SGE_ROOT=${SGE_ROOT} ./util/setfileperm.sh -auto \
 		${SGE_ROOT}
 	for f in ${SGE_ROOT}/bin/${SGE_ARCH}/q* ; do \
-		cd ${PREFIX}/bin && ${LN} -fs $$f ; done
+		cd ${PREFIX}/bin && ln -fs $$f ; done
 
 #% scripts/distinst -local"
 
diff --git a/regress/compiler/Makefile b/regress/compiler/Makefile
index b0e312c9e60..d6de8d4057d 100644
--- a/regress/compiler/Makefile
+++ b/regress/compiler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/09/25 08:31:54 hira Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/25 10:03:53 hira Exp $
 #
 
 DISTNAME=	compiler-1.1
@@ -15,7 +15,7 @@ USE_LANGUAGES=	c c++
 
 do-extract:
 	cd ${FILESDIR} && cp Makefile *.c ${WRKSRC}
-	cd ${WRKSRC} && for i in *.c; do ${LN} $$i $${i}c; done
+	cd ${WRKSRC} && for i in *.c; do ln $$i $${i}c; done
 
 do-wrksrc-build:
 
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 34d1d05bd4a..f1c5e7c2716 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/09/25 08:49:05 hira Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/25 10:03:54 hira Exp $
 
 DISTNAME=	cdrtools-2.01.01a35
 PKGNAME=	cdrtools-2.01.01.35
@@ -65,14 +65,14 @@ SUBST_SED.fix=		-e "s,/etc/default/cdrecord,${CDRECORD_CONF},g"
 SUBST_MESSAGE.fix=	Fixing paths.
 
 post-extract:
-	${LN} -s Defaults.freebsd ${WRKSRC}/DEFAULTS/Defaults.dragonfly
-	${LN} -s Defaults.freebsd ${WRKSRC}/DEFAULTS_ENG/Defaults.dragonfly
+	ln -s Defaults.freebsd ${WRKSRC}/DEFAULTS/Defaults.dragonfly
+	ln -s Defaults.freebsd ${WRKSRC}/DEFAULTS_ENG/Defaults.dragonfly
 
 do-configure:
 	cd ${WRKSRC}/RULES;						\
 	for suffix in netbsd-cc.rul netbsd-gcc.rul; do			\
 		if [ ! -f ${MACHINE}-$$suffix ]; then			\
-			${LN} -sf i386-$$suffix ${MACHINE}-$$suffix;	\
+			ln -sf i386-$$suffix ${MACHINE}-$$suffix;	\
 		fi;							\
 	done
 
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 0d81ec3e9b9..23fc26a17e3 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.134 2007/09/25 08:31:55 hira Exp $
+# $NetBSD: Makefile,v 1.135 2007/09/25 10:03:54 hira Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
 PKGREVISION=	4
@@ -137,7 +137,7 @@ SUBST_SED.paths+=	-e 's,@LOCALBASE@,${LOCALBASE},g'
 SUBST_STAGE.paths=	post-patch
 
 pre-configure:
-	cd ${WRKSRC}/ksysguard/ksysguardd && rm -f DragonFly && ${LN} -s FreeBSD DragonFly
+	cd ${WRKSRC}/ksysguard/ksysguardd && rm -f DragonFly && ln -s FreeBSD DragonFly
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/kde/templates/.source/emptydir
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index fbbb20d664b..71083608152 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/09/25 08:31:55 hira Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/25 10:03:54 hira Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
@@ -15,9 +15,9 @@ BUILD_QT4=		yes
 UNLIMIT_RESOURCES=	datasize
 
 post-configure:
-	${LN} -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc
-	${LN} -s ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic
-	${LN} -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc
+	ln -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc
+	ln -s ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic
+	ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc
 
 do-install:
 .for prog in assistant lrelease lupdate qmake qt3to4
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 424d6b6b781..ebe3b982f88 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2007/09/25 08:31:55 hira Exp $
+# $NetBSD: Makefile,v 1.61 2007/09/25 10:03:54 hira Exp $
 
 DISTNAME=	tk${TK_VERSION}-src
 PKGNAME=	tk-${TK_VERSION}
@@ -46,7 +46,7 @@ DESTDIRPREFIX=		${DESTDIR}${PREFIX}
 
 post-install:
 	rm -f ${DESTDIRPREFIX:Q}/bin/wish
-	${LN} -s wish8.4 ${DESTDIRPREFIX:Q}/bin/wish
+	ln -s wish8.4 ${DESTDIRPREFIX:Q}/bin/wish
 	${INSTALL_DATA} ${WRKSRC}/generic/default.h ${DESTDIRPREFIX:Q}/include/tk/generic
 	${INSTALL_DATA} ${WRKSRC}/generic/ks_names.h ${DESTDIRPREFIX:Q}/include/tk/generic
 	${INSTALL_DATA} ${WRKSRC}/generic/tk.h ${DESTDIRPREFIX:Q}/include/tk/generic