Whitespace cleanup, courtesy of pkglint.

Patch provided by Sergey Svishchev in private mail.

39 files changed, 96 insertions, 96 deletions

diff --git a/graphics/Coin/hacks.mk b/graphics/Coin/hacks.mk
index 50130401714..40aecd32d26 100644
--- a/graphics/Coin/hacks.mk
+++ b/graphics/Coin/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.3 2007/02/19 22:10:43 joerg Exp $
+# $NetBSD: hacks.mk,v 1.4 2007/02/22 19:26:32 wiz Exp $
 
 .if !defined(COIN_HACKS_MK)
 COIN_HACKS_MK=	defined
@@ -10,7 +10,7 @@ COIN_HACKS_MK=	defined
 ###
 .if ${OPSYS} == "NetBSD"
 PKG_HACKS+=		optimization
-BUILDLINK_TRANSFORM+=   rm:-O[0-9]*
+BUILDLINK_TRANSFORM+=	rm:-O[0-9]*
 .endif
 
 .endif	# COIN_HACKS_MK
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index a81b68bbe25..faf15e35e3f 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2006/03/04 21:29:45 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2007/02/22 19:26:32 wiz Exp $
 
 PKGNAME=	Mesa-${MESA_VERSION}
-MASTER_SITES= 	# empty
+MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index c9ec61a5c2d..ba74cad4e2e 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2006/11/06 11:25:54 joerg Exp $
+# $NetBSD: Makefile.common,v 1.55 2007/02/22 19:26:32 wiz Exp $
 #
 # This Makefile fragment is included either directly or indirectly (through
 # Makefile.lib) by all packages that are built from the Mesa sources.
@@ -6,7 +6,7 @@
 
 DISTNAME?=	MesaLib-${MESA_VERSION}
 CATEGORIES=	graphics
-MASTER_SITES= 	${MASTER_SITE_SOURCEFORGE:=mesa3d/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mesa3d/}
 EXTRACT_SUFX=	.tar.bz2
 
 # When changing this version, please run "make distinfo" in the following
diff --git a/graphics/cal3d-examples/Makefile b/graphics/cal3d-examples/Makefile
index 01059fa8d15..74ef8358c3f 100644
--- a/graphics/cal3d-examples/Makefile
+++ b/graphics/cal3d-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/15 14:58:20 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:33 wiz Exp $
 #
 
 PKGNAME=		cal3d-examples-${CAL3D_VERSION}
@@ -9,7 +9,7 @@ PKGREVISION=	2
 DISTFILES=		TheCallyDemo-0.9.1b.zip \
 			cal3d-${CAL3D_VERSION}${EXTRACT_SUFX}
 
-COMMENT=	        Tools and demos for cal3d library
+COMMENT=	Tools and demos for cal3d library
 
 USE_TOOLS+=		automake
 
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index 976ac083e00..b82f354d35f 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:28 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:33 wiz Exp $
 #
 
 PKGNAME=		cal3d-${CAL3D_VERSION}
@@ -6,7 +6,7 @@ PKGREVISION=	2
 
 .include "../../graphics/cal3d/Makefile.common"
 
-COMMENT=	        Skeletal based 3d character animation library in C++
+COMMENT=	Skeletal based 3d character animation library in C++
 
 USE_TOOLS+=		automake
 
diff --git a/graphics/cal3d/Makefile.common b/graphics/cal3d/Makefile.common
index 037c9390090..307cf9f6441 100644
--- a/graphics/cal3d/Makefile.common
+++ b/graphics/cal3d/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2006/07/22 04:46:16 rillig Exp $
+# $NetBSD: Makefile.common,v 1.9 2007/02/22 19:26:33 wiz Exp $
 #
 
 DISTNAME=		cal3d-${CAL3D_VERSION}
