aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haro <mharo@FreeBSD.org>2000-04-08 23:24:42 +0000
committerMichael Haro <mharo@FreeBSD.org>2000-04-08 23:24:42 +0000
commit59df8af48ea44d533d5de8118602cc174bda92da (patch)
tree099d3028bb9a8d6c138c5cf52f3b004582a91035
parent3da86c6aa2b3345aabb564415cd86b5e3872ca1a (diff)
downloadports-59df8af48ea44d533d5de8118602cc174bda92da.tar.gz
ports-59df8af48ea44d533d5de8118602cc174bda92da.zip
Notes
-rw-r--r--archivers/arc/Makefile6
-rw-r--r--archivers/bzip/Makefile4
-rw-r--r--archivers/bzip2/Makefile4
-rw-r--r--archivers/deepforest/Makefile6
-rw-r--r--archivers/fastjar/Makefile4
-rw-r--r--archivers/freeze/Makefile4
-rw-r--r--archivers/gshar+gunshar/Makefile4
-rw-r--r--archivers/ha/Makefile22
-rw-r--r--archivers/hpack.non-usa.only/Makefile14
-rw-r--r--archivers/lha/Makefile6
-rw-r--r--archivers/linux_rar/Makefile12
-rw-r--r--archivers/lzo/Makefile4
-rw-r--r--archivers/lzo2/Makefile4
-rw-r--r--archivers/makeself/Makefile6
-rw-r--r--archivers/nulib/Makefile6
-rw-r--r--archivers/p5-Compress-Zlib/Makefile6
-rw-r--r--archivers/pkzip/Makefile12
-rw-r--r--archivers/rar/Makefile12
-rw-r--r--archivers/sharutils/Makefile4
-rw-r--r--archivers/unace/Makefile6
-rw-r--r--archivers/unarj/Makefile10
-rw-r--r--archivers/unrar/Makefile10
-rw-r--r--archivers/unzip/Makefile10
-rw-r--r--archivers/zip/Makefile6
-rw-r--r--archivers/zoo/Makefile12
-rw-r--r--cad/acs/Makefile4
-rw-r--r--cad/chipmunk/Makefile4
-rw-r--r--cad/cider/Makefile6
-rw-r--r--cad/felt/Makefile4
-rw-r--r--cad/geda/Makefile6
-rw-r--r--cad/irsim/Makefile6
-rw-r--r--cad/kaskade/Makefile6
-rw-r--r--cad/magic/Makefile4
-rw-r--r--cad/mars/Makefile6
-rw-r--r--cad/pcb/Makefile4
-rw-r--r--cad/qcad/Makefile6
-rw-r--r--cad/qcad2/Makefile6
-rw-r--r--cad/sis/Makefile6
-rw-r--r--cad/spice/Makefile6
-rw-r--r--cad/tkgate/Makefile4
-rw-r--r--cad/xcircuit/Makefile4
-rw-r--r--comms/asmodem/Makefile6
-rw-r--r--comms/bpl+/Makefile6
-rw-r--r--comms/conserver/Makefile6
-rw-r--r--comms/ecu/Makefile10
-rw-r--r--comms/gkermit/Makefile6
-rw-r--r--comms/gnokii/Makefile8
-rw-r--r--comms/hylafax/Makefile6
-rw-r--r--comms/kermit/Makefile6
-rw-r--r--comms/lrzsz/Makefile4
-rw-r--r--comms/mgetty+sendfax/Makefile6
-rw-r--r--comms/minicom/Makefile6
-rw-r--r--comms/mlan/Makefile6
-rw-r--r--comms/mserver/Makefile4
-rw-r--r--comms/plp/Makefile6
-rw-r--r--comms/qpage/Makefile3
-rw-r--r--comms/seyon/Makefile8
-rw-r--r--comms/snooper/Makefile6
-rw-r--r--comms/sredird/Makefile4
-rw-r--r--comms/tkhylafax/Makefile7
-rw-r--r--comms/viewfax/Makefile4
-rw-r--r--comms/xcept/Makefile10
-rw-r--r--comms/yaps/Makefile8
-rw-r--r--comms/zmtx-zmrx/Makefile6
-rw-r--r--converters/aish/Makefile6
-rw-r--r--converters/btoa/Makefile22
-rw-r--r--converters/fconv/Makefile4
-rw-r--r--converters/i18ntools/Makefile4
-rw-r--r--converters/iconv/Makefile4
-rw-r--r--converters/ish/Makefile4
-rw-r--r--converters/kdesupport11/Makefile6
-rw-r--r--converters/kdesupport2/Makefile6
-rw-r--r--converters/libutf-8/Makefile6
-rw-r--r--converters/mimepp/Makefile4
-rw-r--r--converters/mmencode/Makefile6
-rw-r--r--converters/mpack/Makefile20
-rw-r--r--converters/p5-Convert-Recode/Makefile6
-rw-r--r--converters/p5-Convert-UU/Makefile6
-rw-r--r--converters/p5-MIME-Base64/Makefile10
-rw-r--r--converters/recode/Makefile4
-rw-r--r--converters/tcs/Makefile6
-rw-r--r--converters/trans/Makefile16
-rw-r--r--converters/tuc/Makefile4
-rw-r--r--converters/unix2dos/Makefile4
-rw-r--r--converters/uudeview/Makefile4
-rw-r--r--converters/uudx/Makefile6
-rw-r--r--converters/uulib/Makefile8
-rw-r--r--converters/xdeview/Makefile6
-rw-r--r--math/kaskade/Makefile6
-rw-r--r--science/felt/Makefile4
90 files changed, 300 insertions, 300 deletions
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index 89941ff7e6d7..66c7b8f91a51 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: arc
-# Version required: 5.21e
# Date created: 31 Dec 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= arc521e.pl8
-PKGNAME= arc-5.21e
+PORTNAME= arc
+PORTVERSION= 5.21e.8
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
+DISTNAME= arc521e.pl8
EXTRACT_SUFX= .tar.Z
MAINTAINER= ache@FreeBSD.org
diff --git a/archivers/bzip/Makefile b/archivers/bzip/Makefile
index 78d2ae9498ba..59b7881de134 100644
--- a/archivers/bzip/Makefile
+++ b/archivers/bzip/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bzip
-# Version required: 0.21
# Date created: Fr 27 Sep 1996 11:47:35 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= bzip-0.21
+PORTNAME= bzip
+PORTVERSION= 0.21
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.connectnet.com/pub/bzip/bzip-0.21/
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile
index 8f77c89c72ae..7e724aac9f85 100644
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: bzip2
-# Version required: 0.0
# Date created: 19 Nov 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= bzip2-0.9.5d
+PORTNAME= bzip2
+PORTVERSION= 0.9.5d
CATEGORIES= archivers
MASTER_SITES= ftp://sourceware.cygnus.com/pub/bzip2/v095/ \
http://www.kernel.org/pub/software/utils/compress/bzip2/
diff --git a/archivers/deepforest/Makefile b/archivers/deepforest/Makefile
index c8b662e66c4e..cb5ca971276a 100644
--- a/archivers/deepforest/Makefile
+++ b/archivers/deepforest/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: JDE's DeepForest
-# Version required: 1.0a
# Date created: 25 March 1999
# Whom: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= DeepForest-1.0a
-PKGNAME= ${LANGPREFIX}deepforest-1.0a
+PORTNAME= ${LANGPREFIX}DeepForest
+PORTVERSION= 1.0a
CATEGORIES= ${CATEGORY_LIST}
MASTER_SITES= http://www.aaa-int.or.jp/~jfactory/JDE/dist/
+DISTNAME= DeepForest-${PORTVERSION}
MAINTAINER= kiri@pis.toba-cmt.ac.jp
diff --git a/archivers/fastjar/Makefile b/archivers/fastjar/Makefile
index 809732c408b4..9a6282a5ee1b 100644
--- a/archivers/fastjar/Makefile
+++ b/archivers/fastjar/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: fastjar
-# Version required: 0.90
# Date created: 18 March 2000
# Whom: Akinori MUSHA aka knu <knu@idaemons.org>
#
# $FreeBSD$
#
-DISTNAME= fastjar-0.90
+PORTNAME= fastjar
+PORTVERSION= 0.90
CATEGORIES= archivers java
MASTER_SITES= http://download.sourceforge.net/fastjar/
EXTRACT_SUFX= .tgz
diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile
index bef40080cb62..f9bce24a5b94 100644
--- a/archivers/freeze/Makefile
+++ b/archivers/freeze/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: freeze
-# Version required: 2.5
# Date created: 20 Jul 1996
# Whom: lukin@okbmei.msk.su
#
# $FreeBSD$
#
-DISTNAME= freeze-2.5
+PORTNAME= freeze
+PORTVERSION= 2.5
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.cdrom.com/pub/unixfreeware/archive/ \
ftp://ftp.warwick.ac.uk/pub/compression/
diff --git a/archivers/gshar+gunshar/Makefile b/archivers/gshar+gunshar/Makefile
index cd542b2f3781..0ab89ed17640 100644
--- a/archivers/gshar+gunshar/Makefile
+++ b/archivers/gshar+gunshar/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gshar+gunshar
-# Version required: 4.2.1
# Date created: 28 Dec 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= sharutils-4.2.1
+PORTNAME= sharutils
+PORTVERSION= 4.2.1
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= sharutils
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index 0c384cb1087d..b95699e0d00b 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,24 +1,24 @@
# New ports collection makefile for: ha
-# Version required: 0.999beta
# Date created: 24 Jan 1995
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= ha0999
-PKGNAME= ha-0.999b
+PORTNAME= ha
+PORTVERSION= 0.999b
CATEGORIES= archivers
-MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
-EXTRACT_SUFX= .tgz
+MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
+DISTNAME= ha0999
+EXTRACT_SUFX= .tgz
-MAINTAINER= ache@FreeBSD.org
+MAINTAINER= ache@FreeBSD.org
-NO_WRKSUBDIR= yes
-MAKEFILE= makefile.nix
-MAKE_FLAGS= CC=cc -f
-ALL_TARGET= ha
-USE_GMAKE= yes
+NO_WRKSUBDIR= yes
+MAKEFILE= makefile.nix
+MAKE_FLAGS= CC=cc -f
+ALL_TARGET= ha
+USE_GMAKE= yes
do-install:
cd ${WRKSRC}; ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ha ${PREFIX}/bin
diff --git a/archivers/hpack.non-usa.only/Makefile b/archivers/hpack.non-usa.only/Makefile
index c3ca58dc1d03..ca0866dcaccf 100644
--- a/archivers/hpack.non-usa.only/Makefile
+++ b/archivers/hpack.non-usa.only/Makefile
@@ -1,22 +1,22 @@
# New ports collection makefile for: hpack.with_encryption
-# Version required: 0.79a0
# Date created: 7 Jan 1995
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= hpack79src
-PKGNAME= hpack-0.79a
+PORTNAME= hpack
+PORTVERSION= 0.79a
CATEGORIES= archivers
-MASTER_SITES= ftp://src.doc.ic.ac.uk/packages/hpack/
+MASTER_SITES= ftp://src.doc.ic.ac.uk/packages/hpack/
+DISTNAME= hpack79src
-MAINTAINER= ache@FreeBSD.org
+MAINTAINER= ache@FreeBSD.org
RESTRICTED= "Using this code inside USA will violate RSA patents"
NO_WRKSUBDIR= yes
-MAKEFILE= makefile
-ALL_TARGET= freebsd
+MAKEFILE= makefile
+ALL_TARGET= freebsd
INSTALL_TARGET= freebsd.install
MAN1= hpack.1
diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 11512b8bd61f..7d92233bc1aa 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: lha
-# Version required: 1.14f
# Date created: 26 Dec 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= lha-114f
-PKGNAME= lha-1.14f
+PORTNAME= lha
+PORTVERSION= 1.14f
CATEGORIES= archivers
MASTER_SITES= http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \
ftp://ftp.win.ne.jp/pub/misc/
+DISTNAME= lha-114f
MAINTAINER= ache@FreeBSD.org
diff --git a/archivers/linux_rar/Makefile b/archivers/linux_rar/Makefile
index 37983886b145..3abcc0488237 100644
--- a/archivers/linux_rar/Makefile
+++ b/archivers/linux_rar/Makefile
@@ -1,21 +1,21 @@
# New ports collection makefile for: linux_rar
# http://www.rarsoft.com/rar_archiver.htm
-# Version required: 2.60
# Date created: 30 April 1999
# Whom: FUJISHIMA Satsuki <k5@respo.or.jp>
#
# $FreeBSD$
#
-DISTNAME= rarlnx26
-PKGNAME= linux_rar-2.60
+PORTNAME= linux_rar
+PORTVERSION= 2.60
CATEGORIES= archivers linux
MASTER_SITES= ftp://rarsoft.ti.sk/pub/rar/ \
ftp://ftp.cdrom.com/pub/cheats/dlh/rar/ \
ftp://ftp.cdrom.com/pub/sac/pack/
-EXTRACT_SUFX= .sfx
+DISTNAME= rarlnx26
+EXTRACT_SUFX= .sfx
-MAINTAINER= k5@cheerful.com
+MAINTAINER= k5@cheerful.com
BUILD_DEPENDS= /compat/linux/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base
RUN_DEPENDS= /compat/linux/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base
@@ -23,7 +23,7 @@ RUN_DEPENDS= /compat/linux/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base
NO_BUILD= yes
ONLY_FOR_ARCHS= i386
NO_CDROM= NOFEE: Can not charge for distribution
-NO_PACKAGE= Only unmodified original package can be distributed
+NO_PACKAGE= Only unmodified original package can be distributed
EXTRACT_CMD= # empty
EXTRACT_BEFORE_ARGS= # empty
diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile
index b15c4755ef7d..db246dc510be 100644
--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: lzo
-# Version required: 1.06
# Date created: 21 Feb 1998
# Whom: giffunip@asme.org
#
# $FreeBSD$
#
-DISTNAME= lzo-1.06
+PORTNAME= lzo
+PORTVERSION= 1.06
CATEGORIES= archivers devel
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://wildsau.idv.uni-linz.ac.at/mfx/lzo-download/
diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile
index b15c4755ef7d..db246dc510be 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: lzo
-# Version required: 1.06
# Date created: 21 Feb 1998
# Whom: giffunip@asme.org
#
# $FreeBSD$
#
-DISTNAME= lzo-1.06
+PORTNAME= lzo
+PORTVERSION= 1.06
CATEGORIES= archivers devel
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://wildsau.idv.uni-linz.ac.at/mfx/lzo-download/
diff --git a/archivers/makeself/Makefile b/archivers/makeself/Makefile
index bd65d7e5ea11..f1e0631cc390 100644
--- a/archivers/makeself/Makefile
+++ b/archivers/makeself/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: makeself
-# Version required: 1.5.3
# Date created: 22 Oct 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= makeself
-PKGNAME= makeself-1.5.3
+PORTNAME= makeself
+PORTVERSION= 1.5.3
CATEGORIES= archivers
MASTER_SITES= http://www.lokigames.com/~megastep/makeself/
+DISTNAME= makeself
EXTRACT_SUFX= .gz.sh
MAINTAINER= will@FreeBSD.org
diff --git a/archivers/nulib/Makefile b/archivers/nulib/Makefile
index ad5fa943e9cd..4b4a1d12096f 100644
--- a/archivers/nulib/Makefile
+++ b/archivers/nulib/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: nulib
-# Version required: 3.25
# Date created: Thu May 8 00:14:31 PDT 1997
# Whom: Steven Wallace <swallace@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= nulib325
-PKGNAME= nulib-3.25
+PORTNAME= nulib
+PORTVERSION= 3.25
CATEGORIES= archivers
MASTER_SITES= http://people.FreeBSD.org/~jseger/
+DISTNAME= nulib325
EXTRACT_SUFX= .tar.Z
MAINTAINER= jseger@FreeBSD.org
diff --git a/archivers/p5-Compress-Zlib/Makefile b/archivers/p5-Compress-Zlib/Makefile
index 872f1ebba158..a21cb177d200 100644
--- a/archivers/p5-Compress-Zlib/Makefile
+++ b/archivers/p5-Compress-Zlib/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Compress-Zlib
-# Version required: 1.01
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Compress-Zlib-1.08
-PKGNAME= p5-Compress-Zlib-1.08
+PORTNAME= p5-Compress-Zlib
+PORTVERSION= 1.08
CATEGORIES= archivers perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Compress
+DISTNAME= Compress-Zlib-1.08
MAINTAINER= jfitz@FreeBSD.org
diff --git a/archivers/pkzip/Makefile b/archivers/pkzip/Makefile
index 3f4181c2fadc..4f9a18564205 100644
--- a/archivers/pkzip/Makefile
+++ b/archivers/pkzip/Makefile
@@ -1,20 +1,20 @@
# New ports collection makefile for: pkzip
-# Version required: 2.2
# Date created: 17 Mar 1999
# Whom: xxx
#
# $FreeBSD$
#
-DISTNAME= pklin251
-PKGNAME= pkzip-2.5
+PORTNAME= pkzip
+PORTVERSION= 2.5
CATEGORIES= archivers linux
-MASTER_SITES= ftp://ftp.pkware.com/
+MASTER_SITES= ftp://ftp.pkware.com/
+DISTNAME= pklin251
EXTRACT_SUFX= .exe
-MAINTAINER= dbader@eece.unm.edu
+MAINTAINER= dbader@eece.unm.edu
-RUN_DEPENDS= /compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS= /compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base
ONLY_FOR_ARCHS= i386
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 291ecaad883d..f9304bce91e7 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,20 +1,20 @@
# New ports collection makefile for: rar
# http://www.rarsoft.com/
-# Version required: 2.*
# Date created: 15 May 1996
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= rarbsd
-PKGNAME= rar-2.02
+PORTNAME= rar
+PORTVERSION= 2.02
CATEGORIES= archivers
-MASTER_SITES= ftp://rarsoft.ti.sk/pub/rar/ \
+MASTER_SITES= ftp://rarsoft.ti.sk/pub/rar/ \
ftp://ftp.cdrom.com/pub/sac/pack/
-EXTRACT_SUFX= .sfx
+DISTNAME= rarbsd
+EXTRACT_SUFX= .sfx
-MAINTAINER= ache@FreeBSD.org
+MAINTAINER= ache@FreeBSD.org
CAT1= rar.1
diff --git a/archivers/sharutils/Makefile b/archivers/sharutils/Makefile
index cd542b2f3781..0ab89ed17640 100644
--- a/archivers/sharutils/Makefile
+++ b/archivers/sharutils/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gshar+gunshar
-# Version required: 4.2.1
# Date created: 28 Dec 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= sharutils-4.2.1
+PORTNAME= sharutils
+PORTVERSION= 4.2.1
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= sharutils
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index 5eb4d5369c88..cb8cc70edae6 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: unace
# URL: http://members.aol.com/mlemke6413/ace.html
-# Version required: 1.2b
# Date created: 23 February 1999
# Whom: Joao Carlos Mendes Luis <jonny@jonny.eng.br>
#
# $FreeBSD$
#
-DISTNAME= unacepub
-PKGNAME= unace-1.2b
+PORTNAME= unace
+PORTVERSION= 1.2b
CATEGORIES= archivers
MASTER_SITES= http://members.aol.com/mlemke6413/
+DISTNAME= unacepub
MAINTAINER= jonny@jonny.eng.br
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index ee2b7ce80247..5897840ac127 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: unarj
-# Version required: 2.4*
# Date created: 28 Dec 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= unarj-2.43
+PORTNAME= unarj
+PORTVERSION= 2.43
CATEGORIES= archivers
-MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
-EXTRACT_SUFX= .tgz
+MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
+EXTRACT_SUFX= .tgz
-MAINTAINER= ache@FreeBSD.org
+MAINTAINER= ache@FreeBSD.org
do-install:
${INSTALL} -d -m 755 -o $(SHAREOWN) -g ${SHAREGRP} \
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index ee4fad5b2baa..4dd235546df6 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: unrar
# http://www.rarsoft.com/
-# Version required: 2.*
# Date created: 28 Dec 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= unrar-2.50
+PORTNAME= unrar
+PORTVERSION= 2.50
CATEGORIES= archivers
-MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
+MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
-MAINTAINER= ache@FreeBSD.org
+MAINTAINER= ache@FreeBSD.org
-NO_WRKSUBDIR= Yes
+NO_WRKSUBDIR= Yes
do-build:
cd ${WRKSRC} && \
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 6f9c93b7e8ca..a9384674dd7e 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: unzip
-# Version required: 5.*
# Date created: 17 October 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= unzip540
-PKGNAME= unzip-5.40
+PORTNAME= unzip-5.40
+PORTVERSION= unzip-5.40
CATEGORIES= archivers
-MASTER_SITES= ftp://ftp.cdrom.com/pub/infozip/src/
+MASTER_SITES= ftp://ftp.cdrom.com/pub/infozip/src/
+DISTNAME= unzip540
-MAINTAINER= ache@FreeBSD.org
+MAINTAINER= ache@FreeBSD.org
Y2K= http://www.cdrom.com/pub/infozip/FAQ.html#Y2K
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 5f82325d2f2e..e504aca204c6 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: zip (without encryption)
-# Version required: 2.3
# Date created: 22 Dec 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= zip23
-PKGNAME= zip-2.3
+PORTNAME= zip
+PORTVERSION= 2.3
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.cdrom.com/pub/infozip/src/
+DISTNAME= zip23
MAINTAINER= ache@FreeBSD.org
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index 20b5a10b104c..51cbe18fc660 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,21 +1,21 @@
# New ports collection makefile for: zoo
-# Version required: 2.10pl1
# Date created: 18 October 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= zoo-2.10pl1
-PKGNAME= zoo-2.10.1
+PORTNAME= zoo
+PORTVERSION= 2.10.1
CATEGORIES= archivers
-MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
+MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
+DISTNAME= zoo-2.10pl1
MAINTAINER= jmz@FreeBSD.org
NO_WRKSUBDIR= yes
-ALL_TARGET= bsdansi
-MAKEFILE= makefile
+ALL_TARGET= bsdansi
+MAKEFILE= makefile
MAN1= fiz.1 zoo.1
.include <bsd.port.mk>
diff --git a/cad/acs/Makefile b/cad/acs/Makefile
index eff118c4b1af..5ad8e10f7041 100644
--- a/cad/acs/Makefile
+++ b/cad/acs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: acs
-# Version required: 0.25
# Date created: 01 January 1995
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= acs-0.25
+PORTNAME= acs
+PORTVERSION= 0.25
CATEGORIES= cad
MASTER_SITES= http://www.geda.seul.org/dist/ \
http://www.geda.coelacanth.com/dist/ \
diff --git a/cad/chipmunk/Makefile b/cad/chipmunk/Makefile
index 8069aef72c5d..4533de69e94d 100644
--- a/cad/chipmunk/Makefile
+++ b/cad/chipmunk/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: chipmunk
-# Version required: 5.51
# Date created: 29 July 1995
# Whom: janek@gaja.ipan.lublin.pl
#
# $FreeBSD$
#
-DISTNAME= chipmunk-5.51
+PORTNAME= chipmunk
+PORTVERSION= 5.51
CATEGORIES= cad
MASTER_SITES= http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/
DISTFILES= psys-1.51.tar.gz log-5.51.tar.gz netcmpbeta.tar.gz \
diff --git a/cad/cider/Makefile b/cad/cider/Makefile
index eaf466482040..1365de2efd51 100644
--- a/cad/cider/Makefile
+++ b/cad/cider/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: cider
-# Version required: 1b1
# Date created: 1999-12-12
# Whom: AMAKAWA Shuhei <amakawa@jp.FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= cider1b1
-PKGNAME= cider-1b1
+PORTNAME= cider
+PORTVERSION= 1.b1
CATEGORIES= cad
MASTER_SITES= ftp://ic.eecs.berkeley.edu/pub/Cider/new/
+DISTNAME= cider1b1
EXTRACT_SUFX= .tar.Z
MAINTAINER= amakawa@jp.FreeBSD.org
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index 7b011376f213..e711336aad46 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: FElt
-# Version required: 3.02
# Date created: 19 October 1996
# Whom: Pedro Giffuni
#
# $FreeBSD$
#
-DISTNAME= felt-3.02
+PORTNAME= felt
+PORTVERSION= 3.02
CATEGORIES= cad
MASTER_SITES= ftp://felt.sourceforge.net/pub/FElt/ \
http://symphony.clarku.edu/atkinson/felt/Binaries/ \
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index a7cd4e65f080..bae3cfaaf480 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: geda
-# Version required: 19990327
# Date created: 24 Nov 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gEDA-19990516
-PKGNAME= geda-19990516
+PORTNAME= geda
+PORTVERSION= 1999.05.16
CATEGORIES= cad
MASTER_SITES= ftp://ftp.cc.gatech.edu/ac121/linux/X11/gtkbuffet/apps/geda/ \
ftp://ftp.geda.seul.org/pub/geda/dist/ \
ftp://ftp.infodrom.north.de/pub/unix/gtk-etc/apps/geda/
+DISTNAME= gEDA-19990516
MAINTAINER= vanilla@FreeBSD.org
diff --git a/cad/irsim/Makefile b/cad/irsim/Makefile
index 44307b9bba62..fbb8b5ba784a 100644
--- a/cad/irsim/Makefile
+++ b/cad/irsim/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: irsim
-# Version required: 9.2
# Date created: 18 Dec 1994
# Whom: swallace
#
# $FreeBSD$
#
-DISTNAME= irsim-9.4.1
+PORTNAME= irsim
+PORTVERSION= 9.4.1
CATEGORIES= cad
MASTER_SITES= ftp://gatekeeper.dec.com/pub/DEC/WRL/projects/magic/6.5/
-EXTRACT_SUFX= .tar.Z
+EXTRACT_SUFX= .tar.Z
MAINTAINER= swallace@FreeBSD.org
diff --git a/cad/kaskade/Makefile b/cad/kaskade/Makefile
index 39b5d44e4a52..c5f8936bfffb 100644
--- a/cad/kaskade/Makefile
+++ b/cad/kaskade/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Kaskade
-# Version required: 3.1.1
# Date created: 19 Sept. 1997
# Whom: Pedro Giffuni
#
# $FreeBSD$
#
-DISTNAME= 3.1.1
-PKGNAME= kaskade-3.1.1
+PORTNAME= kaskade
+PORTVERSION= 3.1.1
CATEGORIES= cad
MASTER_SITES= ftp://ftp.zib.de/pub/kaskade/3.x/
+DISTNAME= ${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 588fdae4b352..3aebe6e8b15a 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: magic
-# Version required: 6.4.4
# Date created: 18 Dec 1994
# Whom: swallace
#
# $FreeBSD$
#
-DISTNAME= magic-6.5
+PORTNAME= magic
+PORTVERSION= 6.5
CATEGORIES= cad
MASTER_SITES= ftp://gatekeeper.dec.com/pub/DEC/WRL/projects/magic/6.5/
DISTFILES= magic-6_5_tar.Z
diff --git a/cad/mars/Makefile b/cad/mars/Makefile
index 7dd9ee673eb0..ef9acee24060 100644
--- a/cad/mars/Makefile
+++ b/cad/mars/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# Ports collection makefile for: MaRS
-# Version required: 0.0
# Date created: Mon Nov 18, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= MaRS-2.1
-PKGNAME= mars-2.1
+PORTNAME= mars
+PORTVERSION= 2.1
CATEGORIES= cad
MASTER_SITES= ftp://ftp.cs.umd.edu/pub/sdag/MaRS/
+DISTNAME= MaRS-${PORTVERSION}
.if !defined(NOPORTDOCS)
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MaRS-2-doc${EXTRACT_SUFX}
.endif
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 610148b564bf..f972af836e1a 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: PCB
-# Version required: 1.7
# Date created: 19 October 1994
# Whom: mr
#
# $FreeBSD$
#
-DISTNAME= pcb-1.7
+PORTNAME= pcb
+PORTVERSION= 1.7
CATEGORIES= cad
MASTER_SITES= ftp://ftp.netlab.is.tsukuba.ac.jp/pub/linux/Plamo/Plamo-current/contrib/Electronic/sources/
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index e0c067ddfa8a..5d76f3fff4bb 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: qcad
-# Version required: 1.3.3
# Date created: 10 Dec 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= qcad_source
-PKGNAME= qcad-1.3.3
+PORTNAME= qcad
+PORTVERSION= 1.3.3
CATEGORIES= cad
MASTER_SITES= http://www.ultraviolet.org/qcad/
+DISTNAME= qcad_source
MAINTAINER= will@FreeBSD.org
diff --git a/cad/qcad2/Makefile b/cad/qcad2/Makefile
index e0c067ddfa8a..5d76f3fff4bb 100644
--- a/cad/qcad2/Makefile
+++ b/cad/qcad2/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: qcad
-# Version required: 1.3.3
# Date created: 10 Dec 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= qcad_source
-PKGNAME= qcad-1.3.3
+PORTNAME= qcad
+PORTVERSION= 1.3.3
CATEGORIES= cad
MASTER_SITES= http://www.ultraviolet.org/qcad/
+DISTNAME= qcad_source
MAINTAINER= will@FreeBSD.org
diff --git a/cad/sis/Makefile b/cad/sis/Makefile
index 328a3d856393..d5f616ab57c7 100644
--- a/cad/sis/Makefile
+++ b/cad/sis/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: sis
-# Version required: 1.2 (pl1)
# Date created: 10 October 1997
# Whom: volf@oasis.IAEhv.nl
#
# $FreeBSD$
#
-DISTNAME= sis-1.2
-PKGNAME= sis-1.2.1
+PORTNAME= sis
+PORTVERSION= 1.2.1
CATEGORIES= cad
MASTER_SITES= ftp://ic.eecs.berkeley.edu/pub/Sis/
+DISTNAME= ${PORTNAME}-1.2
EXTRACT_SUFX= .tar.Z
PATCH_SITES= ftp://ic.eecs.berkeley.edu/pub/Sis/
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 76f6ba93f740..f8f53daf1381 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: spice
-# Version required: 3f5
# Date created: 26 Mar 96
# Whom: Julian Jenkins <kaveman@magna.com.au>
#
# $FreeBSD$
#
-DISTNAME= sp3f4.kit
-PKGNAME= spice-3f5
+PORTNAME= spice
+PORTVERSION= 3f5
CATEGORIES= cad
MASTER_SITES= ftp://ic.eecs.berkeley.edu/pub/Spice3/
+DISTNAME= sp3f4.kit
EXTRACT_SUFX= .tar.Z
MAINTAINER= kaveman@magna.com.au
diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index 12f7ee18c9aa..7382014f5da0 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tkgate
-# Version required: 1.0
# Date created: 28 May 1999
# Whom: Jeffery Hansen <hansen@cmu.edu>
#
# $FreeBSD$
#
-DISTNAME= tkgate-1.0
+PORTNAME= tkgate
+PORTVERSION= 1.0
CATEGORIES= cad
MASTER_SITES= http://www.cs.cmu.edu/~hansen/tkgate/
EXTRACT_SUFX= .tgz
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index dd4c19b49843..081f3b1259bd 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xcircuit
-# Version required: 2.0b4
# Date created: 3 Apr 1998
# Whom: giffunip@asme.org
#
# $FreeBSD$
#
-DISTNAME= xcircuit-2.0b4
+PORTNAME= xcircuit
+PORTVERSION= 2.0b4
CATEGORIES= cad
MASTER_SITES= ftp://bach.ece.jhu.edu/pub/tim/xcircuit/ \
http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
diff --git a/comms/asmodem/Makefile b/comms/asmodem/Makefile
index a4594329900b..603003a96e8b 100644
--- a/comms/asmodem/Makefile
+++ b/comms/asmodem/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: asmodem
-# Version required: 0.6.1
# Date created: 11 May 1998
# Whom: Sean Cole <scole@aracnet.com>
#
# $FreeBSD$
#
-DISTNAME= asmodem-0.6-1
-PKGNAME= asmodem-0.6.1
+PORTNAME= asmodem
+PORTVERSION= 0.6.1
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_AFTERSTEP}
MASTER_SITE_SUBDIR= apps/asmodem
+DISTNAME= ${PORTNAME}-0.6-1
MAINTAINER= ports@FreeBSD.org
diff --git a/comms/bpl+/Makefile b/comms/bpl+/Makefile
index c9aeec25b571..61461eee33ef 100644
--- a/comms/bpl+/Makefile
+++ b/comms/bpl+/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: bpl+
-# Version required: ?
# Date created: 22 Sep 1996
# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= bpl+
-PKGNAME= bpl+-1.0
+PORTNAME= bpl+
+PORTVERSION= 1.0
CATEGORIES= comms
MASTER_SITES= http://people.FreeBSD.org/~max/distfiles/
+DISTNAME= ${PORTNAME}
MAINTAINER= max@FreeBSD.org
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index a5d3ea993f4e..e07cc9a78909 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,16 +1,16 @@
# Ports collection makefile for: conserver
-# Version required: 5.21-Beta
# Date created: 22 November 1997
# Whom: Peter Wemm <peter@netplex.com.au>
#
# $FreeBSD$
#
-DISTNAME= conserver-5.21-Beta
-PKGNAME= conserver-5.21
+PORTNAME= conserver
+PORTVERSION= 5.21b
CATEGORIES= comms
MASTER_SITES= ftp://ftp.uu.net/vendor/bitsko/config-mgmt/ \
ftp://unix.hensa.ac.uk/mirrors/uunet/vendor/bitsko/config-mgmt/
+DISTNAME= conserver-5.21-Beta
EXTRACT_SUFX= .shar.gz
MAINTAINER= peter@FreeBSD.org
diff --git a/comms/ecu/Makefile b/comms/ecu/Makefile
index 173e06797de1..5cb3418482d7 100644
--- a/comms/ecu/Makefile
+++ b/comms/ecu/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: ecu
-# Version required: 4.08
# Date created: Feb 18, 1995
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= ecu-4.08
+PORTNAME= ecu
+PORTVERSION= 4.08
CATEGORIES= comms
-MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/comm/
-#MASTER_SITES= ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/Communications/
+MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/comm/
+#MASTER_SITES= ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/Communications/
-MAINTAINER= ache@FreeBSD.org
+MAINTAINER= ache@FreeBSD.org
do-configure:
cd ${WRKSRC}; yes "" | ./Configure
diff --git a/comms/gkermit/Makefile b/comms/gkermit/Makefile
index 6b54ecc8ff8d..ad4fc74541c9 100644
--- a/comms/gkermit/Makefile
+++ b/comms/gkermit/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: gkermit
-# Version required: 1.0
# Date created: 8 Jan 2000
# Whom: dom@myrddin.demon.co.uk
#
# $FreeBSD$
#
-DISTNAME= gkermit
-PKGNAME= gkermit-1.0
+PORTNAME= gkermit
+PORTVERSION= 1.0
CATEGORIES= comms
MASTER_SITES= ftp://kermit.columbia.edu/kermit/archives/
+DISTNAME= ${PORTNAME}
MAINTAINER= dom@myrddin.demon.co.uk
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 8719d567335f..74a0a59bada5 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: gnokii
-# Version required: 0.2.3
# Date created: 15 March 1999
# Whom: staffanu
#
# $FreeBSD$
#
-DISTNAME= gnokii-0.2.3
+PORTNAME= gnokii
+PORTVERSION= 0.2.3
CATEGORIES= comms
-MASTER_SITES= ftp://multivac.fatburen.org/pub/gnokii/ \
+MASTER_SITES= ftp://multivac.fatburen.org/pub/gnokii/ \
ftp://multivac.fatburen.org/pub/gnokii/old/
-MAINTAINER= staffanu@nada.kth.se
+MAINTAINER= staffanu@nada.kth.se
USE_GMAKE= yes
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 25e8149b2d62..4ee8ccc63a82 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,17 +1,17 @@
# ports collection makefile for: hylafax
-# Version required: v4.0pl2
# Date created: 19 Apr 1997
# Whom: ports@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= hylafax-v4.0pl2
-PKGNAME= hylafax-4.0.2
+PORTNAME= hylafax
+PORTVERSION= 4.0.2
CATEGORIES= comms
MASTER_SITES= ftp://ftp.sgi.com/sgi/fax/source/ \
ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source/ \
ftp://ftp.sisis.de/pub/hylafax/source/
+DISTNAME= ${PORTNAME}-v4.0pl2
EXTRACT_SUFX= -tar.gz
PATCH_SITES= http://www.hylafax.org/patches/
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index f81ed9821f70..e54ab6cbd544 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: kermit
-# Version required: 6.0.192
# Date created: Oct 27, 1994
# Whom: pst
#
# $FreeBSD$
#
-DISTNAME= cku196
-PKGNAME= kermit-7.0.196
+PKGNAME= kermit
+PORTVERSION= 7.0.196
CATEGORIES= comms
MASTER_SITES= ftp://kermit.columbia.edu/kermit/archives/
+DISTNAME= cku196
MAINTAINER= joerg@FreeBSD.org
diff --git a/comms/lrzsz/Makefile b/comms/lrzsz/Makefile
index 777d4f8ef8de..d594b9f6987d 100644
--- a/comms/lrzsz/Makefile
+++ b/comms/lrzsz/Makefile
@@ -1,12 +1,12 @@
# ex:ts=8
# Ports collection makefile for: lrzsz
-# Version required: 0.0
# Date created: 29 Sept 1996
# Whom: David O'Brien <obrien@cs.ucdavis.edu>
#
# $FreeBSD$
-DISTNAME= lrzsz-0.12.20
+PORTNAME= lrzsz
+PORTVERSION= 0.12.20
CATEGORIES= comms
MASTER_SITES= ftp://tirka.ohse.de/uwe/releases/ \
ftp://ftp.netsw.org/netsw/Network/Modem/Protocols/ZModem/lrzsz/ \
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 6b61cd25d181..2b87a9a7b2c0 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mgetty+sendfax
-# Version required: 1.1.21
# Date created: 20 April 1998
# Whom: rkw
#
# $FreeBSD$
#
-DISTNAME= mgetty1.1.21-Jul24
-PKGNAME= mgetty-1.1.21
+PORTNAME= mgetty
+PORTVERSION= 1.1.21.07.24
CATEGORIES= comms
MASTER_SITES= ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/
+DISTNAME= mgetty1.1.21-Jul24
MAINTAINER= jmz@FreeBSD.org
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 9b7056f757c1..1c27cf4d24f9 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,20 +1,20 @@
# ex:ts=8
# Ports collection makefile for: minicom
-# Version required: 0.0
# Date created: Fri Dec 01, 1995
# Whom: obrien@cs.ucdavis.edu
#
# $FreeBSD$
#
-DISTNAME= ${PKGNAME}.src
-PKGNAME= minicom-1.83.0
+PORTNAME= minicom
+PORTVERSION= 1.83.0
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www.pp.clinet.fi/~walker/mc-dev/ \
http://www.clinet.fi/~walker/ \
http://www.pp.clinet.fi/~walker/
MASTER_SITE_SUBDIR= apps/serialcomm/dialout
+DISTNAME= ${PKGNAME}.src
MAINTAINER= obrien@FreeBSD.org
diff --git a/comms/mlan/Makefile b/comms/mlan/Makefile
index 874081bc47f4..5f0db5774bc5 100644
--- a/comms/mlan/Makefile
+++ b/comms/mlan/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mlan
-# Version required: 1.03
# Date created: 4 January 2000
# Whom: phk
#
# $FreeBSD$
#
-DISTNAME= mlpb103
-PKGNAME= mlan-1.03
+PORTNAME= mlan
+PORTVERSION= 1.03
CATEGORIES= comms
MASTER_SITES= ftp://ftp.dalsemi.com/pub/auto_id/public/
+DISTNAME= mlpb103
MAINTAINER= phk@FreeBSD.org
diff --git a/comms/mserver/Makefile b/comms/mserver/Makefile
index d108f0ce2525..5b9f9203ef43 100644
--- a/comms/mserver/Makefile
+++ b/comms/mserver/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mserver
-# Version required: 0.23a
# Date created: 21 May 1999
# Whom: Maxim Sobolev <sobomax@altavista.net>
#
# $FreeBSD$
#
-DISTNAME= mserver-0.23a
+PORTNAME= mserver
+PORTVERSION= 0.23a
CATEGORIES= comms
MASTER_SITES= ftp://ftp.innet.be/pub/staff/carl/
diff --git a/comms/plp/Makefile b/comms/plp/Makefile
index 57fa9fde357d..47b8a8f4e109 100644
--- a/comms/plp/Makefile
+++ b/comms/plp/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: Psion Link Protocol
-# Version required: 1.8
# Date created: Tue Nov 30 15:43:27 EST 1999
# Whom: Maurice Castro <maurice@serc.rmit.edu.au>
#
# $FreeBSD$
#
-DISTNAME= plp_1_8
-PKGNAME= plp-1.8
+PORTNAME= plp
+PORTVERSION= 1.8
CATEGORIES= comms
MASTER_SITES= http://www.proudman51.freeserve.co.uk/psion/ \
http://people.FreeBSD.org/~kris/distfiles/
+DISTNAME= ${PORTNAME}_1_8
MAINTAINER= maurice@serc.rmit.edu.au
diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile
index 518c0e727abb..9a9d39508cb4 100644
--- a/comms/qpage/Makefile
+++ b/comms/qpage/Makefile
@@ -6,7 +6,8 @@
# $FreeBSD$
#
-DISTNAME= qpage-3.2
+PORTNAME= qpage
+PORTVERSION= 3.2
CATEGORIES= comms
#MASTER_SITES= http://www.qpage.org/download/
MASTER_SITES= http://people.FreeBSD.org/~fenner/
diff --git a/comms/seyon/Makefile b/comms/seyon/Makefile
index 70bcf89c274e..f588af34e9a2 100644
--- a/comms/seyon/Makefile
+++ b/comms/seyon/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: seyon
-# Version required: 2.14b or 2.14c
# Date created: 3 October 1994
# Whom: Michael Elbel (me)
#
# $FreeBSD$
#
-DISTNAME= Seyon-2.14b
-PKGNAME= seyon-2.14b
+PORTNAME= seyon
+PORTVERSION= 2.14b
CATEGORIES= comms
MASTER_SITES= ftp://sipb.mit.edu/pub/seyon/
-DISTFILES= Seyon-2.14b-tar.Z
+DISTNAME= Seyon-${PORTVERSION}
+EXTRACT_SUFX= -tar.Z
MAINTAINER= me@FreeBSD.org
diff --git a/comms/snooper/Makefile b/comms/snooper/Makefile
index db29d1e12d5b..42fe13ba21e8 100644
--- a/comms/snooper/Makefile
+++ b/comms/snooper/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: snooper
-# Version required: 19991202
# Date created: 4 May 1997
# Whom: Jun-ichiro itojun Itoh <itojun@itojun.org>
#
# $FreeBSD$
#
-DISTNAME= snooper-19991202
-PKGNAME= snooper-19991202
+PORTNAME= snooper
+PORTVERSION= 1999.12.02
CATEGORIES= comms
MASTER_SITES= ftp://ftp.foretune.co.jp/pub/tools/snooper/
+DISTNAME= snooper-19991202
MAINTAINER= itojun@itojun.org
diff --git a/comms/sredird/Makefile b/comms/sredird/Makefile
index 595231e54801..ced64c8c1900 100644
--- a/comms/sredird/Makefile
+++ b/comms/sredird/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sredird
-# Version required: 1.1.7
# Date created: 19 Dec 1999
# Whom: Maxim Sobolev <sobomax@altavista.net>
#
# $FreeBSD$
#
-DISTNAME= sredird-1.1.7
+PORTNAME= sredird
+PORTVERSION= 1.1.7
CATEGORIES= comms
MASTER_SITES= http://metalab.unc.edu/pub/Linux/system/serial/
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index 3fb9dd0c7e8e..1f65905c491e 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -1,13 +1,12 @@
-# New ports collection Makefile for: tkhylafax-3.0
-# Version required: 3.0b2
+# New ports collection Makefile for: tkhylafax
# Date created: Sun Jun 8 11:51:21 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= tkhylafax-3.0b2
-PKGNAME= tkhylafax-3.0
+PORTNAME= tkhylafax
+PORTVERSION= 3.0b2
CATEGORIES= comms tk82
MASTER_SITES= http://www.NeoSoft.com/tcl/ftparchive/sorted/comm/tkhylafax-3.0b2/
diff --git a/comms/viewfax/Makefile b/comms/viewfax/Makefile
index 24bd4ad70de9..04b7210d94b4 100644
--- a/comms/viewfax/Makefile
+++ b/comms/viewfax/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: viewfax
-# Version required: 2.3
# Date created: 16 sept 1995
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= viewfax-2.3
+PORTNAME= viewfax
+PORTVERSION= 2.3
CATEGORIES= comms
MASTER_SITES= ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/
diff --git a/comms/xcept/Makefile b/comms/xcept/Makefile
index b32fc6ce107f..417ab631e8a1 100644
--- a/comms/xcept/Makefile
+++ b/comms/xcept/Makefile
@@ -1,22 +1,22 @@
# New ports collection makefile for: xcept
-# Version required: 2.1.2
# Date created: Sep 1, 1996
# Whom: joerg
#
# $FreeBSD$
#
-DISTNAME= xcept-2.1.2
+PORTNAME= xcept
+PORTVERSION= 2.1.2
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITES= ${MASTER_SITE_LOCAL}
-MAINTAINER= joerg@FreeBSD.org
+MAINTAINER= joerg@FreeBSD.org
USE_XLIB= yes
MAN1= xcept.1
MAN8= ceptd.8
MANCOMPRESSED= maybe
-WRKSRC= ${WRKDIR}/XCept-2.1.2
+WRKSRC= ${WRKDIR}/XCept-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/comms/yaps/Makefile b/comms/yaps/Makefile
index 173b0f15479a..06cec2c73ba1 100644
--- a/comms/yaps/Makefile
+++ b/comms/yaps/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: yaps
-# Version required: 0.96
# Date created: Di 29 Sep 1998 15:51:27 CEST
# Whom: se
#
# $FreeBSD$
#
-DISTNAME= yaps-0.96
+PORTNAME= yaps
+PORTVERSION= 0.96
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
+MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/serialcomm/machines
-MAINTAINER= se@FreeBSD.org
+MAINTAINER= se@FreeBSD.org
USE_GMAKE= true
diff --git a/comms/zmtx-zmrx/Makefile b/comms/zmtx-zmrx/Makefile
index cec189741c42..78022b8f320a 100644
--- a/comms/zmtx-zmrx/Makefile
+++ b/comms/zmtx-zmrx/Makefile
@@ -1,19 +1,19 @@
# ex:ts=8
# Ports collection makefile for: zmtx-zmrx
-# Version required: 0.0
# Date created: 29 July 1996
# Whom: David O'Brien <obrien@cs.ucdavis.edu>
#
# $FreeBSD$
#
-DISTNAME= zmtx-zmrx
-PKGNAME= zmtx-zmrx-1.02
+PORTNAME= zmtx-zmrx
+PORTVERSION= 1.02
CATEGORIES= comms
MASTER_SITES= ftp://ftp.inria.fr/network/modem/ \
ftp://ftp.vex.net/pub/software/
# see also comp.unix.sources for version 1.0
# ftp://ftp.lth.se/pub/usenet/comp.sources.unix/volume28/zm/part01.gz
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .shar.gz
MAINTAINER= obrien@FreeBSD.org
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
diff --git a/math/kaskade/Makefile b/math/kaskade/Makefile
index 39b5d44e4a52..c5f8936bfffb 100644
--- a/math/kaskade/Makefile
+++ b/math/kaskade/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Kaskade
-# Version required: 3.1.1
# Date created: 19 Sept. 1997
# Whom: Pedro Giffuni
#
# $FreeBSD$
#
-DISTNAME= 3.1.1
-PKGNAME= kaskade-3.1.1
+PORTNAME= kaskade
+PORTVERSION= 3.1.1
CATEGORIES= cad
MASTER_SITES= ftp://ftp.zib.de/pub/kaskade/3.x/
+DISTNAME= ${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/science/felt/Makefile b/science/felt/Makefile
index 7b011376f213..e711336aad46 100644
--- a/science/felt/Makefile
+++ b/science/felt/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: FElt
-# Version required: 3.02
# Date created: 19 October 1996
# Whom: Pedro Giffuni
#
# $FreeBSD$
#
-DISTNAME= felt-3.02
+PORTNAME= felt
+PORTVERSION= 3.02
CATEGORIES= cad
MASTER_SITES= ftp://felt.sourceforge.net/pub/FElt/ \
http://symphony.clarku.edu/atkinson/felt/Binaries/ \