Whitespace cleanup, courtesy of pkglint.

Patch provided by Sergey Svishchev in private mail.

28 files changed, 75 insertions, 75 deletions

diff --git a/lang/STk/Makefile b/lang/STk/Makefile
index c1daa0c96ca..817a88ecb50 100644
--- a/lang/STk/Makefile
+++ b/lang/STk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2007/02/15 22:29:19 perry Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:37 wiz Exp $
 
-DISTNAME=       	STk-4.0.1
+DISTNAME=	STk-4.0.1
 PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		ftp://kaolin.unice.fr/pub/STk/
diff --git a/lang/a60/Makefile b/lang/a60/Makefile
index a34b7f3e874..e37bce177c2 100644
--- a/lang/a60/Makefile
+++ b/lang/a60/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/05 06:27:41 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:37 wiz Exp $
 
 DISTNAME=	a60-0.20a
 CATEGORIES=	lang
@@ -9,7 +9,7 @@ COMMENT=	Algol 60 interpreter
 
 GNU_CONFIGURE=	yes
 
-CPPFLAGS+= 	-Dunix
+CPPFLAGS+=	-Dunix
 
 INFO_FILES=	# PLIST
 
diff --git a/lang/baci/Makefile b/lang/baci/Makefile
index e1de82d1f89..74bed46f4ef 100644
--- a/lang/baci/Makefile
+++ b/lang/baci/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/06/20 22:12:25 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:37 wiz Exp $
 #
 
 DISTNAME=	bacisrc
@@ -16,7 +16,7 @@ DEPENDS+=	bison-[0-9]*:../../devel/bison
 
 USE_TOOLS+=	flex
 
-PLIST_SRC=      ${WRKDIR}/PLIST
+PLIST_SRC=	${WRKDIR}/PLIST
 
 INSTALLATION_DIRS=	bin
 
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index 316155e73e0..f6cf7471fb5 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2007/02/19 22:28:25 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2007/02/22 19:26:37 wiz Exp $
 #
 
 DISTNAME=		plt-${DRSCHEME_VERSION}-src-unix
@@ -23,7 +23,7 @@ COMMENT=		R4RS-compliant and nearly R5RS-compliant scheme tailored for teaching
 
 CONFLICTS+=		mzscheme-[0-9]*
 
-WRKSRC=                 ${WRKDIR}/plt/src
+WRKSRC=			${WRKDIR}/plt/src
 USE_TOOLS+=		gmake perl:run
 GNU_CONFIGURE=		yes
 
diff --git a/lang/ezm3/Makefile b/lang/ezm3/Makefile
index 52405cab3cb..f2dc01af6d2 100644
--- a/lang/ezm3/Makefile
+++ b/lang/ezm3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/20 16:21:01 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:37 wiz Exp $
 
 DISTNAME=	ezm3-1.2
 PKGREVISION=	1
@@ -25,7 +25,7 @@ EZM3ROOT=		${PREFIX}/ezm3
 BUILDLINK_PASSTHRU_DIRS+=	${EZM3ROOT}
 
 # XXX: This may well work for some others.
-ONLY_FOR_PLATFORM=      FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386 \
+ONLY_FOR_PLATFORM=	FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386 \
 			Linux-*-i386
 # DragonFly-*-i386 needs new bootstrap
 
@@ -34,13 +34,13 @@ BOOTSTRAP=	${DISTNAME}-FreeBSD4-boot.tar.bz2
 TARGET=		FreeBSD4
 TARGETDIR=	freebsd-4
 .elif ${OPSYS} == "NetBSD"
-BOOTSTRAP=      ${DISTNAME}-NetBSDi386-boot.tar.bz2
-TARGET=         NetBSDi386
-TARGETDIR=      netbsd-1
+BOOTSTRAP=	${DISTNAME}-NetBSDi386-boot.tar.bz2
+TARGET=		NetBSDi386
+TARGETDIR=	netbsd-1
 .elif ${OPSYS} == "OpenBSD"