@@ -9,7 +9,7 @@ CAL3D_VERSION=		0.9.1
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://cal3d.sourceforge.net/
-COMMENT=	        Skeletal based 3d character animation library in C++
+COMMENT=	Skeletal based 3d character animation library in C++
 
 EXTRACT_SUFX=		.tar.bz2
 USE_LANGUAGES=		c c++
diff --git a/graphics/camediaplay/Makefile b/graphics/camediaplay/Makefile
index c19185ddcce..06acad37d8f 100644
--- a/graphics/camediaplay/Makefile
+++ b/graphics/camediaplay/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:46 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:34 wiz Exp $
 
 DISTNAME=	camediaplay-20010211
 CATEGORIES=	graphics
-MASTER_SITES=   ftp://ftp.itojun.org/pub/digi-cam/C-400L/unix/ \
+MASTER_SITES=	ftp://ftp.itojun.org/pub/digi-cam/C-400L/unix/ \
 		ftp://ftp.digipri.co.jp/pub/free-software/Olympus/C-400L/unix/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index d1605807701..4bafbd310f4 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:57 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:34 wiz Exp $
 
 DISTNAME=		camlimages-2.2.0
 PKGREVISION=		4
@@ -12,7 +12,7 @@ COMMENT=		Image processing library for Objective Caml
 
 BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.0.6
 
-WRKSRC=                 ${WRKDIR}/camlimages-2.2
+WRKSRC=			${WRKDIR}/camlimages-2.2
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 106e64bfee8..ceb84c31100 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2007/02/08 18:21:27 drochner Exp $
+# $NetBSD: Makefile,v 1.69 2007/02/22 19:26:34 wiz Exp $
 #
 
 DISTNAME=	eog-2.16.3
@@ -15,7 +15,7 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 
-GCONF2_SCHEMAS= 	eog.schemas
+GCONF2_SCHEMAS=	eog.schemas
 
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
 BUILDLINK_API_DEPENDS.libart2+=	libart2>=2.3.16
diff --git a/graphics/gimp2-wideangle/Makefile b/graphics/gimp2-wideangle/Makefile
index e8d5e4eb01d..e4c9f168d19 100644
--- a/graphics/gimp2-wideangle/Makefile
+++ b/graphics/gimp2-wideangle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/04 21:44:46 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:34 wiz Exp $
 #
 
 DISTNAME=	wideangle
@@ -13,7 +13,7 @@ HOMEPAGE=	http://members.ozemail.com.au/~hodsond/wideangle.html
 COMMENT=	GIMP plugin for wideangle lens distortions
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=         ${WRKDIR}
+WRKSRC=		${WRKDIR}
 
 do-build:
 	(cd ${WRKSRC} && gimptool-2.0 --build wideangle.c)
diff --git a/graphics/gnuplot-nox11/Makefile b/graphics/gnuplot-nox11/Makefile
index 443a7e0e033..a556f97ed38 100644
--- a/graphics/gnuplot-nox11/Makefile
+++ b/graphics/gnuplot-nox11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2007/02/01 12:15:39 drochner Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:34 wiz Exp $
 #
 
-PKGNAME=                ${DISTNAME:C/-/-nox11-/}
+PKGNAME=		${DISTNAME:C/-/-nox11-/}
 PKGREVISION=		6
 SVR4_PKGNAME=		gplot
 
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index a5909b9de5d..2dae37f577e 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.37 2007/02/01 12:15:38 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2007/02/22 19:26:34 wiz Exp $
 #
 
 PKGREVISION=		7
 SVR4_PKGNAME=		gplot
 CATEGORIES+=		x11
 
-CONFLICTS+=             gnuplot-nox11-[0-9]*
+CONFLICTS+=		gnuplot-nox11-[0-9]*
 
 
 .include "../../graphics/gnuplot/Makefile.common"
diff --git a/graphics/jpegoptim/Makefile b/graphics/jpegoptim/Makefile
index 0ba736ef01c..553bc0947c6 100644
--- a/graphics/jpegoptim/Makefile
+++ b/graphics/jpegoptim/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:05 tv Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:26:34 wiz Exp $
 
