24 files changed, 86 insertions, 86 deletions

diff --git a/converters/aish/Makefile b/converters/aish/Makefile
index 14a0ca603b31..621196794322 100644
--- a/converters/aish/Makefile
+++ b/converters/aish/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	aish
-# Version required:	1.13
 # Date created:		01 Aug 1998
 # Whom:			Masanori Kiriake <seiken@nbs.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	aish113u
-PKGNAME=	aish-1.13
+PORTNAME=	aish
+PORTVERSION=	1.13
 CATEGORIES=	converters
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA004474/etc/
+DISTNAME=	aish113u
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/converters/btoa/Makefile b/converters/btoa/Makefile
index 70bcb5cc5d9c..7c11bccfac68 100644
--- a/converters/btoa/Makefile
+++ b/converters/btoa/Makefile
@@ -1,24 +1,24 @@
 # New ports collection makefile for: btoa
-# Version required:                  5.2
 # Date created:                      4 Apr 1996
 # Whom:                              Brent J. Nordquist <bjn@visi.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=          btoa-5.2
-PKGNAME=           btoa-5.2.1
-CATEGORIES=        converters
-MASTER_SITES=      ${MASTER_SITE_LOCAL}
+PORTNAME=	btoa
+PORTVERSION=	5.2.1
+CATEGORIES=	converters
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+DISTNAME=	btoa-5.2
 
-PATCH_SITES=       ${MASTER_SITES}
-PATCHFILES=        btoa-5.2-patch1.gz
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	btoa-5.2-patch1.gz
 
-MAINTAINER=        bjn@visi.com
+MAINTAINER=	bjn@visi.com
 
-MAKE_FLAGS=        DESTDIR=${PREFIX} -f
-MAKEFILE=          Makefile.sun
-MAN1=		   btoa.1
+MAKE_FLAGS=	DESTDIR=${PREFIX} -f
+MAKEFILE=	Makefile.sun
+MAN1=		btoa.1
 
 # Turn off the default from bsd.port.mk (-p0), which screws things up
 PATCH_DIST_STRIP=  
diff --git a/converters/fconv/Makefile b/converters/fconv/Makefile
index bc8bbc2d1c26..a5a6b6fc3382 100644
--- a/converters/fconv/Makefile
+++ b/converters/fconv/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	fconv
-# Version required:	0.1
 # Date created:		21 April 1999
 # Whom:			Chris Costello <chris@calldei.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	fconv-0.1
+PORTNAME=	fconv
+PORTVERSION=	0.1
 CATEGORIES=	converters
 MASTER_SITES=	http://people.FreeBSD.org/~chris/distfiles/
 
diff --git a/converters/i18ntools/Makefile b/converters/i18ntools/Makefile
index 574cf5e4392f..9ebbb9609f30 100644
--- a/converters/i18ntools/Makefile
+++ b/converters/i18ntools/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	i18ntools
-# Version required:			1.0
 # Date created:				17 April 1999
 # Whom:					G. Adam Stanislav
 #
 # $FreeBSD$
 #
 
-DISTNAME=	i18ntools-1.0
+PORTNAME=	i18ntools
+PORTVERSION=	1.0
 CATEGORIES=	converters
 MASTER_SITES=	ftp://ftp.whizkidtech.net/unix/ \
 		http://www.whizkidtech.net/fports/
diff --git a/converters/iconv/Makefile b/converters/iconv/Makefile
index 74c84f5f4efb..9cc9453d38af 100644
--- a/converters/iconv/Makefile
+++ b/converters/iconv/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	iconv
-# Version required:	0.1
 # Date created:		21 Sep 1999
 # Whom:			joy@urc.ac.ru
 #
 # $FreeBSD$
 #
 
-DISTNAME=	iconv-0.2
+PORTNAME=	iconv
+PORTVERSION=	0.2
 CATEGORIES=	converters
 MASTER_SITES=	ftp://ftp.urc.ac.ru/pub/OS/FreeBSD/converters/
 
diff --git a/converters/ish/Makefile b/converters/ish/Makefile
index 5691c2b44873..4becaaa80cc1 100644
--- a/converters/ish/Makefile
+++ b/converters/ish/Makefile
@@ -1,11 +1,11 @@
 # New ports collection makefile for:	ish
