Whitespace cleanup, courtesy of pkglint.

Patch provided by Sergey Svishchev in private mail.

38 files changed, 96 insertions, 96 deletions

diff --git a/x11/Xfixes/Makefile b/x11/Xfixes/Makefile
index d298feeaef0..256828d46e6 100644
--- a/x11/Xfixes/Makefile
+++ b/x11/Xfixes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/07/31 21:29:16 reed Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 19:27:25 wiz Exp $
 #
 
 DISTNAME=		libXfixes-2.0.1
@@ -20,7 +20,7 @@ USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-PKGCONFIG_OVERRIDE+=    xfixes.pc.in
+PKGCONFIG_OVERRIDE+=	xfixes.pc.in
 
 .include "../../mk/bsd.prefs.mk"
 .if (${OPSYS} == "Darwin")
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index c2c4ec985f9..39c97ab8a0c 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.41 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2007/02/22 19:27:25 wiz Exp $
 #
 
-DISTNAME=       XmHTML-1.1.7
+DISTNAME=	XmHTML-1.1.7
 PKGREVISION=	6
 CATEGORIES=	x11
-MASTER_SITES=   http://www.xs4all.nl/~ripley/XmHTML/dist/
+MASTER_SITES=	http://www.xs4all.nl/~ripley/XmHTML/dist/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.xs4all.nl/~ripley/XmHTML/
diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile
index 135db3e0fee..6df3872aa6f 100644
--- a/x11/Xrandr-mixedcase/Makefile
+++ b/x11/Xrandr-mixedcase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/12/27 13:37:42 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:27:25 wiz Exp $
 #
 
 DISTNAME=		libXrandr-1.0.2
@@ -21,7 +21,7 @@ USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-PKGCONFIG_OVERRIDE+=    xrandr.pc.in
+PKGCONFIG_OVERRIDE+=	xrandr.pc.in
 
 BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 
diff --git a/x11/dfm/Makefile.common b/x11/dfm/Makefile.common
index 42ee549c4b0..3ecf052ae71 100644
--- a/x11/dfm/Makefile.common
+++ b/x11/dfm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: Makefile.common,v 1.14 2007/02/22 19:27:26 wiz Exp $
 #
 
 DISTNAME=	dfm-0.99.9
@@ -7,7 +7,7 @@ MASTER_SITES=	http://www.kaisersite.de/dfm/
 WRKSRC=			${WRKDIR}/dfm
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+= 	--enable-imlib-icons
+CONFIGURE_ARGS+=	--enable-imlib-icons
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/imlib/buildlink3.mk"
diff --git a/x11/fixesproto/builtin.mk b/x11/fixesproto/builtin.mk
index cd1705df929..faa3b6bbb16 100644
--- a/x11/fixesproto/builtin.mk
+++ b/x11/fixesproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2006/12/16 01:04:43 joerg Exp $
+# $NetBSD: builtin.mk,v 1.6 2007/02/22 19:27:26 wiz Exp $
 
 BUILTIN_PKG:=	fixesproto
 
@@ -22,7 +22,7 @@ IS_BUILTIN.fixesproto=	no
 # Here, we skip checking whether the files are under ${LOCALBASE} since
 # we'll consider this X11 package to be built-in even if it's a part
 # of one of the pkgsrc-installed X11 distributions.