-DISTNAME=       jpegoptim-1.2.2
+DISTNAME=	jpegoptim-1.2.2
 PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://people.cc.jyu.fi/~tjko/rpms/jpegoptim/
diff --git a/graphics/mng/Makefile b/graphics/mng/Makefile
index 8e19f4c61b2..2f0dff41e06 100644
--- a/graphics/mng/Makefile
+++ b/graphics/mng/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2006/11/05 17:23:45 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/22 19:26:34 wiz Exp $
 
 DISTNAME=	lm1009
 PKGNAME=	mng-1.0.9
 PKGREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES= 	${MASTER_SITE_SOURCEFORGE:=libmng/} \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libmng/} \
 		http://www.3-t.com/libmng/download/ \
 		http://www.libmng.com/download/
 # this is just a workaround because the 1.0.9 tar.gz is broken
@@ -24,7 +24,7 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		automake
 
 # only needed as long as we use the zip distfile
-EXTRACT_OPTS_ZIP?=  	-aqo
+EXTRACT_OPTS_ZIP?=	-aqo
 WRKSRC=			${WRKDIR}/libmng
 
 CONFIGURE_ARGS+=	--with-jpeg=${BUILDLINK_PREFIX.jpeg}
diff --git a/graphics/ns-cult3d/Makefile b/graphics/ns-cult3d/Makefile
index 03bd72626d2..8c1f868f55b 100644
--- a/graphics/ns-cult3d/Makefile
+++ b/graphics/ns-cult3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/09 08:42:10 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:34 wiz Exp $
 #
 
 DISTNAME=	Cult3D_NS4_5.2b1
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.cult3d.com/
 COMMENT=	Netscape plugin for cult 3d files
 
 NOT_FOR_PLATFORM=	Interix-*-*
-ONLY_FOR_PLATFORM=      *-*-i386
+ONLY_FOR_PLATFORM=	*-*-i386
 
 WRKSRC=			${WRKDIR}/cult3d-5.2-b1-linux-x86
 NO_CONFIGURE=		yes
diff --git a/graphics/nvtv/Makefile.common b/graphics/nvtv/Makefile.common
index 102a284ddb2..de19b6629be 100644
--- a/graphics/nvtv/Makefile.common
+++ b/graphics/nvtv/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2005/12/29 06:21:45 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2007/02/22 19:26:34 wiz Exp $
 
 DISTNAME=	nvtv-0.4.7
 CATEGORIES=	graphics
@@ -8,7 +8,7 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/nv-tv-out/
 COMMENT=	Tool to manipulate TV-Out settings on NVidia cards
 
-ONLY_FOR_PLATFORM=      *-*-i386
+ONLY_FOR_PLATFORM=	*-*-i386
 
 GNU_CONFIGURE=		YES
 RCD_SCRIPTS=		nvtvd
diff --git a/graphics/p5-GDGraph/Makefile b/graphics/p5-GDGraph/Makefile
index fa128f1fdab..15b90d529fc 100644
--- a/graphics/p5-GDGraph/Makefile
+++ b/graphics/p5-GDGraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/02/05 23:09:36 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:34 wiz Exp $
 #
 
 DISTNAME=	GDGraph-1.43
@@ -12,7 +12,7 @@ MAINTAINER=	damon@brodiefamily.org
 HOMEPAGE=	http://cpan.uwinnipeg.ca/htdocs/GDGraph/GD/Graph.html
 COMMENT=	GDGraph is a package to generate charts, using Lincoln Stein's GD.pm
 
-DEPENDS+=       p5-GDTextUtil>=0.75:../../graphics/p5-GDTextUtil
+DEPENDS+=	p5-GDTextUtil>=0.75:../../graphics/p5-GDTextUtil
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/GD/Graph/.packlist
diff --git a/graphics/p5-GDGraph3d/Makefile b/graphics/p5-GDGraph3d/Makefile
index 10522c33ab6..375b832b711 100644
--- a/graphics/p5-GDGraph3d/Makefile
+++ b/graphics/p5-GDGraph3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:36 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:35 wiz Exp $
 
 DISTNAME=	GDGraph3d-0.56
 PKGNAME=	p5-${DISTNAME}
