Correct whitespace introduced during PORTNAME conversion and portlint

51 files changed, 122 insertions, 122 deletions

diff --git a/news/atp/Makefile b/news/atp/Makefile
index 83253ec6dfc3..cf76bafb5bf7 100644
--- a/news/atp/Makefile
+++ b/news/atp/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=		dburr@FreeBSD.org
 RUN_DEPENDS=		zip:${PORTSDIR}/archivers/zip \
 			unzip:${PORTSDIR}/archivers/unzip
 
-WRKSRC=                 ${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIR}/${PKGNAME}
 
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
diff --git a/news/cnews/Makefile b/news/cnews/Makefile
index 803f32d34c8d..e5a20d185470 100644
--- a/news/cnews/Makefile
+++ b/news/cnews/Makefile
@@ -19,6 +19,7 @@ DISTNAME=	c-news
 EXTRACT_SUFX=	.tar.Z
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		pgpverify-1.12
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	ftp://ftp.lan-ks.de/pub/c-news/ \
 		ftp://ftp.dinoex.org/pub/c-news/
@@ -36,7 +37,6 @@ MAINTAINER=	dirk.meyer@dinoex.sub.org
 
 DIST_SUBDIR=	${DISTNAME}
 NO_WRKSUBDIR=	yes
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAKEFILE=	makefile
 MAN1=		checknews.1cn inews.1cn postnews.1cn readnews.1cn
 MAN5=		controlperm.5 news.5 newsctl.5 newsdb.5 newsoverview.5 \
@@ -68,7 +68,7 @@ PATCHFILES+=	c-news-patch-gawk3
 .endif
 
 check:
-	cd ${WRKSRC} && ${MAKE} -$(MAKEFLAGS) r
+	cd ${WRKSRC} && ${MAKE} -${MAKEFLAGS} r
 
 pre-patch:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${PGPVERIFY} ${WRKSRC}/${PGPVERIFY}
diff --git a/news/diablo/Makefile b/news/diablo/Makefile
index 7250ce30eb73..198c09e38a95 100644
--- a/news/diablo/Makefile
+++ b/news/diablo/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	diablo
 PORTVERSION=	1.15
 CATEGORIES=	news
 MASTER_SITES=	http://www.backplane.com/diablo/
-DISTNAME=	${PKGNAME}-rel	
+DISTNAME=	${PKGNAME}-rel
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jfitz@FreeBSD.org
@@ -25,10 +25,9 @@ MAN8=		diablo.8 dclean.8 dicmd.8 dexpire.8 didump.8 \
 		dilookup.8 doutq.8 dspoolout.8 dkp.8 dnewslink.8 \
 		dreadart.8 dreaderd.8 dsyncgroups.8
 
-
 do-configure:
 	${CP} ${FILESDIR}/post-install-notes ${WRKSRC}