-BOOTSTRAP=      ${DISTNAME}-OpenBSD_386-boot.tar.bz2
-TARGET=         OpenBSD_386
-TARGETDIR=      openbsd-2
+BOOTSTRAP=	${DISTNAME}-OpenBSD_386-boot.tar.bz2
+TARGET=		OpenBSD_386
+TARGETDIR=	openbsd-2
 .elif ${OPSYS} == "Linux"
 BOOTSTRAP=	${DISTNAME}-LINUXLIBC6-boot.tar.bz2
 TARGET=		LINUXLIBC6
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index b361c6f8c40..57c59b149e0 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2007/01/26 13:07:58 uebayasi Exp $
+# $NetBSD: Makefile,v 1.42 2007/02/22 19:26:37 wiz Exp $
 #
 
 DISTNAME=	Gauche-0.8.9
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--enable-multibyte=utf-8
 CONFIGURE_ARGS+=	--enable-threads=pthreads
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-iconv-lib=${BUILDLINK_LDADD.iconv:M-l*:S/-l//:Q}
-MAKE_ENV+=      	ICONV_LDFLAGS=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
+MAKE_ENV+=	ICONV_LDFLAGS=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
 
 USE_TOOLS+=	gzip makeinfo
 TEST_TARGET=	check
diff --git a/lang/jasmin/Makefile b/lang/jasmin/Makefile
index 44282ed4598..36ad3fce04a 100644
--- a/lang/jasmin/Makefile
+++ b/lang/jasmin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2006/10/04 21:46:13 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:38 wiz Exp $
 #
 
 DISTNAME=	jasmin-1.06
-CATEGORIES=     lang java
+CATEGORIES=	lang java
 MASTER_SITES=	http://mrl.nyu.edu/~meyer/jasmin/
 
 MAINTAINER=	jschauma@NetBSD.org
diff --git a/lang/jbuilder-jit/Makefile b/lang/jbuilder-jit/Makefile
index e004f5a98c0..31ea1c4acbf 100644
--- a/lang/jbuilder-jit/Makefile
+++ b/lang/jbuilder-jit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2006/05/16 13:58:25 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2007/02/22 19:26:38 wiz Exp $
 #
 
 DISTNAME=	unix_jb35foundation
 PKGNAME=	jbuilder-jit-1.2.15
 PKGREVISION=	2
-CATEGORIES=     lang java
+CATEGORIES=	lang java
 MASTER_SITES=	http://ftp.cdut.edu.cn/pub2/linux/develop/jbuilder/ \
 		http://python.planetmirror.com/ftp/jbuilder/foundation/3.5/linux/ \
 		http://planetmirror.com.au/ftp/jbuilder/foundation/3.5/linux/ \
diff --git a/lang/jikes/Makefile b/lang/jikes/Makefile
index 69ebdfe932d..603939248c8 100644
--- a/lang/jikes/Makefile
+++ b/lang/jikes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2007/02/22 19:26:38 wiz Exp $
 #
 
 DISTNAME=	jikes-1.22
@@ -13,7 +13,7 @@ COMMENT=	Java source to byte-code compiler
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
-UNLIMIT_RESOURCES=      datasize
+UNLIMIT_RESOURCES=	datasize
 
 # enable "-source 1.5" -- not complete, but does not break normal compiles
 CONFIGURE_ARGS+=	--enable-source15
diff --git a/lang/joos/Makefile b/lang/joos/Makefile
index e11ec6afa2b..69344854fa0 100644
--- a/lang/joos/Makefile
+++ b/lang/joos/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/04/02 23:07:06 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:38 wiz Exp $
 #
 
 DISTNAME=	joos-0.2
-CATEGORIES=     lang java
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://netbsd.stevens-tech.edu/pub/NetBSD/packages/distfiles/
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/lang/kaffe/Makefile.common b/lang/kaffe/Makefile.common
index 765362cf932..9c10bd8a231 100644
--- a/lang/kaffe/Makefile.common
+++ b/lang/kaffe/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2006/05/23 10:30:32 rumble Exp $
+# $NetBSD: Makefile.common,v 1.16 2007/02/22 19:26:38 wiz Exp $
 
 DISTNAME=		kaffe-1.1.7
 CATEGORIES=		lang java
@@ -8,7 +8,7 @@ MAINTAINER=		tonio@NetBSD.org
 HOMEPAGE=		http://www.kaffe.org/
 COMMENT=		Virtual machine capable of running Java(tm) code
 
-DEPENDS+=       jikes>=1.22:../../lang/jikes
+DEPENDS+=	jikes>=1.22:../../lang/jikes
 DEPENDS+=	fastjar>=0.93:../../archivers/fastjar
 
 EXTRACT_USING=	gtar
diff --git a/lang/kali/Makefile b/lang/kali/Makefile
index 4013efd0004..92c1fd4a731 100644
--- a/lang/kali/Makefile
+++ b/lang/kali/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:38 wiz Exp $
 
 DISTNAME=	kali-0.47
 CATEGORIES=	lang
@@ -11,6 +11,6 @@ COMMENT=	Distributed implementation of Scheme
 GNU_CONFIGURE=	yes
 BUILD_TARGET=	# empty
 
-NOT_FOR_PLATFORM=       *-*-alpha
+NOT_FOR_PLATFORM=	*-*-alpha
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/mawk/Makefile b/lang/mawk/Makefile
index a6701ab5c0d..2acc7b3491e 100644
--- a/lang/mawk/Makefile
+++ b/lang/mawk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2005/12/27 21:20:49 reed Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:26:38 wiz Exp $
 #
 
-DISTNAME=       mawk-1.3.3
+DISTNAME=	mawk-1.3.3
 CATEGORIES=	lang
-MASTER_SITES=   ftp://ftp.whidbey.net/pub/brennan/ \
+MASTER_SITES=	ftp://ftp.whidbey.net/pub/brennan/ \
 		ftp://ftp.fu-berlin.de/unix/languages/mawk/
 
 MAINTAINER=	agc@NetBSD.org
@@ -21,7 +21,7 @@ TEST_TARGET=	mawk_test fpe_test
 CFLAGS:=	${CFLAGS:S/-ffast-math//}
 
 .if ${OPSYS} == "SunOS"
-MAKE_ENV+=              CPPFLAGS=
+MAKE_ENV+=		CPPFLAGS=
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 049f61b1ea4..51c3ce27f42 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2006/03/04 21:29:55 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:38 wiz Exp $
 
-DISTNAME=       mos20src
-PKGNAME=        moscow_ml-2.00
+DISTNAME=	mos20src
+PKGNAME=	moscow_ml-2.00
 PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.dina.kvl.dk/pub/mosml/ \
diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile
index 1f54a983aa6..88405dd9180 100644
--- a/lang/nawk/Makefile
+++ b/lang/nawk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2006/07/14 16:24:28 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/22 19:26:38 wiz Exp $
 
-DISTNAME=       nawk-20050424
+DISTNAME=	nawk-20050424
 CATEGORIES=	lang
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/lang/p2c/Makefile b/lang/p2c/Makefile
index 21903e2a0b5..cebcb38167d 100644
--- a/lang/p2c/Makefile
+++ b/lang/p2c/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:38 wiz Exp $
 
 DISTNAME=	p2c-1.20
 CATEGORIES=	lang
 MASTER_SITES=	ftp://csvax.cs.caltech.edu/pub/
-EXTRACT_SUFX=   .tar.Z
+EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	jwise@NetBSD.org
 COMMENT=	Pascal to C compiler (translates Pascal to C)
diff --git a/lang/py-extclass/Makefile b/lang/py-extclass/Makefile
index 3392e49eec2..725b966bc5b 100644
--- a/lang/py-extclass/Makefile
+++ b/lang/py-extclass/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.18 2006/10/04 21:46:14 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:39 wiz Exp $
 #
 
 DISTNAME=	Zope-2.2.2-src
 PKGNAME=	py-extclass-2.2.2
 PKGREVISION=	1
 CATEGORIES=	lang python
-MASTER_SITES=   http://www.zope.org/Products/Zope/2.2.2/
+MASTER_SITES=	http://www.zope.org/Products/Zope/2.2.2/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://cvs.zope.org/*checkout*/Cruft/ExtensionClass/doc/Attic/Acquisition.html?rev=1.2
 COMMENT=	Python-extensible C "classes" and Acquisition for Python
 
-EXTRACT_ELEMENTS=       ${DISTNAME}/lib/Components/ExtensionClass
+EXTRACT_ELEMENTS=	${DISTNAME}/lib/Components/ExtensionClass
 WRKSRC=			${WRKDIR}/${DISTNAME}/lib/Components/ExtensionClass
 
 do-configure:
diff --git a/lang/py-funge/Makefile b/lang/py-funge/Makefile
index aa3888559d1..32d1b9047fa 100644
--- a/lang/py-funge/Makefile
+++ b/lang/py-funge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:39 wiz Exp $
 
 DISTNAME=	pyfunge-0.2-beta1
 PKGNAME=	${PYPKGPREFIX}-funge-0.2beta1
@@ -13,12 +13,12 @@ COMMENT=	Extensible Funge-98 interpreter written in Python
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
 
-PYTHON_VERSIONS_ACCEPTED?=      23
+PYTHON_VERSIONS_ACCEPTED?=	23
 
 WRKSRC?=	${WRKDIR}/PyFunge
 PLIST_SUBST+=	PYSITELIB=${PYSITELIB:Q}
 
-PYCOMPILEALL=   ${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
+PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE}
diff --git a/lang/py-psyco/Makefile b/lang/py-psyco/Makefile
index 332127937d4..bcfd8e9f55f 100644
--- a/lang/py-psyco/Makefile
+++ b/lang/py-psyco/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2006/10/04 21:46:14 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:39 wiz Exp $
 
-DISTNAME=       psyco-1.4-src
+DISTNAME=	psyco-1.4-src
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-src//}
 PKGREVISION=     1
-CATEGORIES=     lang python
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=psyco/}
+CATEGORIES=	lang python
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=psyco/}
 