@@ -10,7 +10,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=GD/}
 MAINTAINER=	damon@brodiefamily.org
 COMMENT=	GDGraph3d is a pkg to generate charts, using Lincoln Stein's GD.pm
 
-DEPENDS+=       p5-GDGraph>=1.30:../../graphics/p5-GDGraph
+DEPENDS+=	p5-GDGraph>=1.30:../../graphics/p5-GDGraph
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/GD/Graph3d/.packlist
diff --git a/graphics/p5-GIFgraph/Makefile b/graphics/p5-GIFgraph/Makefile
index 99473b710f5..7c8b103d060 100644
--- a/graphics/p5-GIFgraph/Makefile
+++ b/graphics/p5-GIFgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:09:36 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:35 wiz Exp $
 #
 
 DISTNAME=	GIFgraph-1.20
@@ -12,7 +12,7 @@ MAINTAINER=	he@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/search?module=GIFgraph
 COMMENT=	GIFgraph is a package to generate graphs, using GD::Graph
 
-DEPENDS+=       p5-GDGraph>=1.33:../../graphics/p5-GDGraph
+DEPENDS+=	p5-GDGraph>=1.33:../../graphics/p5-GDGraph
 DEPENDS+=	p5-PerlMagick>=5.3.9:../../graphics/p5-PerlMagick
 
 PERL5_PACKLIST=		auto/GIFgraph/.packlist
diff --git a/graphics/p5-SWF-File/Makefile b/graphics/p5-SWF-File/Makefile
index 1598a7e927b..e55cb1c29be 100644
--- a/graphics/p5-SWF-File/Makefile
+++ b/graphics/p5-SWF-File/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:50 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:35 wiz Exp $
 #
 
 DISTNAME=	SWF-File-0.22
@@ -10,7 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/SWF-File/
 COMMENT=	Manipulating Flash movie (SWF) files
 
-DEPENDS+=       p5-Data-TemporaryBag-[0-9]*:../../devel/p5-Data-TemporaryBag
+DEPENDS+=	p5-Data-TemporaryBag-[0-9]*:../../devel/p5-Data-TemporaryBag
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/graphics/pear-Image_Canvas/Makefile b/graphics/pear-Image_Canvas/Makefile
index 54f7630cc1e..4da2a0ad198 100644
--- a/graphics/pear-Image_Canvas/Makefile
+++ b/graphics/pear-Image_Canvas/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:53 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:35 wiz Exp $
 
 DISTNAME=	Image_Canvas-0.2.4
 CATEGORIES=	graphics
 
 MAINTAINER=	adrianp@NetBSD.org
-HOMEPAGE= 	http://pear.php.net/package/Image_Color/
+HOMEPAGE=	http://pear.php.net/package/Image_Color/
 COMMENT=	Common interface to image drawing, making image source code
 
 CONFLICTS=	php-pear-Image_Canvas-[0-9]*
diff --git a/graphics/pear-Image_Color/Makefile b/graphics/pear-Image_Color/Makefile
index 9d8423f9060..501e2432e19 100644
--- a/graphics/pear-Image_Color/Makefile
+++ b/graphics/pear-Image_Color/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:35 wiz Exp $
 
 DISTNAME=	Image_Color-1.0.2
 CATEGORIES=	graphics
 
 MAINTAINER=	adrianp@NetBSD.org
-HOMEPAGE= 	http://pear.php.net/package/Image_Color/
+HOMEPAGE=	http://pear.php.net/package/Image_Color/
 COMMENT=	Manage and handles color data and conversions
 
 CONFLICTS=	php-pear-Image_Color-[0-9]*