-#  
+#
 .  if empty(H_XFIXESPROTO:M__nonexistent__) && \
       empty(H_XFIXESWIRE:M__nonexistent__)
 IS_BUILTIN.fixesproto=	yes
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 981f9a529bb..7d53a01633d 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2007/01/02 12:42:45 joerg Exp $
+# $NetBSD: Makefile,v 1.62 2007/02/22 19:27:26 wiz Exp $
 
 DISTNAME=	fltk-1.1.7-source
 PKGNAME=	${DISTNAME:S/-source//}
@@ -32,10 +32,10 @@ CONFIGURE_ARGS+=	--enable-libtool=${LIBTOOL:Q}
 CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ARGS+=	ac_cv_have_overlay=yes
 .if exists(./descr)
-PLIST_SUBST+=           WITH_LINKS="@comment "
+PLIST_SUBST+=		WITH_LINKS="@comment "
 .else
 CONFIGURE_ARGS+=	--with-links
-PLIST_SUBST+=           WITH_LINKS=""
+PLIST_SUBST+=		WITH_LINKS=""
 .endif
 
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index 02f5e25bfa8..54bb9e82d48 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/12/27 13:37:42 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2007/02/22 19:27:26 wiz Exp $
 #
 
 DISTNAME=		gnome-mag-0.13.1
@@ -16,7 +16,7 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-PKGCONFIG_OVERRIDE+=    gnome-mag-1.0.pc.in
+PKGCONFIG_OVERRIDE+=	gnome-mag-1.0.pc.in
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 90b045874a3..b8dc2bdbe16 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2007/02/02 20:07:38 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2007/02/22 19:27:26 wiz Exp $
 #
 
 DISTNAME=		gnome-panel-2.16.3
@@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE=	libpanel-applet/libpanelapplet-2.0.pc.in
 
 #CPPFLAGS+=	-DPANEL_GNOME_LOGO_ICON="\"netbsd-logo-icon-transparent\""
 
-GCONF2_SCHEMAS= 	clock.schemas
+GCONF2_SCHEMAS=	clock.schemas
 GCONF2_SCHEMAS+=	fish.schemas
 GCONF2_SCHEMAS+=	panel-global.schemas
 GCONF2_SCHEMAS+=	panel-general.schemas
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 6c2f02241e3..b88e5ab5abf 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2007/01/16 20:43:06 joerg Exp $
+# $NetBSD: Makefile,v 1.80 2007/02/22 19:27:26 wiz Exp $
 #
 
 DISTNAME=		gnome-session-2.16.2
@@ -26,7 +26,7 @@ MAKE_ENV+=		REAL_GCONFTOOL=${GCONFTOOL2:Q}
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
 CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 
-GCONF2_SCHEMAS= 	gnome-session.schemas
+GCONF2_SCHEMAS=	gnome-session.schemas
 
 BUILDLINK_API_DEPENDS.esound+=	esound>=0.2.26
 BUILDLINK_API_DEPENDS.gnome-keyring+=	gnome-keyring>=0.5.1
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index fda62880029..6c65716a226 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2007/01/15 23:30:38 joerg Exp $
+# $NetBSD: Makefile,v 1.75 2007/02/22 19:27:27 wiz Exp $
 #
 
 DISTNAME=	control-center-2.16.2
@@ -31,7 +31,7 @@ PKGCONFIG_OVERRIDE+=	libwindow-settings/gnome-window-settings-2.0.pc
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=	vfsmoduleconfdir=${PREFIX}/share/examples/${PKGBASE}
 
-GCONF2_SCHEMAS= 	apps_gnome_settings_daemon_default_editor.schemas
+GCONF2_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas
 GCONF2_SCHEMAS+=	apps_gnome_settings_daemon_keybindings.schemas
 GCONF2_SCHEMAS+=	apps_gnome_settings_daemon_screensaver.schemas
 GCONF2_SCHEMAS+=	desktop_gnome_font_rendering.schemas
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 40d2d3c2a86..af2ac57288a 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2007/01/13 00:43:41 joerg Exp $
+# $NetBSD: Makefile,v 1.63 2007/02/22 19:27:27 wiz Exp $
 #
 
 DISTNAME=		gnome-terminal-2.16.1
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_LIBTOOL=		YES
 
-GCONF2_SCHEMAS= 	gnome-terminal.schemas
+GCONF2_SCHEMAS=	gnome-terminal.schemas
 
 BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.10.0
 BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index 55b68c78398..56177c8ed92 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/09/16 12:20:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.49 2007/02/22 19:27:27 wiz Exp $
 #
 
 DISTNAME=		gnopernicus-1.1.1
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 CONFIGURE_ARGS+=	--disable-gtk-doc
 
-PKGCONFIG_OVERRIDE+=    gnopernicus-1.0.pc.in
+PKGCONFIG_OVERRIDE+=	gnopernicus-1.0.pc.in
 
 GCONF2_SCHEMAS+=	brlmonitor.schemas
 GCONF2_SCHEMAS+=	gnopernicus.schemas
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index afa435b36a0..1295e2c485b 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2007/02/07 20:38:04 abs Exp $
+# $NetBSD: Makefile,v 1.123 2007/02/22 19:27:27 wiz Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
 PKGREVISION=	2
@@ -123,8 +123,8 @@ GCC_REQD+=		2.95
 #
 .if ${OPSYS} == "NetBSD"
 .  if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc")
-CXXFLAGS:=      ${CXXFLAGS:C/-O[0-9]*/-O/g}
-CFLAGS:=        ${CFLAGS:C/-O[0-9]*/-O/g}
+CXXFLAGS:=	${CXXFLAGS:C/-O[0-9]*/-O/g}
+CFLAGS:=	${CFLAGS:C/-O[0-9]*/-O/g}
 CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
 CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
 .  endif
diff --git a/x11/kmessage/Makefile b/x11/kmessage/Makefile
index 58fff117da1..1483351895e 100644
--- a/x11/kmessage/Makefile
+++ b/x11/kmessage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/01/26 04:34:53 markd Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:27 wiz Exp $
 
 DISTNAME=	kmessage-0.1
 PKGREVISION=	10
@@ -7,12 +7,12 @@ MASTER_SITES=	http://soliton.wins.uva.nl/~wijnhout/kmessage/
 
 MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://soliton.wins.uva.nl/~wijnhout/kmessage/
-COMMENT= 	KMessage is an xmessage clone for KDE
+COMMENT=	KMessage is an xmessage clone for KDE
 
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
-GNU_CONFIGURE=          YES
+GNU_CONFIGURE=		YES
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/x11/py-Pmw/Makefile b/x11/py-Pmw/Makefile
index 66e417cc74e..9eb2deece38 100644
--- a/x11/py-Pmw/Makefile
+++ b/x11/py-Pmw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:31:10 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:27:27 wiz Exp $
 #
 
 DISTNAME=	Pmw.1.2
@@ -11,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pmw.sourceforge.net/
 COMMENT=	Python meta widgets
 
-PLIST_SRC=      ${WRKDIR}/.PLIST_SRC
+PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
 WRKSRC=		${WRKDIR}/Pmw
 
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index 29fcda6317f..b7cdebca1dd 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/01/19 18:04:03 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/22 19:27:27 wiz Exp $
 #
 
 DISTNAME=	sip-4.3.2
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=	CFLAGS_SHLIB=-fPIC
 CONFIGURE_ARGS+=	CXXFLAGS_SHLIB=-fPIC
 .if ${OPSYS} == "SunOS" && !empty(CC_VERSION:Mgcc*)
 # gcc3 uses -mimpure-text to not pass -assert pure-text to the linker
-CONFIGURE_ARGS+=        LFLAGS_SHLIB="-shared -mimpure-text"
+CONFIGURE_ARGS+=	LFLAGS_SHLIB="-shared -mimpure-text"
 .else
 CONFIGURE_ARGS+=       LFLAGS_SHLIB="-shared"
 .endif
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 9ff4a3cc7f9..f467fca115c 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.62 2007/01/10 10:16:01 joerg Exp $
+# $NetBSD: Makefile.common,v 1.63 2007/02/22 19:27:27 wiz Exp $
 
 DISTNAME=	qt-x11-free-${QTVERSION}
 CATEGORIES=	x11
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	< ${FILESDIR}/license-acceptance
 LIBQT?=			-lqt-mt
 
 MAKE_ENV+=		QTPREFIX=${QTPREFIX:Q}
-MAKE_ENV+=              QTDIR=${WRKSRC:Q}
+MAKE_ENV+=		QTDIR=${WRKSRC:Q}
 
 # avoid creating a .qt directory in the users home
 # directory
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index 7c3c58b0b2d..783ef60bd0f 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:16 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:27:27 wiz Exp $
 
 DISTNAME=	qwt-0.3.0
 PKGREVISION=	5
 CATEGORIES=	x11
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=qwt/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qwt/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/qwt
diff --git a/x11/randrproto/builtin.mk b/x11/randrproto/builtin.mk
index 8616e4db31f..94fa8856656 100644
--- a/x11/randrproto/builtin.mk
+++ b/x11/randrproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/12/16 01:04:43 joerg Exp $
+# $NetBSD: builtin.mk,v 1.4 2007/02/22 19:27:27 wiz Exp $
 
 # TODO: builtin.mk failed to use native on XFree86
 # the two headers are identical with native XFree86
@@ -22,12 +22,12 @@ IS_BUILTIN.randrproto=	no
 # Here, we skip checking whether the files are under ${LOCALBASE} since
 # we'll consider this X11 package to be built-in even if it's a part
 # of one of the pkgsrc-installed X11 distributions.
-#  
+#
 .  if empty(H_RANDR:M__nonexistent__)
 IS_BUILTIN.randrproto=	yes
 .  endif
 .endif
-MAKEVARS+=      IS_BUILTIN.randrproto
+MAKEVARS+=	IS_BUILTIN.randrproto
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
diff --git a/x11/wmavgload/Makefile b/x11/wmavgload/Makefile
index 7e6cb4acf98..c74aa872f46 100644
--- a/x11/wmavgload/Makefile
+++ b/x11/wmavgload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:43 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:27 wiz Exp $
 
 DISTNAME=	wmavgload-0.7.0
 PKGREVISION=	1
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.windowmaker.info/pub/contrib/srcs/utils/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Another WindowMaker load gauge
 
-USE_IMAKE=      	YES
+USE_IMAKE=	YES
 
 NO_INSTALL_MANPAGES=	YES
 
diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile
index bbf609991c3..b3ba68f0aa1 100644
--- a/x11/x11vnc/Makefile
+++ b/x11/x11vnc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2007/02/04 16:27:42 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:28 wiz Exp $
 #
 
 DISTNAME=	x11vnc-0.8.4
 CATEGORIES=	x11 net
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=libvncserver/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libvncserver/}
 
 MAINTAINER=	obata@lins.jp
 HOMEPAGE=	http://www.karlrunge.com/x11vnc/
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 1a57675c415..a5f6bd3ae6f 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/12/27 13:37:43 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:27:28 wiz Exp $
 
 DISTNAME=	x3270-3213
 PKGNAME=	x3270-3.2.13