-MAINTAINER=     pkgsrc-users@NetBSD.org
-HOMEPAGE=       http://psyco.sourceforge.net/
-COMMENT=        Python JIT and execution accelerator
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://psyco.sourceforge.net/
+COMMENT=	Python JIT and execution accelerator
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 PYDISTUTILSPKG=	YES
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 382bddaca22..ef8627d16ba 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/07/22 00:37:56 minskim Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:39 wiz Exp $
 #
 
 DISTNAME=	py152
@@ -27,11 +27,11 @@ REPLACE_FILES.py15=	Lib/cgi.py	# explicitly demanded to be patched
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_SRC=      ${.CURDIR}/../../lang/python15/PLIST.common
+PLIST_SRC=	${.CURDIR}/../../lang/python15/PLIST.common
 .if exists(${.CURDIR}/../../lang/python15/PLIST.${OPSYS})
-PLIST_SRC+=     ${.CURDIR}/../../lang/python15/PLIST.${OPSYS}
+PLIST_SRC+=	${.CURDIR}/../../lang/python15/PLIST.${OPSYS}
 .endif
-PLIST_SRC+=     ${.CURDIR}/../../lang/python15/PLIST.common_end
+PLIST_SRC+=	${.CURDIR}/../../lang/python15/PLIST.common_end
 
 .if ${OPSYS} == "Darwin"
 PY_PLATNAME=	${LOWER_OPSYS}
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index a801a1c3899..bfefa69d44f 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/06/17 22:07:33 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2007/02/22 19:26:39 wiz Exp $
 #
 
 DISTNAME=	Python-2.2.3