diff --git a/graphics/pear-Image_Graph/Makefile b/graphics/pear-Image_Graph/Makefile
index 740c30600c1..3d358dd7303 100644
--- a/graphics/pear-Image_Graph/Makefile
+++ b/graphics/pear-Image_Graph/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:35 wiz Exp $
 
 DISTNAME=	Image_Graph-0.3.0dev4
 CATEGORIES=	graphics
 
 MAINTAINER=	adrianp@NetBSD.org
-HOMEPAGE= 	http://pear.php.net/package/Image_Graph/
+HOMEPAGE=	http://pear.php.net/package/Image_Graph/
 COMMENT=	Package for displaying (numerical) data as a graph/chart/plot
 
 CONFLICTS=	php-pear-Image_Graph-[0-9]*
diff --git a/graphics/php-jpgraph/Makefile b/graphics/php-jpgraph/Makefile
index 7fac2d26c20..d4abd86cf5b 100644
--- a/graphics/php-jpgraph/Makefile
+++ b/graphics/php-jpgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/04 16:26:54 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:35 wiz Exp $
 
 DISTNAME=	jpgraph-1.18
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
@@ -6,7 +6,7 @@ CATEGORIES=	graphics www
 MASTER_SITES=	http://members.chello.se/jpgraph/jpgdownloads/
 
 MAINTAINER=	adrianp@NetBSD.org
-HOMEPAGE= 	http://www.aditus.nu/jpgraph/index.php
+HOMEPAGE=	http://www.aditus.nu/jpgraph/index.php
 COMMENT=	Object Oriented class library for PHP
 
 CONFLICTS=	php-jgraph-[0-9]*
@@ -19,9 +19,9 @@ NO_BUILD=	YES
 EXDIR=		${PREFIX}/share/examples/php-jpgraph
 PJDIR=		${PREFIX}/share/php-jpgraph
 PJCONFFILE=	${PKG_SYSCONFDIR}/jpg-config.inc
-CONF_FILES=     ${EXDIR}/jpg-config.inc ${PKG_SYSCONFDIR}/jpg-config.inc
+CONF_FILES=	${EXDIR}/jpg-config.inc ${PKG_SYSCONFDIR}/jpg-config.inc
 
-PKG_SYSCONFSUBDIR?=     php-jpgraph
+PKG_SYSCONFSUBDIR?=	php-jpgraph
 
 MESSAGE_SUBST+=	PJCONFFILE=${PJCONFFILE} PJDIR=${PJDIR} EXDIR=${EXDIR}
 
diff --git a/graphics/phpsview/Makefile b/graphics/phpsview/Makefile
index 6b69d218e1c..2df479cf253 100644
--- a/graphics/phpsview/Makefile
+++ b/graphics/phpsview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/09/09 02:42:01 obache Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:26:35 wiz Exp $
 #
 
 DISTNAME=	pwc-9.0.2
@@ -8,7 +8,7 @@ CATEGORIES=	graphics x11
 MASTER_SITES=	http://www.smcc.demon.nl/webcam/
 
 PATCH_SITES=	http://www.medias.ne.jp/~takam/bsd/
-PATCHFILES= 	pwc-9.0.2-bsd-0.03.patch.gz
+PATCHFILES=	pwc-9.0.2-bsd-0.03.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	hamajima@NetBSD.org
diff --git a/graphics/py-biggles/Makefile b/graphics/py-biggles/Makefile
index 33ef54688e1..c48edcca2c2 100644
--- a/graphics/py-biggles/Makefile
+++ b/graphics/py-biggles/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2007/02/02 19:10:14 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:35 wiz Exp $
 #
 
 DISTNAME=	python-biggles-1.6.3