@@ -7,7 +7,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Peaks/7814/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=     pkgsrc-users@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.geocities.com/SiliconValley/Peaks/7814/
 COMMENT=	3270 Terminal emulator
 
diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile
index 1c092c4e89a..f8fcdc0c054 100644
--- a/x11/xcursor/Makefile
+++ b/x11/xcursor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:27:28 wiz Exp $
 #
 
 DISTNAME=		libXcursor-1.1.2
@@ -21,7 +21,7 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-PKGCONFIG_OVERRIDE+=    xcursor.pc.in
+PKGCONFIG_OVERRIDE+=	xcursor.pc.in
 
 BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 
diff --git a/x11/xextproto/builtin.mk b/x11/xextproto/builtin.mk
index ce395c4d5c7..8e8dd7e329f 100644
--- a/x11/xextproto/builtin.mk
+++ b/x11/xextproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/12/17 19:10:22 joerg Exp $
+# $NetBSD: builtin.mk,v 1.5 2007/02/22 19:27:28 wiz Exp $
 
 BUILTIN_PKG:=	xextproto
 
@@ -20,7 +20,7 @@ IS_BUILTIN.xextproto=	no
 # Here, we skip checking whether the files are under ${LOCALBASE} since
 # we'll consider this X11 package to be built-in even if it's a part
 # of one of the pkgsrc-installed X11 distributions.