-# Version required:	1.11
 # Date created:		13 August 1997
 # Whom:			hosokawa
 #
 # $FreeBSD$
 
-DISTNAME=	ish-1.11
+PORTNAME=	ish
+PORTVERSION=	1.11
 CATEGORIES=	converters
 MASTER_SITES=	ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
 
diff --git a/converters/kdesupport11/Makefile b/converters/kdesupport11/Makefile
index 7efabcaa9882..4b030b847116 100644
--- a/converters/kdesupport11/Makefile
+++ b/converters/kdesupport11/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:   kdesupport
-# Version required:    Beta1
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kdesupport-1.1.2
-PKGNAME=	kdesupport-1.1.2.1
+PORTNAME=	kdesupport
+PORTVERSION=	1.1.2.1
 CATEGORIES=	converters kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
+DISTNAME=	kdesupport-1.1.2
 
 MAINTAINER=	se@freebsd.org
 
diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile
index 7efabcaa9882..4b030b847116 100644
--- a/converters/kdesupport2/Makefile
+++ b/converters/kdesupport2/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:   kdesupport
-# Version required:    Beta1
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kdesupport-1.1.2
-PKGNAME=	kdesupport-1.1.2.1
+PORTNAME=	kdesupport
+PORTVERSION=	1.1.2.1
 CATEGORIES=	converters kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
+DISTNAME=	kdesupport-1.1.2
 
 MAINTAINER=	se@freebsd.org
 
diff --git a/converters/libutf-8/Makefile b/converters/libutf-8/Makefile
index 1f2e71ee54a5..7a964c054129 100644
--- a/converters/libutf-8/Makefile
+++ b/converters/libutf-8/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	libutf-8
-# Version required:			1.0
 # Date created:				1 April 1999
 # Whom:					G. Adam Stanislav <adam@whizkidtech.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	libutf-8-1.0
-PKGNAME=	libutf-8.1.0
+PORTNAME=	libutf
+PORTVERSION=	8.1.0
 CATEGORIES=	converters
 MASTER_SITES=	http://www.whizkidtech.net/fports/ \
 		ftp://ftp.whizkidtech.net/unix/ \
 		http://www.whizkidtech.net/ISO-8859-2/
+DISTNAME=	libutf-8-1.0
 
 MAINTAINER=	adam@whizkidtech.net
 
diff --git a/converters/mimepp/Makefile b/converters/mimepp/Makefile
index d8d8fbd7f6a3..6e02c0e9c8aa 100644
--- a/converters/mimepp/Makefile
+++ b/converters/mimepp/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	mimepp
-# Version required:			1.0
 # Date created:				3 July 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		mimepp-1.0
+PORTNAME=		mimepp
+PORTVERSION=		1.0
 CATEGORIES=		converters
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	devel/lang/c++
diff --git a/converters/mmencode/Makefile b/converters/mmencode/Makefile
index 632b5a22654e..f99956cfe0e0 100644
--- a/converters/mmencode/Makefile
+++ b/converters/mmencode/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	mmencode
-# Version required:	2.7
 # Date created:		30 September 1999
 # Whom:			kbyanc
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mm2.7
-PKGNAME=	mmencode-2.7
+PORTNAME=	mmencode
+PORTVERSION=	2.7
 CATEGORIES=	converters
 MASTER_SITES=	ftp://thumper.bellcore.com/pub/nsb/