-PKGNAME=        ${PYPKGPREFIX}${DISTNAME:S/python//}
+PKGNAME=	${PYPKGPREFIX}${DISTNAME:S/python//}
 PKGREVISION=	3
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=biggles/}
 
 MAINTAINER=	Kai.Puolamaki@iki.fi
 HOMEPAGE=	http://biggles.sourceforge.net/
-COMMENT= 	Python module for creating 2D scientific plots
+COMMENT=	Python module for creating 2D scientific plots
 
 PYDISTUTILSPKG= yes
 PYBINMODULE=	yes
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index f4c3834cf24..baf4456e066 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/04/17 13:46:35 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:26:35 wiz Exp $
 
 DISTNAME=	gdmodule.c
 PKGNAME=	${PYPKGPREFIX}-gd-1.3
@@ -15,7 +15,7 @@ WRKSRC=		${WRKDIR}
 BUILD_TARGET=	default
 
 PYDISTUTILSPKG= yes
-PYBINMODULE=    yes
+PYBINMODULE=	yes
 
 post-patch:
 	${SED} 's+@LOCALBASE@+${LOCALBASE}+g' ${FILESDIR}/Setup.in > ${WRKSRC}/setup.py
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index fdbf6d1149a..d0faec174df 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/01/20 15:17:20 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:26:36 wiz Exp $
 
 DISTNAME=	Imaging-1.1.5
 PKGNAME=	${PYPKGPREFIX}-imaging-1.1.5
@@ -10,7 +10,7 @@ MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://www.pythonware.com/products/pil/
 COMMENT=	PIL, the Python Imaging Library
 
-DIST_SUBDIR=    python
+DIST_SUBDIR=	python
 PYDISTUTILSPKG= yes
 PY_PATCHPLIST=	yes
 
diff --git a/graphics/py-imagingtk/Makefile b/graphics/py-imagingtk/Makefile
index 37c495d08b3..025a5003a6c 100644
--- a/graphics/py-imagingtk/Makefile
+++ b/graphics/py-imagingtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:05 reed Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:36 wiz Exp $
 #
 
 DISTNAME=	Imaging-1.1.5
@@ -11,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pythonware.com/products/pil/
 COMMENT=	Tk support for the Python Imaging Library (PIL)
 
-DIST_SUBDIR=    python
+DIST_SUBDIR=	python
 PYDISTUTILSPKG=	yes
 BUILDLINK_API_DEPENDS.python20+=	python20>=2.0.1nb4
 PY_PATCHPLIST=	yes
diff --git a/graphics/qcamview/Makefile b/graphics/qcamview/Makefile
index 4bba16f1fdc..f14daccda57 100644
--- a/graphics/qcamview/Makefile
+++ b/graphics/qcamview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/10/22 21:12:33 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:36 wiz Exp $
 #
 
 DISTNAME=	qce-ga-0.40d
@@ -8,7 +8,7 @@ CATEGORIES=	graphics x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qce-ga/}
 
 PATCH_SITES=	http://www.medias.ne.jp/~takam/bsd/
-PATCHFILES= 	qce-ga-bsd-0.04.patch.gz
+PATCHFILES=	qce-ga-bsd-0.04.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	hamajima@NetBSD.org
diff --git a/graphics/qvplay/Makefile b/graphics/qvplay/Makefile
index e6eebde2bf6..d1442101643 100644
--- a/graphics/qvplay/Makefile
+++ b/graphics/qvplay/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/10/04 17:38:30 reed Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:36 wiz Exp $
 #
 
 DISTNAME=	qvplay-0.94
-CATEGORIES=    	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	http://www.asahi-net.or.jp/~xg2k-hys/
 
 MAINTAINER=	jwise@NetBSD.org
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index a275e28ca09..06cc3bbb10b 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/08 21:40:21 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:36 wiz Exp $
 
 DISTNAME=	rayshade.4.0
 PKGNAME=	rayshade-4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://graphics.stanford.edu/pub/rayshade/	\
 		ftp://ftp.princeton.edu/pub/Graphics/rayshade.4.0/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=     pkgsrc-users@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Extensible system for creating ray-traced images
 
 HAS_CONFIGURE=		yes
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 25d7fe085a4..be6d17cae55 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2006/08/05 22:41:49 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/02/22 19:26:36 wiz Exp $
 
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc.
 