-#  
+#
 .  if empty(H_XEXTPROTO:M__nonexistent__)
 IS_BUILTIN.xextproto=	yes
 .  endif
diff --git a/x11/xgas/Makefile b/x11/xgas/Makefile
index 7162ef0d48d..0028747076c 100644
--- a/x11/xgas/Makefile
+++ b/x11/xgas/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:45 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:28 wiz Exp $
 
 DISTNAME=	xgas
-PKGNAME=        xgas-1.0
+PKGNAME=	xgas-1.0
 PKGREVISION=	2
-CATEGORIES=     x11
-MASTER_SITES=   ftp://ftp.tut.ac.jp/.h3/X11/X11R6/contrib/programs/
+CATEGORIES=	x11
+MASTER_SITES=	ftp://ftp.tut.ac.jp/.h3/X11/X11R6/contrib/programs/
 
-MAINTAINER=     nakai@mlab.t.u-tokyo.ac.jp
+MAINTAINER=	nakai@mlab.t.u-tokyo.ac.jp
 COMMENT=	Animated simulation of an ideal gas
 
-USE_IMAKE=      yes
+USE_IMAKE=	yes
 
 post-install:
 	@${CHMOD} 755 ${PREFIX}/bin/xgas
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index aea9a64c828..8b1180ab719 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:45 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:28 wiz Exp $
 #
 
 DISTNAME=	xkeycaps-2.46