+DISTNAME=	mm${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	kbyanc@posi.net
diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile
index 25bec83af697..a0a25fe2c191 100644
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:    mpack
-# Version required:     1.5
 # Date created:         1 May 1995
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-DISTNAME=       mpack-1.5-src
-PKGNAME=        mpack-1.5
-CATEGORIES=     converters mail news
-MASTER_SITES=   ftp://ftp.andrew.cmu.edu/pub/mpack/
-EXTRACT_SUFX=   .tar.Z
+PORTNAME=	mpack
+PORTVERSION=	1.5
+CATEGORIES=	converters mail news
+MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/mpack/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=     ache@FreeBSD.org
+MAINTAINER=	ache@FreeBSD.org
 
-WRKSRC=         ${WRKDIR}/mpack
-MAKEFLAGS=      -f
-MAKE_ENV+=      DESTDIR=${PREFIX}
+WRKSRC=		${WRKDIR}/mpack
+MAKEFLAGS=	-f
+MAKE_ENV+=	DESTDIR=${PREFIX}
 MAN1=		mpack.1 munpack.1
 
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-Recode/Makefile b/converters/p5-Convert-Recode/Makefile
index 383492628277..8a223e7e36ee 100644
--- a/converters/p5-Convert-Recode/Makefile
+++ b/converters/p5-Convert-Recode/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	p5-Convert-Recode
-# Version required:			1.03
 # Date created:				17 January 2000
 # Whom:					Dmitry Sivachenko <dima@Chg.RU>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Convert-Recode-1.03
-PKGNAME=	p5-Convert-Recode-1.03
+PKGNAME=	p5-Convert-Recode
+PORTVERSION=	1.03
 CATEGORIES=	converters perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Convert
+DISTNAME=	Convert-Recode-${PORTVERSION}
 
 MAINTAINER=	dima@Chg.RU
 
diff --git a/converters/p5-Convert-UU/Makefile b/converters/p5-Convert-UU/Makefile
index c15a62479615..acb2e0c7e168 100644
--- a/converters/p5-Convert-UU/Makefile
+++ b/converters/p5-Convert-UU/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	p5-Convert-UU
-# Version required:			0.40
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Convert-UU-0.40
-PKGNAME=	p5-Convert-UU-0.40
+PORTNAME=	p5-Convert-UU
+PORTVERSION=	0.40
 CATEGORIES=	converters perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Convert
+DISTNAME=	Convert-UU-${PORTVERSION}
 
 MAINTAINER=	jfitz@FreeBSD.org
 
diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index 32dbb184ccd7..72f69c0bec1f 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:    p5-MIME-Base64
-# Version required:                     2.10
 # Date created:                         June 21th 1997
 # Whom:                                 ache@freebsd.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=       MIME-Base64-2.11
-PKGNAME=        p5-MIME-Base64-2.11
+PORTNAME=	p5-MIME-Base64
+PORTVERSION=	2.11
 CATEGORIES=	converters perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=     MIME
+MASTER_SITE_SUBDIR=	MIME
+DISTNAME=	MIME-Base64-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PERL5=	YES
 
-MAN3=           MIME::Base64.3 \
+MAN3=		MIME::Base64.3 \
 		MIME::QuotedPrint.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index 7005f8046424..db52d0da337a 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	recode
-# Version required:	3.4
 # Date created:		14 Jul 1995
 # Whom:			torstenb@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	recode-3.5
+PORTNAME=	recode
+PORTVERSION=	3.5
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	recode
diff --git a/converters/tcs/Makefile b/converters/tcs/Makefile
index d41419026148..1b8ece79d5c4 100644
--- a/converters/tcs/Makefile
+++ b/converters/tcs/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	tcs
-# Version required:	1.44
 # Date created:		18 Oct 1999
 # Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcs
-PKGNAME=	tcs-19950325
+PORTNAME=	tcs
+PORTVERSION=	1995.03.25
 CATEGORIES=	converters plan9
 MASTER_SITES= 	ftp://plan9.bell-labs.com/plan9/unixsrc/ \
 		ftp://ftp.gwdg.de/pub/gnu2/plan9/unixsrc/
+DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.shar.Z
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/converters/trans/Makefile b/converters/trans/Makefile
index 809e430d143c..bdd5b8be1f4a 100644
--- a/converters/trans/Makefile
+++ b/converters/trans/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:    trans
-# Version required:     1.20
 # Date created:         6 May 1996
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-DISTNAME=       trans120
-PKGNAME=        trans-1.20
-CATEGORIES=     converters russian
-MASTER_SITES=   http://www.kostis.net/freeware/
+PORTNAME=	trans
+PORTVERSION=	1.20
+CATEGORIES=	converters russian
+MASTER_SITES=	http://www.kostis.net/freeware/
+DISTNAME=	trans120
 
-MAINTAINER=     ache@FreeBSD.org
+MAINTAINER=	ache@FreeBSD.org
 
-LIBDIR= ${PREFIX}/lib/trans
-ALL= transhtm transiso transce8 transtab checkiso checkuni
+LIBDIR=		${PREFIX}/lib/trans
+ALL=		transhtm transiso transce8 transtab checkiso checkuni
 
 do-install:
 	cd ${WRKSRC}/src && $(INSTALL_PROGRAM) $(ALL) ${PREFIX}/bin
diff --git a/converters/tuc/Makefile b/converters/tuc/Makefile
index 0c3804b37d7b..8a90422d3bd1 100644
--- a/converters/tuc/Makefile
+++ b/converters/tuc/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	tuc
-# Version required:			1.10
 # Date created:				30 March 1999
 # Whom:					G. Adam Stanislav <adam@whizkidtech.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tuc-1.10
+PORTNAME=	tuc
+PORTVERSION=	1.10
 CATEGORIES=	converters
 MASTER_SITES=	http://www.whizkidtech.net/fports/
 
diff --git a/converters/unix2dos/Makefile b/converters/unix2dos/Makefile
index 35f244a9c8a4..6722c7b18034 100644
--- a/converters/unix2dos/Makefile
+++ b/converters/unix2dos/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	unix2dos
-# Version required:	1.0
 # Date created:		1 February 1999
 # Whom:			obonilla@fisicc-ufm.edu
 #
 # $FreeBSD$
 #
 
-DISTNAME=	unix2dos-1.0
+PORTNAME=	unix2dos
+PORTVERSION=	1.0
 CATEGORIES=	converters
 MASTER_SITES=	http://www.fisicc-ufm.edu/~obonilla/files/
 
diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile
index f08c4fbdebc0..5cd1ce2c39d7 100644
--- a/converters/uudeview/Makefile
+++ b/converters/uudeview/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	uudeview
-# Version Required:     0.5.9
 # Date Created:		04 Aug 1996
 # Whom:			Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       uudeview-0.5.13
+PORTNAME=	uudeview
+PORTVERSION=	0.5.13
 CATEGORIES=	converters
 MASTER_SITES=	http://www.informatik.uni-frankfurt.de/~fp/uudeview/Apps/frank/ \
 		ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/
diff --git a/converters/uudx/Makefile b/converters/uudx/Makefile
index 1906bf47533a..bf44a7370c7a 100644
--- a/converters/uudx/Makefile
+++ b/converters/uudx/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	uudx
-# Version required:	2.99
 # Date created:		2 June 1996
 # Whom:			ABURAYER Rewsirow <pcs51674@asciinet.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	uudx_299
-PKGNAME=	uudx-2.99
+PORTNAME=	uudx
+PORTVERSION=	2.99
 CATEGORIES=	converters
 MASTER_SITES=	ftp://ftp.vector.co.jp/pack/dos/util/bin/conv/
+DISTNAME=	uudx_299
 EXTRACT_SUFX=	.lzh
 
 MAINTAINER=	rewsirow@ff.iij4u.or.jp
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index 0b38a4041fa6..e4640d714954 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:	uulib
-# Version Required:     0.5.9
 # Date Created:		04 Aug 1996
 # Whom:			Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       uudeview-0.5.13
-PKGNAME=        uulib-0.5.13
+PORTNAME=	uulib
+PORTVERSION=	0.5.13
 CATEGORIES=	converters
 MASTER_SITES=	ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/ \
 		http://www.informatik.uni-frankfurt.de/~fp/uudeview/Apps/frank/
+DISTNAME=	uudeview-${PORTVERSION}
 
 MAINTAINER=	hoek@FreeBSD.org
 
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=	yes
 
 MAN3=		uulib.3
 
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index c5a94c0dbc64..336faa010731 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	xdeview
-# Version Required:	0.5.13
 # Date Created:		9 Feb 1997
 # Whom:			Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	uudeview-0.5.13
-PKGNAME=	xdeview-0.5.13
+PORTNAME=	xdeview
+PORTVERSION=	0.5.13
 CATEGORIES=	converters tk82
 MASTER_SITES=	ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/ \
 		http://www.informatik.uni-frankfurt.de/~fp/uudeview/Apps/frank/
+DISTNAME=	uudeview-${PORTVERSION}
 
 MAINTAINER=	hoek@FreeBSD.org