-DISTNAME=       sane-backends-${SANE_VERSION}
+DISTNAME=	sane-backends-${SANE_VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_TOOLS+=		msgfmt
@@ -19,7 +19,7 @@ PLIST_SUBST+=	SANE_PINT="@comment "
 PLIST_SUBST+=	SANE_SM3600="@comment "
 .elif (${OPSYS} == "Linux") || (${OPSYS} == "DragonFly")
 PLIST_SUBST+=	SANE_PINT="@comment "
-PLIST_SUBST+=   SANE_SM3600=""
+PLIST_SUBST+=	SANE_SM3600=""
 .else
 PLIST_SUBST+=	SANE_PINT=""
 PLIST_SUBST+=	SANE_SM3600=""
diff --git a/graphics/sane-backends/options.mk b/graphics/sane-backends/options.mk
index 89956e60c41..577044ec233 100644
--- a/graphics/sane-backends/options.mk
+++ b/graphics/sane-backends/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2007/01/30 07:09:03 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2007/02/22 19:26:36 wiz Exp $
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.sane-backends
-PKG_SUPPORTED_OPTIONS=          sane-backends-hp3900
+PKG_OPTIONS_VAR=		PKG_OPTIONS.sane-backends
+PKG_SUPPORTED_OPTIONS=		sane-backends-hp3900
 PKG_SUGGESTED_OPTIONS=		#defined
 
 .include "../../mk/bsd.options.mk"
@@ -12,12 +12,12 @@ PKG_SUGGESTED_OPTIONS=		#defined
 ### hp3900 support
 ###
 .if !empty(PKG_OPTIONS:Mhp3900)
-PLIST_SUBST+=   SANE_HP3900=""
+PLIST_SUBST+=	SANE_HP3900=""
 DISTFILES+=	hp3900-sane1017_src_0.5.tar.gz
 SITES.hp3900-sane1017_src_0.5.tar.gz=${MASTER_SITE_SOURCEFORGE:=hp3900-series/}
 post-patch:
 	cd ${WRKSRC} && \
 	${PATCH} -p1 <${WRKDIR}/hp3900-sane1017_src_0.5/hp3900-sane1017_0.5.diff
 .else
-PLIST_SUBST+=   SANE_HP3900="@comment "
+PLIST_SUBST+=	SANE_HP3900="@comment "
 .endif
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 54550ac4df4..96ba4b9e0e3 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2007/01/08 17:48:09 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:36 wiz Exp $
 #
 
 DISTNAME=	skencil-0.6.17
 PKGREVISION=	2
 CATEGORIES=	graphics
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=sketch/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sketch/}
 
 MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://sketch.sourceforge.net/
diff --git a/graphics/vnc2swf/Makefile b/graphics/vnc2swf/Makefile
index 871f1853dae..8762b95cf59 100644
--- a/graphics/vnc2swf/Makefile
+++ b/graphics/vnc2swf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/02/06 12:20:47 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:36 wiz Exp $
 #
 
 DISTNAME=		vnc2swf-0.5.0
@@ -10,23 +10,23 @@ MAINTAINER=		obata@lins.jp
 HOMEPAGE=		http://www.unixuser.org/~euske/vnc2swf/
 COMMENT=		Record vnc session as flash movie
 
-DEPENDS+=               x11vnc-[0-9]*:../../x11/x11vnc
+DEPENDS+=		x11vnc-[0-9]*:../../x11/x11vnc
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 
 INSTALLATION_DIRS=	bin lib/X11/app-defaults share/doc/html/vnc2swf
 