@@ -12,7 +12,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.jwz.org/xkeycaps/
 COMMENT=	Graphical front-end to xmodmap
 
-USE_IMAKE=      yes
+USE_IMAKE=	yes
 
 pre-configure:
 .if (${MACHINE_ARCH} == "m68k")
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index 852bd07b2df..fe9cdf8ada5 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.46 2006/12/27 13:37:46 joerg Exp $
+# $NetBSD: Makefile.common,v 1.47 2007/02/22 19:27:28 wiz Exp $
 #
 # This Makefile.common is included by:
 #
@@ -8,7 +8,7 @@
 # If these packages are updated, please remember to reset any PKGREVISIONs
 # in those Makefiles.
 
-DISTNAME=       xlockmore-5.23
+DISTNAME=	xlockmore-5.23
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
 		ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
@@ -51,12 +51,12 @@ CPPFLAGS+=		${DEFINES}
 CXXFLAGS+=		${DEFINES}
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=        --without-motif
-CONFIGURE_ARGS+=        --without-editres
-CONFIGURE_ARGS+=        --without-dtsaver
-CONFIGURE_ARGS+=        --without-rplay
-CONFIGURE_ARGS+=        --without-nas
-CONFIGURE_ARGS+=        --without-gtk
+CONFIGURE_ARGS+=	--without-motif
+CONFIGURE_ARGS+=	--without-editres
+CONFIGURE_ARGS+=	--without-dtsaver
+CONFIGURE_ARGS+=	--without-rplay
+CONFIGURE_ARGS+=	--without-nas
+CONFIGURE_ARGS+=	--without-gtk
 
 .if ${OPSYS} == "NetBSD"
 XLOCK_AUDIOPLAY?=	/usr/bin/audioplay
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index b7b961592d1..7a9d78cee88 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:46 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:28 wiz Exp $
 
 DISTNAME=	xmascot2.5p2
-PKGNAME=        xmascot-2.5p2
+PKGNAME=	xmascot-2.5p2
 PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://cclub.tutcc.tut.ac.jp/pub/xmascot/