-	${SETENV} ${MAKE_ENV} /usr/bin/perl -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
+	${SETENV} ${MAKE_ENV} ${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/post-install-notes
 
 do-build:
diff --git a/news/dnews/Makefile b/news/dnews/Makefile
index d28a4b215fa0..616ebfcef473 100644
--- a/news/dnews/Makefile
+++ b/news/dnews/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 Y2K=		http://netwinsite.com/dnews_y2k.htm
 
-WRKSRC=         ${WRKDIR}/dnews
+WRKSRC=		${WRKDIR}/dnews
 NO_CDROM=	"no answer yet, if we are allowed to put it onto CDROM"
 RESTRICTED=	"only free for non-profit organisations"
 NO_PACKAGE=	"${RESTRICTED}"
diff --git a/news/ifmail/Makefile b/news/ifmail/Makefile
index 800126dc0889..399868770a05 100644
--- a/news/ifmail/Makefile
+++ b/news/ifmail/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		ftp://ftp.lan-ks.de/pub/approved/
 MASTER_SITE_SUBDIR=	system/fido
 
-MAINTAINER=     dirk.meyer@dinoex.sub.org
+MAINTAINER=	dirk.meyer@dinoex.sub.org
 
 MAN3=		parsedate.3
 MAN8=		ifmail.8 iftoss.8
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 471cf14e3261..58dd0d10d036 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -12,11 +12,11 @@ MASTER_SITES=	http://www.matematik.su.se/~kjj/
 
 MAINTAINER=	andreas@FreeBSD.org
 
-LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
 		compface:${PORTSDIR}/mail/faces
-RUN_DEPENDS=    newsp:${PORTSDIR}/print/mp-letter
+RUN_DEPENDS=	newsp:${PORTSDIR}/print/mp-letter
 
 USE_IMAKE=	yes
 MAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
diff --git a/news/newsfetch/Makefile b/news/newsfetch/Makefile
index 1eba1661bd2f..04b3cfcb5e24 100644
--- a/news/newsfetch/Makefile
+++ b/news/newsfetch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	newsfetch
-PORTVERSION= 	1.21
+PORTVERSION=	1.21
 CATEGORIES=	news
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/news/readers
diff --git a/news/nn/Makefile b/news/nn/Makefile
index d3940c7ae24d..b3ff7c800fd8 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nn
-PORTVERSION= 	6.5.6
+PORTVERSION=	6.5.6
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.visi.com/users/mtpins/nn/
 EXTRACT_SUFX=	.tar.Z
diff --git a/news/nntp/Makefile b/news/nntp/Makefile
index 20d0feb71d70..a81f036c82c9 100644
--- a/news/nntp/Makefile
+++ b/news/nntp/Makefile
@@ -11,9 +11,9 @@ CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.academ.com/pub/nntp/server/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 
-PATCH_SITES=    ftp://ftp.lan-ks.de/pub/c-news/ \
+PATCH_SITES=	ftp://ftp.lan-ks.de/pub/c-news/ \
 		ftp://ftp.dinoex.org/pub/c-news/
-PATCHFILES=     nntp-patch-y2k
+PATCHFILES=	nntp-patch-y2k
 
 MAINTAINER=	adam@veda.is
 
diff --git a/news/nntpbtr/Makefile b/news/nntpbtr/Makefile
index 01990e124c2e..eadc6e67561c 100644
--- a/news/nntpbtr/Makefile
+++ b/news/nntpbtr/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	nntpbtr
 PORTVERSION=	1.7
 CATEGORIES=	news
-MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/news/
-EXTRACT_SUFX=   .tar.Z
+MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/news/
+EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	dk@farm.org
 
diff --git a/news/p5-Gateway/Makefile b/news/p5-Gateway/Makefile
index 98bfec9bf18d..d0ba005248c0 100644
--- a/news/p5-Gateway/Makefile
+++ b/news/p5-Gateway/Makefile
@@ -5,17 +5,17 @@
 # $FreeBSD$
 #
 
-PORTNAME=		p5-Gateway
-PORTVERSION=		0.42	
+PORTNAME=		Gateway
+PORTVERSION=		0.42
 CATEGORIES=		news perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	News
-DISTNAME=		Gateway-0.42
+PKGNAMEPREFIX=		p5-
 
 MAINTAINER=		croyle@gelemna.ft-wayne.in.us
 
-BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
-RUN_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
+BUILD_DEPENDS=		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
+RUN_DEPENDS=		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
 
 USE_PERL5=		yes
 
diff --git a/news/p5-News-Article/Makefile b/news/p5-News-Article/Makefile
index 983e2478329a..c89d134ba9f3 100644
--- a/news/p5-News-Article/Makefile
+++ b/news/p5-News-Article/Makefile
@@ -14,9 +14,9 @@ DISTNAME=	News-Article-1.21
 
 MAINTAINER=	croyle@gelemna.ft-wayne.in.us
 
-RUN_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
-	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Net/NNTP.pm:${PORTSDIR}/net/p5-Net \
-	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/PGP/Sign.pm:${PORTSDIR}/security/p5-PGP-Sign
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Net/NNTP.pm:${PORTSDIR}/net/p5-Net \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/PGP/Sign.pm:${PORTSDIR}/security/p5-PGP-Sign
 
 USE_PERL5=	yes
 
diff --git a/news/p5-News-Newsrc/Makefile b/news/p5-News-Newsrc/Makefile
index 49ef552c43b0..37669bc9b76a 100644
--- a/news/p5-News-Newsrc/Makefile
+++ b/news/p5-News-Newsrc/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	p5-News-Newsrc
+PORTNAME=	News-Newsrc
 PORTVERSION=	1.07
 CATEGORIES=	news perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	News
-DISTNAME=	News-Newsrc-1.07
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	croyle@gelemna.ft-wayne.in.us
 
-RUN_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Set/IntSpan.pm:${PORTSDIR}/math/p5-Set-IntSpan
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Set/IntSpan.pm:${PORTSDIR}/math/p5-Set-IntSpan
 
 USE_PERL5=	yes
 
diff --git a/news/plor/Makefile b/news/plor/Makefile
index bf9346f7e2b5..2adcf39dec16 100644
--- a/news/plor/Makefile
+++ b/news/plor/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.psy.unipd.it/pub/pluto/developers/ \
 
 MAINTAINER=	hoek@FreeBSD.org
 
-RUN_DEPENDS=    zip:${PORTSDIR}/archivers/zip
+RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
 GNU_CONFIGURE=	yes
 
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 09dc71bb4a5a..86e3b724ed34 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -9,38 +9,38 @@
 PORTNAME=	tin
 PORTVERSION=	1.4.2
 CATEGORIES=	news
-MASTER_SITES=   ftp://ftp.tin.org/pub/news/clients/tin/v1.4/ \
+MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/v1.4/ \
 		ftp://nuxi.ucdavis.edu/pub/tin/v1.4/ \
 		ftp://ftp.nuxi.com/pub/tin/v1.4/
 
-MAINTAINER=     ache@FreeBSD.org
+MAINTAINER=	ache@FreeBSD.org
 
-LIB_DEPENDS=    uu.1:${PORTSDIR}/converters/uulib
+LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib
 
-USE_BZIP2=      yes
-WRKSRC=         ${WRKDIR}/${DISTNAME:S/pre-1.4//}
+USE_BZIP2=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME:S/pre-1.4//}
 GNU_CONFIGURE=	yes
 
 # Curses support too buggy to activate
 #                 --enable-curses \
 #                 --with-ncurses \
 #
-CONFIGURE_ARGS=  --with-nntp-default-server=news  \
-		 --with-spooldir=/var/news  \
-		 --with-libdir=${PREFIX}/news/lib \
-		 --with-defaults-dir=${PREFIX}/etc \
-		 --with-editor=/usr/bin/ee \
-		 --with-mime-default-charset=ISO-8859-1 \
-		 --enable-forgery \
-		 --enable-break-long-lines \
-		 --with-pgp=${PREFIX}/bin/pgp \
-		 --with-ispell=${PREFIX}/bin/ispell \
-		 --with-metamail=${PREFIX}/bin/metamail
-CONFIGURE_ENV=  CFLAGS='${CFLAGS} -I${PREFIX}/include -DNNTP_SERVER_FILE="\"${PREFIX}/etc/nntpserver\""' \
+CONFIGURE_ARGS=	--with-nntp-default-server=news \
+		--with-spooldir=/var/news \
+		--with-libdir=${PREFIX}/news/lib \
+		--with-defaults-dir=${PREFIX}/etc \
+		--with-editor=/usr/bin/ee \
+		--with-mime-default-charset=ISO-8859-1 \
+		--enable-forgery \
+		--enable-break-long-lines \
+		--with-pgp=${PREFIX}/bin/pgp \
+		--with-ispell=${PREFIX}/bin/ispell \
+		--with-metamail=${PREFIX}/bin/metamail
+CONFIGURE_ENV=	CFLAGS='${CFLAGS} -I${PREFIX}/include -DNNTP_SERVER_FILE="\"${PREFIX}/etc/nntpserver\""' \
 		CPPFLAGS='${CPPFLAGS} -I${PREFIX}/include' \
 		LDFLAGS='${LDFLAGS} -L${PREFIX}/lib'
-MAKEFILE=       makefile
-ALL_TARGET=     build
+MAKEFILE=	makefile
+ALL_TARGET=	build
 MAN1=		tin.1
 
 .if defined(NNTP_ONLY)
diff --git a/news/trn/Makefile b/news/trn/Makefile
index c70844028cdf..11daa967d180 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	trn
-PORTVERSION= 	3.6
+PORTVERSION=	3.6
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/trn/
 
 MAINTAINER=	smace@FreeBSD.org
 
-RUN_DEPENDS=  munpack:${PORTSDIR}/converters/mpack
+RUN_DEPENDS=	munpack:${PORTSDIR}/converters/mpack
 
-WRKSRC=		$(WRKDIR)/trn-3.6
+WRKSRC=		${WRKDIR}/trn-3.6
 MAN1=		trn.1 Pnews.1 Rnmail.1 newsetup.1 newsgroups.1
 
 HAS_CONFIGURE=	Yes
 CONFIGURE_SCRIPT=	Configure
-CONFIGURE_ENV=	PREFIX="$(PREFIX)"
-CONFIGURE_ARGS= -S
+CONFIGURE_ENV=	PREFIX="${PREFIX}"
+CONFIGURE_ARGS=	-S
 
 post-install:
 .if !defined(BATCH)
diff --git a/news/trn/pkg-descr b/news/trn/pkg-descr
index 845ca05bc44f..835fdb890d39 100644
--- a/news/trn/pkg-descr
+++ b/news/trn/pkg-descr
@@ -14,4 +14,3 @@ Other nice features include the extract commands for the source and binary
 groups, thread-oriented kill directives, a better newgroup finding strategy,
 and lots more.  See the file NEW for a list of the things that are new to
 trn 3.0 from previous versions.
-
diff --git a/palm/coldsync/Makefile b/palm/coldsync/Makefile
index dfa75defb115..ed221ff0a561 100644
--- a/palm/coldsync/Makefile
+++ b/palm/coldsync/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	coldsync
-PORTVERSION= 	1.1.2
+PORTVERSION=	1.1.2
 CATEGORIES=	palm comms
 MASTER_SITES=	http://www.ooblick.com/software/coldsync/
 
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index b587cd7f09c5..30eb263b311e 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepilot-conduits
-PORTVERSION= 	0.2
+PORTVERSION=	0.2
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
 DISTNAME=	gnome-pilot-conduits-${PORTVERSION}
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 0f1199f18d64..f7860dddb743 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepilot
-PORTVERSION= 	0.1.50
+PORTVERSION=	0.1.50
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
 DISTNAME=	gnome-pilot-${PORTVERSION}
diff --git a/palm/gnomepilot-conduits/Makefile b/palm/gnomepilot-conduits/Makefile
index b587cd7f09c5..30eb263b311e 100644
--- a/palm/gnomepilot-conduits/Makefile
+++ b/palm/gnomepilot-conduits/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepilot-conduits
-PORTVERSION= 	0.2
+PORTVERSION=	0.2
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
 DISTNAME=	gnome-pilot-conduits-${PORTVERSION}
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index b587cd7f09c5..30eb263b311e 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepilot-conduits
-PORTVERSION= 	0.2
+PORTVERSION=	0.2
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
 DISTNAME=	gnome-pilot-conduits-${PORTVERSION}
diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile
index 0f1199f18d64..f7860dddb743 100644
--- a/palm/gnomepilot/Makefile
+++ b/palm/gnomepilot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepilot
-PORTVERSION= 	0.1.50
+PORTVERSION=	0.1.50
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
 DISTNAME=	gnome-pilot-${PORTVERSION}
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index 0f1199f18d64..f7860dddb743 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepilot
-PORTVERSION= 	0.1.50
+PORTVERSION=	0.1.50
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
 DISTNAME=	gnome-pilot-${PORTVERSION}
diff --git a/palm/imgvtopgm/Makefile b/palm/imgvtopgm/Makefile
index 47e865912e89..96930870276a 100644
--- a/palm/imgvtopgm/Makefile
+++ b/palm/imgvtopgm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imgvtopgm
-PORTVERSION= 	2.0
+PORTVERSION=	2.0
 CATEGORIES=	palm graphics
 MASTER_SITES=	http://www.trends.net/~mu/srcs/
 
diff --git a/palm/isilo/Makefile b/palm/isilo/Makefile
index 593087fef0ce..27329f7d8a66 100644
--- a/palm/isilo/Makefile
+++ b/palm/isilo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	isilo
-PORTVERSION= 	2.55
+PORTVERSION=	2.55
 CATEGORIES=	palm textproc
 MASTER_SITES=	ftp://ftp.iSilo.com/pub/
 DISTNAME=	iSiloBSD
diff --git a/palm/kpilot/Makefile b/palm/kpilot/Makefile
index b97db8a19dd0..a1bdec02755e 100644
--- a/palm/kpilot/Makefile
+++ b/palm/kpilot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kpilot
-PORTVERSION= 	3.0.2
+PORTVERSION=	3.0.2
 CATEGORIES=	palm comms kde
 MASTER_SITES=	http://www.slac.com/pilone/kpilot_home/download/
 
diff --git a/palm/malsync/Makefile b/palm/malsync/Makefile
index de90140e1227..3160df6b27a2 100644
--- a/palm/malsync/Makefile
+++ b/palm/malsync/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	malsync
-PORTVERSION= 	1.8
+PORTVERSION=	1.8
 CATEGORIES=	palm
 MASTER_SITES=	http://www.tomw.org/ \
 		http://people.FreeBSD.org/~dirk/ports/distfiles/
diff --git a/palm/palmos-sdk/Makefile b/palm/palmos-sdk/Makefile
index 9640c4c04c16..3c781960ac05 100644
--- a/palm/palmos-sdk/Makefile
+++ b/palm/palmos-sdk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	palmos-sdk
-PORTVERSION= 	3.5
+PORTVERSION=	3.5
 CATEGORIES=	palm
 MASTER_SITES=	
 DISTNAME=	sdk35
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index 892cf2824025..dcea525c7bdd 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pilot-link
-PORTVERSION= 	0.9.3
+PORTVERSION=	0.9.3
 CATEGORIES=	palm comms tk82
 MASTER_SITES=	ftp://ryeham.ee.ryerson.ca/pub/PalmOS/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 892cf2824025..dcea525c7bdd 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pilot-link
-PORTVERSION= 	0.9.3
+PORTVERSION=	0.9.3
 CATEGORIES=	palm comms tk82
 MASTER_SITES=	ftp://ryeham.ee.ryerson.ca/pub/PalmOS/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
diff --git a/palm/pilot_makedoc/Makefile b/palm/pilot_makedoc/Makefile
index f2af1b85a93f..8b84317b4f61 100644
--- a/palm/pilot_makedoc/Makefile
+++ b/palm/pilot_makedoc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pilot_makedoc
-PORTVERSION= 	0.7a
+PORTVERSION=	0.7a
 CATEGORIES=	palm textproc
 MASTER_SITES=	ftp://ftp.forth.org/pub/PalmOS/ \
 		ftp://ftp.cs.tu-berlin.de/pub/palmtops/pilot/ \
diff --git a/palm/pilrc/Makefile b/palm/pilrc/Makefile
index f13f96bb99a8..6c1a32710c2a 100644
--- a/palm/pilrc/Makefile
+++ b/palm/pilrc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pilrc
-PORTVERSION= 	2.5b1
+PORTVERSION=	2.5b1
 CATEGORIES=	palm
 MASTER_SITES=	http://www.hig.se/~ardiri/development/palmIII/pilrc/
 DISTNAME=	pilrcsrc
diff --git a/palm/prc-tools-binutils/Makefile b/palm/prc-tools-binutils/Makefile
index 5c16e9c37ee9..777bb7b2651e 100644
--- a/palm/prc-tools-binutils/Makefile
+++ b/palm/prc-tools-binutils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	prc-tools-binutils
-PORTVERSION= 	2.0
+PORTVERSION=	2.0
 CATEGORIES=	palm
 MASTER_SITES=	http://www.palm.com/devzone/tools/gcc/dist/ \
 		${MASTER_SITE_GNU}
diff --git a/palm/prc-tools-gcc/Makefile b/palm/prc-tools-gcc/Makefile
index 0b7a27f795f9..6cb6a6e48c1e 100644
--- a/palm/prc-tools-gcc/Makefile
+++ b/palm/prc-tools-gcc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	prc-tools-gcc
-PORTVERSION= 	2.0
+PORTVERSION=	2.0
 CATEGORIES=	palm
 MASTER_SITES=	http://www.palm.com/devzone/tools/gcc/dist/ \
 		${MASTER_SITE_GNU}
diff --git a/palm/prc-tools/Makefile b/palm/prc-tools/Makefile
index 250c08a8f570..f1ae7d161372 100644
--- a/palm/prc-tools/Makefile
+++ b/palm/prc-tools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	prc-tools
-PORTVERSION= 	2.0
+PORTVERSION=	2.0
 CATEGORIES=	palm
 MASTER_SITES=	http://www.palm.com/devzone/tools/gcc/dist/
 
diff --git a/palm/syncal/Makefile b/palm/syncal/Makefile
index 3a4f0923ecc0..1b18005fe9bb 100644
--- a/palm/syncal/Makefile
+++ b/palm/syncal/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	syncal
-PORTVERSION= 	0.8.3
+PORTVERSION=	0.8.3
 CATEGORIES=	palm comms deskutils
 MASTER_SITES=	http://hopf.math.nwu.edu/syncal/
 
diff --git a/palm/xcopilot/Makefile b/palm/xcopilot/Makefile
index 80ea62c5c6de..652ef85dd8a7 100644
--- a/palm/xcopilot/Makefile
+++ b/palm/xcopilot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xcopilot
-PORTVERSION= 	0.6.6
+PORTVERSION=	0.6.6
 CATEGORIES=	palm emulators
 MASTER_SITES=	http://xcopilot.cuspy.com/build/
 
diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile
index 7ccb86358391..3461407f7d59 100644
--- a/russian/apache13/Makefile
+++ b/russian/apache13/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION= 	1.3.11
-RA_VERSION=	29.3
+PORTVERSION=	1.3.11
 CATEGORIES=	www russian
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -32,6 +31,7 @@ PATCHFILES=	patches_${PORTVERSION}rusPL${RA_VERSION}.tar.gz
 
 MAINTAINER=	vns@delta.odessa.ua
 
+RA_VERSION=	29.3
 Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
 
 #
@@ -64,14 +64,14 @@ OPTIM=-DHARD_SERVER_LIMIT=512 \
 -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
 
 .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-OPTIM+= -DBUFFERED_LOGS
-CFLAGS+= -O6 -fomit-frame-pointer
+OPTIM+=		-DBUFFERED_LOGS
+CFLAGS+=	-O6 -fomit-frame-pointer
 .endif
 
-CONFIGURE_ENV= OPTIM='${OPTIM}'
+CONFIGURE_ENV=	OPTIM='${OPTIM}'
 
-MAN1= dbmmanage.1 htdigest.1 htpasswd.1
-MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
+MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
+MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
 
 pre-install:
 	@if [ -f ${WRKSRC}/htdocs/index.html.orig ]; then \
diff --git a/russian/cyrproxy/Makefile b/russian/cyrproxy/Makefile
index f4a970203c2f..a42785b76d78 100644
--- a/russian/cyrproxy/Makefile
+++ b/russian/cyrproxy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		cyrproxy
-PORTVERSION= 		1.4.2
+PORTVERSION=		1.4.2
 CATEGORIES=		russian net www
 MASTER_SITES=		ftp://ftp.lexa.ru/pub/domestic/lexa/
 
diff --git a/russian/d1489/Makefile b/russian/d1489/Makefile
index a50db15a0d2f..24aea018e453 100644
--- a/russian/d1489/Makefile
+++ b/russian/d1489/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	d1489
-PORTVERSION= 	1.4
+PORTVERSION=	1.4
 CATEGORIES=     russian
 MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/convert/char/
 EXTRACT_SUFX=   .tgz
diff --git a/russian/elm.language/Makefile b/russian/elm.language/Makefile
index 700f653dc004..09fa25a24db9 100644
--- a/russian/elm.language/Makefile
+++ b/russian/elm.language/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:    ru-elm
 # Whom:                 ache
+# Date created:		1995/12/20
 #
 # $FreeBSD$
 #
 
 PORTNAME=	elm
-PORTVERSION= 	2.4ME
-CATEGORIES=     russian mail
+PORTVERSION=	2.4ME
+CATEGORIES=	russian mail
+EXTRACT_ONLY=	# empty
 
-RUN_DEPENDS+=   elm:${PORTSDIR}/mail/elm
+MAINTAINER=	ache@FreeBSD.org
 
-MAINTAINER=     ache@FreeBSD.org
+RUN_DEPENDS+=	elm:${PORTSDIR}/mail/elm
 
-EXTRACT_ONLY=   # empty
-NO_WRKSUBDIR=   YES
-NO_BUILD=       YES
+NO_WRKSUBDIR=	YES
+NO_BUILD=	YES
 
 do-fetch:
 
diff --git a/russian/gd/Makefile b/russian/gd/Makefile
index 0390e6bb5026..d75ffbebd049 100644
--- a/russian/gd/Makefile
+++ b/russian/gd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gd
-PORTVERSION= 	1.3
+PORTVERSION=	1.3
 CATEGORIES=	russian graphics
 MASTER_SITES=   http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/
diff --git a/russian/koi8r-ps/Makefile b/russian/koi8r-ps/Makefile
index 9ef79c263440..099da7aac077 100644
--- a/russian/koi8r-ps/Makefile
+++ b/russian/koi8r-ps/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koi8rPS
-PORTVERSION= 	1.0
+PORTVERSION=	1.0
 CATEGORIES=	russian print
 MASTER_SITES=	ftp://ftp.ziplink.net/users/kot/CyrPS/ \
 		ftp://ftp.kapella.gpi.ru/pub/cyrillic/psfonts/
diff --git a/russian/netscape4.language/Makefile b/russian/netscape4.language/Makefile
index bc0dfde2c37e..f573894f97ff 100644
--- a/russian/netscape4.language/Makefile
+++ b/russian/netscape4.language/Makefile
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	netscape
-PORTVERSION= 	3.01
-CATEGORIES=     russian www
+PORTVERSION=	3.01
+CATEGORIES=	russian www
+EXTRACT_ONLY=	# empty
 
 MAINTAINER=	ache@FreeBSD.org
 
-RUN_DEPENDS += ${X11BASE}/lib/X11/nls/ru_SU.KOI8-R:${PORTSDIR}/russian/X.language
-RUN_DEPENDS += netscape:${PORTSDIR}/www/netscape3
+RUN_DEPENDS+=	${X11BASE}/lib/X11/nls/ru_SU.KOI8-R:${PORTSDIR}/russian/X.language
+RUN_DEPENDS+=	netscape:${PORTSDIR}/www/netscape3
 
-RESTRICTED=     "Includes a copyrighted file from Netscape"
-EXTRACT_ONLY=   # empty
-NO_BUILD=       YES
-NO_WRKSUBDIR=   YES
-USE_X_PREFIX=   YES
+RESTRICTED=	"Includes a copyrighted file from Netscape"
+NO_BUILD=	YES
+NO_WRKSUBDIR=	YES
+USE_X_PREFIX=	YES
 
-APPDEF = ${X11BASE}/lib/X11/app-defaults
+APPDEF=		${X11BASE}/lib/X11/app-defaults
 
 # no distfile to fetch
 do-fetch:
diff --git a/russian/pgp.language/Makefile b/russian/pgp.language/Makefile
index 37aa0b945583..de57a785192a 100644
--- a/russian/pgp.language/Makefile
+++ b/russian/pgp.language/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	pgp
-PORTVERSION= 	2.6.3ia
-CATEGORIES=     russian
-MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
+PORTVERSION=	2.6.3ia
+CATEGORIES=	russian
+MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
 DISTNAME=	pgp26ru
 
 MAINTAINER=	ache@FreeBSD.org
 
-RESTRICTED=	"Crypto"
+RUN_DEPENDS+=	${LOCALBASE}/lib/pgp/config.txt:${PORTSDIR}/security/pgp
 
-RUN_DEPENDS += ${PREFIX}/lib/pgp/config.txt:${PORTSDIR}/security/pgp
+RESTRICTED=	"Crypto"
 
 USE_ZIP=	YES
-NO_WRKSUBDIR=   YES
-NO_BUILD=       YES
+NO_WRKSUBDIR=	YES
+NO_BUILD=	YES
 
-PGPLIB=         ${PREFIX}/lib/pgp
-OBJS=           language.txt ru.hlp
+PGPLIB=		${PREFIX}/lib/pgp
+OBJS=		language.txt ru.hlp
 
 do-install:
 	[ -d ${PGPLIB} ] || ${MKDIR} ${PGPLIB}
diff --git a/russian/pine.language/Makefile b/russian/pine.language/Makefile
index 1ce8bb0eb491..617b7333d1f6 100644
--- a/russian/pine.language/Makefile
+++ b/russian/pine.language/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:    ru-pine
 # Whom:                 ache
+# Date created:		1996/12/03
 #
 # $FreeBSD$
 #
 
 PORTNAME=	pine
-PORTVERSION= 	4.21
-CATEGORIES=     russian mail
+PORTVERSION=	4.21
+CATEGORIES=	russian mail
+EXTRACT_ONLY=	# empty
 
-MAINTAINER=     ache@FreeBSD.org
+MAINTAINER=	ache@FreeBSD.org
 
-RUN_DEPENDS=    pine:${PORTSDIR}/mail/pine4
+RUN_DEPENDS=	pine:${PORTSDIR}/mail/pine4
 
-EXTRACT_ONLY=   # empty
-NO_WRKSUBDIR=   YES
-NO_BUILD=       YES
+NO_WRKSUBDIR=	YES
+NO_BUILD=	YES
 
 do-fetch:
 
diff --git a/russian/rispell/Makefile b/russian/rispell/Makefile
index 29cc0822af9d..c9ec996cf37d 100644
--- a/russian/rispell/Makefile
+++ b/russian/rispell/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ispell
-PORTVERSION= 	1.0
+PORTVERSION=	1.0
 CATEGORIES=     textproc russian
 MASTER_SITES=   http://www.ispras.ru/~knizhnik/
 DISTNAME=	rispell
diff --git a/russian/wmcyrx/Makefile b/russian/wmcyrx/Makefile
index 75a009722336..0358a848f342 100644
--- a/russian/wmcyrx/Makefile
+++ b/russian/wmcyrx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmcyrx
-PORTVERSION= 	2.1
+PORTVERSION=	2.1
 CATEGORIES=     russian windowmaker
 MASTER_SITES=   http://yard.hitech.mipt.ru/~mini/distrib/
 DISTNAME=	cyrx-${PORTVERSION}
diff --git a/russian/xcode/Makefile b/russian/xcode/Makefile
index 096fe602486b..a1a8dc7598df 100644
--- a/russian/xcode/Makefile
+++ b/russian/xcode/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xcode
-PORTVERSION= 	1.0
+PORTVERSION=	1.0
 CATEGORIES=	russian
 MASTER_SITES=	ftp://ftp.yars.free.net/pub/software/unix/util/text/
 DISTNAME=	${PORTNAME}
diff --git a/russian/xruskb/Makefile b/russian/xruskb/Makefile
index 649ed77c28d2..722f96cde1e2 100644
--- a/russian/xruskb/Makefile
+++ b/russian/xruskb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xruskb
-PORTVERSION= 	1.9.3
+PORTVERSION=	1.9.3
 CATEGORIES=	russian x11
 MASTER_SITES=	ftp://ftp.yars.free.net/pub/software/unix/X11/xruskb-old/ \
 		# ftp://ftp.kiae.su/pub/x11/cyrillic/