-SUBST_CLASSES+=         x11base
-SUBST_STAGE.x11base=    pre-configure
-SUBST_MESSAGE.x11base=  Change X11base to ${PREFIX} in Makefile
-SUBST_FILES.x11base=    Makefile.in
-SUBST_SED.x11base=      -e "s|/usr/X11R6|${PREFIX}|"
+SUBST_CLASSES+=		x11base
+SUBST_STAGE.x11base=	pre-configure
+SUBST_MESSAGE.x11base=	Change X11base to ${PREFIX} in Makefile
+SUBST_FILES.x11base=	Makefile.in
+SUBST_SED.x11base=	-e "s|/usr/X11R6|${PREFIX}|"
 
-SUBST_CLASSES+=         toolpath
-SUBST_STAGE.toolpath=   pre-configure
-SUBST_FILES.toolpath=   recordwin.sh
-SUBST_SED.toolpath=     -E -e "s|^(VNC2SWF=).*|\1${PREFIX}/bin/vnc2swf|" \
+SUBST_CLASSES+=		toolpath
+SUBST_STAGE.toolpath=	pre-configure
+SUBST_FILES.toolpath=	recordwin.sh
+SUBST_SED.toolpath=	-E -e "s|^(VNC2SWF=).*|\1${PREFIX}/bin/vnc2swf|" \
 			-e "s|^(X11VNC=).*|\1${PREFIX}/bin/x11vnc|" \
 			-e "s|^(XWININFO=).*|\1${X11BASE}/bin/xwininfo|" \
 			-e "s|^(AWK=).*|\1${AWK}|" \
diff --git a/graphics/vtk-python/Makefile b/graphics/vtk-python/Makefile
index 07083758e73..bd9354467fb 100644
--- a/graphics/vtk-python/Makefile
+++ b/graphics/vtk-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/01/31 00:04:11 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:36 wiz Exp $
 #
 
 PKGNAME=	vtk-python-${VTKDIST_VERSION}
@@ -6,7 +6,7 @@ PKGREVISION=	2
 
 COMMENT=	Python wrapper libraries for vtk; see vtk package for details
 
-VTK_CMAKE_OPT=  -DPYTHON_INCLUDE_PATH:STRING=${PREFIX}/${PYINC} \
+VTK_CMAKE_OPT=	-DPYTHON_INCLUDE_PATH:STRING=${PREFIX}/${PYINC} \
 		-DPYTHON_LIBRARY:STRING=${PREFIX}/lib/libpython${PYVERSSUFFIX}.so \
 		-DVTK_WRAP_PYTHON:BOOL=ON
 
diff --git a/graphics/vtk/Makefile.vtkdist b/graphics/vtk/Makefile.vtkdist
index 4172f12fc2d..e8ba88419af 100644
--- a/graphics/vtk/Makefile.vtkdist
+++ b/graphics/vtk/Makefile.vtkdist
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.vtkdist,v 1.7 2007/02/15 14:33:06 joerg Exp $
+# $NetBSD: Makefile.vtkdist,v 1.8 2007/02/22 19:26:36 wiz Exp $
 
 .include "../../graphics/vtk/Makefile.common"
 
@@ -6,7 +6,7 @@
 VTKDIST_VERSION=	4.2.6
 DISTNAME=		VTK-4.2-LatestRelease
 DIST_SUBDIR=		VTK-4.2.6
-WRKSRC=       		${WRKDIR}/VTK
+WRKSRC=		${WRKDIR}/VTK
 
 DISTINFO_FILE=		${.CURDIR}/../vtk/distinfo
 PATCHDIR=		${.CURDIR}/../vtk/patches
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index f9659fc7b6d..8af347cebcc 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2007/01/29 22:06:43 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2007/02/22 19:26:37 wiz Exp $
 
-DISTNAME=       xpaint-2.7.8.1
+DISTNAME=	xpaint-2.7.8.1
 PKGREVISION=	2
 CATEGORIES=	graphics x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sf-xpaint/}
@@ -10,7 +10,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://sf-xpaint.sourceforge.net/
 COMMENT=	Simple paint program
 
-USE_IMAKE=      	yes
+USE_IMAKE=	yes
 USE_TOOLS+=		gmake
 MAKE_ENV+=		XMKMF=${XMKMF:Q}