diff --git a/x11/xnodecor/Makefile b/x11/xnodecor/Makefile
index 39de66928cc..0e08ffe354e 100644
--- a/x11/xnodecor/Makefile
+++ b/x11/xnodecor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/01/15 18:13:31 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:28 wiz Exp $
 
 DISTNAME=	xnodecor-0.1
 PKGREVISION=	1
@@ -8,7 +8,7 @@ DISTFILES=	xnodecor.c
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	# none
-COMMENT=        Borderless or undecorated window support utility
+COMMENT=	Borderless or undecorated window support utility
 
 USE_X11BASE=	yes
 NO_CONFIGURE=	yes
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 367dbf53dcc..e8504c406c2 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/12/15 20:33:06 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2007/02/22 19:27:28 wiz Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-clients-${XORG_VER}
@@ -26,10 +26,10 @@ USE_TOOLS+=	perl:run imake
 REPLACE_PERL+=	fonts/util/bdftruncate.pl
 
 # XXX TODO: define build's VarDirectory to pkgsrc's VARBASE
-OWN_DIRS=               ${VARBASE}/lib/xdm
-OWN_DIRS_PERMS+=        ${VARBASE}/lib/xdm/authdir \
+OWN_DIRS=		${VARBASE}/lib/xdm
+OWN_DIRS_PERMS+=	${VARBASE}/lib/xdm/authdir \
 	${ROOT_USER} ${ROOT_GROUP} 0700
-OWN_DIRS_PERMS+=        ${VARBASE}/lib/xdm/authdir/authfiles \
+OWN_DIRS_PERMS+=	${VARBASE}/lib/xdm/authdir/authfiles \
 	${ROOT_USER} ${ROOT_GROUP} 0700
 
 EGDIR=			${PREFIX}/share/examples/xorg/xdm
diff --git a/x11/xphoon/Makefile b/x11/xphoon/Makefile
index ff5261c72f8..9c83fd08f57 100644
--- a/x11/xphoon/Makefile
+++ b/x11/xphoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/12/27 13:37:46 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:27:29 wiz Exp $
 #
 
 DISTNAME=	xphoon.tar
@@ -14,7 +14,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Set the root window to the moon in its current phase
 
 WRKSRC=		${WRKDIR}/xphoon
-USE_IMAKE=      yes
+USE_IMAKE=	yes
 
 MAKE_FLAGS+=	EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}
 
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index fd99ed797ca..1cbe3e9996a 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2007/01/26 18:22:48 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2007/02/22 19:27:29 wiz Exp $
 
 DISTNAME=	xplanet-1.2.0
 PKGREVISION=	3
@@ -20,9 +20,9 @@ XPLANET_DIRS=		arcs config fonts images markers origin
 XPLANET_DIRS+=		satellites scripts spice stars
 INSTALLATION_DIRS+=	${XPLANET_DIRS:C,.*,share/xplanet/&,g}
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.xplanet
-PKG_SUPPORTED_OPTIONS=  x11
-PKG_SUGGESTED_OPTIONS=  x11
+PKG_OPTIONS_VAR=	PKG_OPTIONS.xplanet
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile
index 99d73bf8046..41dafe52ba4 100644
--- a/x11/xscreensaver-demo/Makefile
+++ b/x11/xscreensaver-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/01/07 09:14:16 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/22 19:27:29 wiz Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-demo-/}
@@ -12,8 +12,8 @@ USE_DIRS+=	xdg-1.1
 
 USE_TOOLS+=		pkg-config
 
-CONFIGURE_ARGS+=        --with-gtk=${BUILDLINK_PREFIX.gtk2}
-CONFIGURE_ARGS+=        --with-xml=${BUILDLINK_PREFIX.libxml2}
+CONFIGURE_ARGS+=	--with-gtk=${BUILDLINK_PREFIX.gtk2}
+CONFIGURE_ARGS+=	--with-xml=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=	--with-configdir=${PREFIX}/libexec/xscreensaver/config
 
 BUILD_DIRS=		${WRKSRC}/utils ${WRKSRC}/driver