@@ -36,7 +36,7 @@ PLIST_SRC+=	${.CURDIR}/../../lang/python22/PLIST.common_end
 .if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
 PLIST_SUBST+=	PY_PLATNAME=${LOWER_OPSYS:Q}
 .elif ${OPSYS} == "IRIX"
-PLIST_SUBST+=   PY_PLATNAME=${LOWER_OPSYS:C/\..*//}
+PLIST_SUBST+=	PY_PLATNAME=${LOWER_OPSYS:C/\..*//}
 .elif ${OPSYS} == "SunOS"
 PLIST_SUBST+=	PY_PLATNAME=sunos${OS_VERSION:C/\..*//}
 .else
@@ -66,5 +66,5 @@ post-extract:
 # set earlier in the environment (last definition wins).
 #
 .if ${OBJECT_FMT} == "a.out"
-MAKE_ENV+=      LDFLAGS="${LDFLAGS:S/-Wl,//}"
+MAKE_ENV+=	LDFLAGS="${LDFLAGS:S/-Wl,//}"
 .endif
diff --git a/lang/python23-nth/Makefile b/lang/python23-nth/Makefile
index f73ca87d13c..28b6c7499ea 100644
--- a/lang/python23-nth/Makefile
+++ b/lang/python23-nth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/05/14 20:46:37 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:39 wiz Exp $
 #
 
 PKGNAME=	python23-nth-2.3.5
@@ -6,7 +6,7 @@ PKGREVISION=	6
 
 CONFLICTS+=	python-[0-9]*
 
-CONFIGURE_ARGS+=        --without-threads
+CONFIGURE_ARGS+=	--without-threads
 
 PY_VER_SUFFIX=	2n3
 
diff --git a/lang/sablevm-classpath/Makefile b/lang/sablevm-classpath/Makefile
index 5bfe7fd7974..add8c8d7eb8 100644
--- a/lang/sablevm-classpath/Makefile
+++ b/lang/sablevm-classpath/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2006/04/23 20:03:06 tonio Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:39 wiz Exp $
 #
 
 .include "Makefile.common"
 PKGREVISION=	1
-BUILD_DEPENDS+=         zip>=2.3:../../archivers/zip
+BUILD_DEPENDS+=		zip>=2.3:../../archivers/zip
 
 INFO_FILES=		# PLIST
 
diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common
index 448a4064f46..36aec2553ec 100644
--- a/lang/sun-jre13/Makefile.common
+++ b/lang/sun-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2006/09/25 16:16:35 joerg Exp $
+# $NetBSD: Makefile.common,v 1.32 2007/02/22 19:26:39 wiz Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 CATEGORIES=	lang java
@@ -7,7 +7,7 @@ EXTRACT_SUFX=	.bin
 MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://java.sun.com/
 DOWNLOAD=	http://java.sun.com/j2se/1.3/download.html
-ARCHIVE=        http://java.sun.com/products/archive/index.html
+ARCHIVE=	http://java.sun.com/products/archive/index.html
 
 LICENSE=	jdk13-license
 RESTRICTED=	Redistribution of repackaged binaries not permitted
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index d4375cc221e..91dacbf52f7 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/12/28 11:51:12 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2007/02/22 19:26:39 wiz Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -37,7 +37,7 @@ PKG_SUPPORTED_OPTIONS=	sun-jre-jce
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_SRC=      	${WRKDIR}/PLIST
+PLIST_SRC=	${WRKDIR}/PLIST
 
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jce_policy-1_4_2.zip
diff --git a/lang/swi-prolog-lite/Makefile.common b/lang/swi-prolog-lite/Makefile.common
index 098c76cc968..6051bd460dc 100644
--- a/lang/swi-prolog-lite/Makefile.common
+++ b/lang/swi-prolog-lite/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2006/08/02 15:15:36 kristerw Exp $
+# $NetBSD: Makefile.common,v 1.5 2007/02/22 19:26:40 wiz Exp $
 
 SWIPLVERS=		5.6.17
 DISTNAME=		pl-${SWIPLVERS}
@@ -11,4 +11,4 @@ DIST_SUBDIR=		swi-prolog
 DISTINFO_FILE=		${.CURDIR}/../../lang/swi-prolog-lite/distinfo
 PATCHDIR=		${.CURDIR}/../../lang/swi-prolog-lite/patches
 
-PLIST_SUBST+=           APPEND_ELF=${APPEND_ELF:Q}
+PLIST_SUBST+=		APPEND_ELF=${APPEND_ELF:Q}
diff --git a/lang/tcl-expect/Makefile b/lang/tcl-expect/Makefile
index 0ae1e6d6d85..2f54e597cfe 100644
--- a/lang/tcl-expect/Makefile
+++ b/lang/tcl-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/08 11:54:04 adam Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:40 wiz Exp $
 
 .include "Makefile.common"
 
@@ -13,7 +13,7 @@ CONFLICTS+=	expect-[0-9]*
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--with-tclconfig=${PREFIX}/lib
 CONFIGURE_ARGS+=	--with-tclinclude=${PREFIX}/include/tcl
-CONFIGURE_ARGS+= 	--without-x
+CONFIGURE_ARGS+=	--without-x
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tk-expect/Makefile b/lang/tk-expect/Makefile
index 94fbda9b703..2843e734293 100644
--- a/lang/tk-expect/Makefile
+++ b/lang/tk-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:57 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:40 wiz Exp $
 
 .include "../../lang/tcl-expect/Makefile.common"
 
@@ -11,7 +11,7 @@ COMMENT=	Tcl interpreter with both the expect and tk extensions built in
 
 DEPENDS+=	tcl-expect>=${EXPECT_VERSION}:../../lang/tcl-expect
 
-CONFIGURE_ARGS+= 	--enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--with-tclconfig=${PREFIX}/lib
 CONFIGURE_ARGS+=	--with-tclinclude=${PREFIX}/include/tcl
 CONFIGURE_ARGS+=	--with-tkconfig=${PREFIX}/lib