17 files changed, 51 insertions, 53 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.
-