diff --git a/x11/xservers/Makefile b/x11/xservers/Makefile
index cdd4fe72d3b..490d371be12 100644
--- a/x11/xservers/Makefile
+++ b/x11/xservers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/04/22 09:22:18 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:27:29 wiz Exp $
 
 DISTNAME=	xservers-3.3.6.5
 PKGREVISION=	2
@@ -21,7 +21,7 @@ X11_SUBDIR=	X11R6.3
 
 MESSAGE_SUBST+=	X11_SUBDIR=${X11_SUBDIR}
 
-BUILDLINK_PASSTHRU_RPATHDIRS+= 	${PREFIX}/X11R6.3/lib
+BUILDLINK_PASSTHRU_RPATHDIRS+=	${PREFIX}/X11R6.3/lib
 
 do-configure:
 	${SED} -e 's#@PROJECTROOT@#${PREFIX}/${X11_SUBDIR}#' \
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index d647361accf..65d1c77b74d 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/12/27 13:37:46 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 19:27:29 wiz Exp $
 
 DISTNAME=	xsnow-1.42
 PKGREVISION=	2
@@ -16,7 +16,7 @@ USE_IMAKE=	yes
 .if !empty(LOWER_OPSYS:Mirix5*)
 # needs snprintf()
 . include "../../pkgtools/libnbcompat/buildlink3.mk"
-IMAKEOPTS+=     -DExtraLibraries=${BUILDLINK_LDADD.libnbcompat:Q}
+IMAKEOPTS+=	-DExtraLibraries=${BUILDLINK_LDADD.libnbcompat:Q}
 .endif
 
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile
index fd3c85ac4d9..3b8d4ffa076 100644
--- a/x11/xview-config/Makefile
+++ b/x11/xview-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:31:14 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:27:29 wiz Exp $
 
 DISTNAME=		xview3.2p1-X11R6
 PKGNAME=		xview-config-3.2.1
@@ -13,7 +13,7 @@ NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
 EXTRACT_ELEMENTS=	${DISTNAME}/config
 
-WRKSRC=      		${WRKDIR}/${EXTRACT_ELEMENTS}
+WRKSRC=		${WRKDIR}/${EXTRACT_ELEMENTS}
 USE_IMAKE=		yes
 
 post-extract:
diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index c182965f502..472d14a63df 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/12/27 13:37:47 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2007/02/22 19:27:30 wiz Exp $
 
 DISTNAME=		xview3.2p1-X11R6
 PKGNAME=		xview-lib-3.2.1
@@ -13,7 +13,7 @@ DEPENDS+=		xview-config>=3.2.1nb2:../../x11/xview-config
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 # builds, but binaries in../xview-clients all crash
-NOT_FOR_PLATFORM=       *-*-alpha
+NOT_FOR_PLATFORM=	*-*-alpha
 
 USE_IMAKE=		yes
 
diff --git a/x11/xview/Makefile b/x11/xview/Makefile
index bd795e32b26..747a4d69664 100644
--- a/x11/xview/Makefile
+++ b/x11/xview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:31:14 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:27:29 wiz Exp $
 #
 
 DISTNAME=	xview3.2p1-X11R6
@@ -15,7 +15,7 @@ DEPENDS+=	xview-config>=3.2.1:../../x11/xview-config
 DEPENDS+=	xview-lib>=3.2.1:../../x11/xview-lib
 DEPENDS+=	xview-clients>=3.2.1:../../x11/xview-clients
 
-NOT_FOR_PLATFORM=       *-*-alpha       # broken va_arg handling in xview-lib
+NOT_FOR_PLATFORM=	*-*-alpha       # broken va_arg handling in xview-lib
 
 USE_X11BASE=	yes