summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/ElectricFence/Makefile6
-rw-r--r--devel/ORBacus/Makefile6
-rw-r--r--devel/ORBit/Makefile4
-rw-r--r--devel/ORBit2/Makefile4
-rw-r--r--devel/SWIG-devel/Makefile6
-rw-r--r--devel/SWIG/Makefile6
-rw-r--r--devel/SpecTcl/Makefile6
-rw-r--r--devel/a2dev/Makefile4
-rw-r--r--devel/amulet/Makefile6
-rw-r--r--devel/asl/Makefile4
-rw-r--r--devel/astyle/Makefile6
-rw-r--r--devel/autoconf/Makefile4
-rw-r--r--devel/autoconf213/Makefile4
-rw-r--r--devel/autoconf253/Makefile4
-rw-r--r--devel/autoconf254/Makefile4
-rw-r--r--devel/autoconf257/Makefile4
-rw-r--r--devel/autoconf259/Makefile4
-rw-r--r--devel/autoconf26/Makefile4
-rw-r--r--devel/autoconf261/Makefile4
-rw-r--r--devel/autoconf262/Makefile4
-rw-r--r--devel/autoconf267/Makefile4
-rw-r--r--devel/autoconf268/Makefile4
-rw-r--r--devel/automake/Makefile4
-rw-r--r--devel/automake110/Makefile4
-rw-r--r--devel/automake14/Makefile4
-rw-r--r--devel/automake15/Makefile4
-rw-r--r--devel/automake16/Makefile4
-rw-r--r--devel/automake17/Makefile4
-rw-r--r--devel/automake18/Makefile4
-rw-r--r--devel/automake19/Makefile4
-rw-r--r--devel/avltree/Makefile4
-rw-r--r--devel/bcc/Makefile6
-rw-r--r--devel/binutils-m68k/Makefile8
-rw-r--r--devel/bison-devel/Makefile4
-rw-r--r--devel/bison/Makefile4
-rw-r--r--devel/bison175/Makefile4
-rw-r--r--devel/bison1875/Makefile4
-rw-r--r--devel/bison2/Makefile4
-rw-r--r--devel/bison20/Makefile4
-rw-r--r--devel/boehm-gc/Makefile6
-rw-r--r--devel/bonobo/Makefile4
-rw-r--r--devel/bug-buddy/Makefile6
-rw-r--r--devel/bugbuddy/Makefile6
-rw-r--r--devel/bugbuddy2/Makefile6
-rw-r--r--devel/c_c++_reference/Makefile6
-rw-r--r--devel/cccc/Makefile6
-rw-r--r--devel/cdecl/Makefile4
-rw-r--r--devel/cdk/Makefile4
-rw-r--r--devel/cervisia/Makefile4
-rw-r--r--devel/cflow/Makefile4
-rw-r--r--devel/clig/Makefile4
-rw-r--r--devel/codecrusader/Makefile7
-rw-r--r--devel/cons/Makefile8
-rw-r--r--devel/cook/Makefile4
-rw-r--r--devel/cproto/Makefile4
-rw-r--r--devel/crossgo32-djgpp2-pdcurses/Makefile6
-rw-r--r--devel/crossgo32-djgpp2/Makefile6
-rw-r--r--devel/crossgo32/Makefile8
-rw-r--r--devel/crossm68k/Makefile4
-rw-r--r--devel/cs/Makefile4
-rw-r--r--devel/cscope/Makefile4
-rw-r--r--devel/cssc/Makefile6
-rw-r--r--devel/ctags/Makefile4
-rw-r--r--devel/cutils/Makefile4
-rw-r--r--devel/cvsmapfs/Makefile4
-rw-r--r--devel/cvsweb/Makefile4
-rw-r--r--devel/cvsweb3/Makefile4
-rw-r--r--devel/cweb/Makefile6
-rw-r--r--devel/cxref/Makefile4
-rw-r--r--devel/ddd/Makefile4
-rw-r--r--devel/dmake/Makefile8
-rw-r--r--devel/doc++/Makefile4
-rw-r--r--devel/doxygen/Makefile7
-rw-r--r--devel/elftoaout/Makefile4
-rw-r--r--devel/f77flow/Makefile4
-rw-r--r--devel/fastcrc/Makefile4
-rw-r--r--devel/fhist/Makefile4
-rw-r--r--devel/flick/Makefile6
-rw-r--r--devel/flux/Makefile4
-rw-r--r--devel/fortran-utils/Makefile4
-rw-r--r--devel/fpp/Makefile6
-rw-r--r--devel/freelibiberty/Makefile6
-rw-r--r--devel/ftnchek/Makefile6
-rw-r--r--devel/gaa/Makefile6
-rw-r--r--devel/gcc-6811/Makefile5
-rw-r--r--devel/gcc-m68k/Makefile8
-rw-r--r--devel/gdb-m68k/Makefile6
-rw-r--r--devel/gettext-devel/Makefile4
-rw-r--r--devel/gettext-old/Makefile4
-rw-r--r--devel/gettext/Makefile4
-rw-r--r--devel/gide/Makefile6
-rw-r--r--devel/gindent/Makefile6
-rw-r--r--devel/glade/Makefile4
-rw-r--r--devel/glade2/Makefile4
-rw-r--r--devel/glib12/Makefile4
-rw-r--r--devel/glib13/Makefile4
-rw-r--r--devel/glib20/Makefile4
-rw-r--r--devel/gmake/Makefile6
-rw-r--r--devel/gmake381/Makefile6
-rw-r--r--devel/gnu-autoconf/Makefile4
-rw-r--r--devel/gnu-automake/Makefile4
-rw-r--r--devel/gnu-libtool/Makefile4
-rw-r--r--devel/gnustep-make/Makefile6
-rw-r--r--devel/gnustep/Makefile6
-rw-r--r--devel/gperf/Makefile4
-rw-r--r--devel/gtksheet/Makefile4
-rw-r--r--devel/id-utils/Makefile4
-rw-r--r--devel/idutils/Makefile4
-rw-r--r--devel/ilu/Makefile6
-rw-r--r--devel/imake-4/Makefile6
-rw-r--r--devel/imake/Makefile6
-rw-r--r--devel/jam/Makefile4
-rw-r--r--devel/kdbg/Makefile4
-rw-r--r--devel/kdelibdocs/Makefile6
-rw-r--r--devel/kdevelop/Makefile4
-rw-r--r--devel/kpp/Makefile4
-rw-r--r--devel/ktranslator/Makefile4
-rw-r--r--devel/lclint/Makefile4
-rw-r--r--devel/libPropList/Makefile6
-rw-r--r--devel/libU77/Makefile4
-rw-r--r--devel/libcache/Makefile4
-rw-r--r--devel/libcii/Makefile6
-rw-r--r--devel/libdlmalloc/Makefile5
-rw-r--r--devel/libffi-devel/Makefile4
-rw-r--r--devel/libffi/Makefile4
-rw-r--r--devel/libg++/Makefile6
-rw-r--r--devel/libgetline/Makefile6
-rw-r--r--devel/libgii/Makefile4
-rw-r--r--devel/libglade/Makefile4
-rw-r--r--devel/libglade2/Makefile4
-rw-r--r--devel/libgnugetopt/Makefile4
-rw-r--r--devel/libgtop/Makefile4
-rw-r--r--devel/libgtop2/Makefile4
-rw-r--r--devel/libmalloc/Makefile6
-rw-r--r--devel/libshhmsg/Makefile6
-rw-r--r--devel/libshhopt/Makefile6
-rw-r--r--devel/libsigc++/Makefile4
-rw-r--r--devel/libsigc++12/Makefile4
-rw-r--r--devel/libsigc++20/Makefile4
-rw-r--r--devel/libslang/Makefile6
-rw-r--r--devel/libtool/Makefile4
-rw-r--r--devel/libtool13/Makefile4
-rw-r--r--devel/libtool14/Makefile4
-rw-r--r--devel/libtool15/Makefile4
-rw-r--r--devel/libxalloc/Makefile6
-rw-r--r--devel/lincvs/Makefile6
-rw-r--r--devel/linux_devtools-6/Makefile5
-rw-r--r--devel/linux_devtools-7/Makefile5
-rw-r--r--devel/linux_devtools/Makefile5
-rw-r--r--devel/linux_kdump/Makefile4
-rw-r--r--devel/linuxthreads/Makefile16
-rw-r--r--devel/m4/Makefile6
-rw-r--r--devel/m6811-gcc/Makefile5
-rw-r--r--devel/makedepend/Makefile6
-rw-r--r--devel/mico/Makefile4
-rw-r--r--devel/mkcmd/Makefile4
-rw-r--r--devel/mkmf/Makefile6
-rw-r--r--devel/mm/Makefile4
-rw-r--r--devel/mprof/Makefile6
-rw-r--r--devel/msrc0/Makefile4
-rw-r--r--devel/nana/Makefile4
-rw-r--r--devel/nasm/Makefile4
-rw-r--r--devel/ncurses-devel/Makefile4
-rw-r--r--devel/ncurses/Makefile4
-rw-r--r--devel/newlib-m68k/Makefile8
-rw-r--r--devel/newt/Makefile6
-rw-r--r--devel/noweb/Makefile4
-rw-r--r--devel/omniORB/Makefile6
-rw-r--r--devel/p5-AppConfig/Makefile6
-rw-r--r--devel/p5-BSD-Resource/Makefile6
-rw-r--r--devel/p5-C-Scan/Makefile6
-rw-r--r--devel/p5-Config-IniFiles/Makefile7
-rw-r--r--devel/p5-ConfigReader/Makefile6
-rw-r--r--devel/p5-Curses/Makefile6
-rw-r--r--devel/p5-Data-Flow/Makefile6
-rw-r--r--devel/p5-Data-ShowTable/Makefile6
-rw-r--r--devel/p5-Date-Calc/Makefile6
-rw-r--r--devel/p5-Date-Manip/Makefile6
-rw-r--r--devel/p5-Devel-DProf/Makefile6
-rw-r--r--devel/p5-Devel-Peek/Makefile6
-rw-r--r--devel/p5-Devel-Symdump/Makefile6
-rw-r--r--devel/p5-Errno/Makefile6
-rw-r--r--devel/p5-File-BasicFlock/Makefile6
-rw-r--r--devel/p5-File-Lock/Makefile6
-rw-r--r--devel/p5-File-MMagic/Makefile4
-rw-r--r--devel/p5-File-Slurp/Makefile6
-rw-r--r--devel/p5-File-Sync/Makefile6
-rw-r--r--devel/p5-File-Tools/Makefile6
-rw-r--r--devel/p5-Filter/Makefile6
-rw-r--r--devel/p5-FreezeThaw/Makefile6
-rw-r--r--devel/p5-IO-Stty/Makefile7
-rw-r--r--devel/p5-IO-Tty/Makefile6
-rw-r--r--devel/p5-IO-stringy/Makefile6
-rw-r--r--devel/p5-Include/Makefile6
-rw-r--r--devel/p5-IniConf/Makefile7
-rw-r--r--devel/p5-Locale-PGetText/Makefile6
-rw-r--r--devel/p5-Locale-gettext/Makefile6
-rw-r--r--devel/p5-PV/Makefile7
-rw-r--r--devel/p5-Parse-RecDescent/Makefile6
-rw-r--r--devel/p5-Penguin-Easy/Makefile6
-rw-r--r--devel/p5-Penguin/Makefile6
-rw-r--r--devel/p5-Proc-Simple/Makefile6
-rw-r--r--devel/p5-ReadLine-Gnu/Makefile6
-rw-r--r--devel/p5-ReadLine-Perl/Makefile6
-rw-r--r--devel/p5-Religion/Makefile6
-rw-r--r--devel/p5-Resources/Makefile6
-rw-r--r--devel/p5-Sort-Versions/Makefile6
-rw-r--r--devel/p5-Storable/Makefile6
-rw-r--r--devel/p5-Term-ANSIColor/Makefile7
-rw-r--r--devel/p5-Term-Query/Makefile6
-rw-r--r--devel/p5-Term-ReadKey/Makefile6
-rw-r--r--devel/p5-Time-HiRes/Makefile6
-rw-r--r--devel/p5-Time/Makefile8
-rw-r--r--devel/p5-TimeDate/Makefile6
-rw-r--r--devel/p5-TraceFuncs/Makefile6
-rw-r--r--devel/patch/Makefile8
-rw-r--r--devel/pccts/Makefile6
-rw-r--r--devel/pcre/Makefile10
-rw-r--r--devel/pharmacy/Makefile4
-rw-r--r--devel/picprog/Makefile4
-rw-r--r--devel/pmake/Makefile4
-rw-r--r--devel/popt/Makefile4
-rw-r--r--devel/portcheckout/Makefile10
-rw-r--r--devel/portlint/Makefile3
-rw-r--r--devel/prcs/Makefile4
-rw-r--r--devel/pth-devel/Makefile4
-rw-r--r--devel/pth/Makefile4
-rw-r--r--devel/py-kjbuckets/Makefile9
-rw-r--r--devel/py-mxDateTime/Makefile6
-rw-r--r--devel/py-mxStack/Makefile6
-rw-r--r--devel/py-mxTools/Makefile6
-rw-r--r--devel/splint/Makefile4
-rw-r--r--devel/swig11/Makefile6
-rw-r--r--devel/swig13/Makefile6
-rw-r--r--devel/swig20/Makefile6
-rw-r--r--lang/gnustep-base/Makefile6
-rw-r--r--lang/gnustep-guile/Makefile6
-rw-r--r--lang/gnustep-objc/Makefile6
-rw-r--r--ports-mgmt/portcheckout/Makefile10
-rw-r--r--ports-mgmt/portlint/Makefile3
-rw-r--r--x11-toolkits/gnustep-gui/Makefile6
-rw-r--r--x11-toolkits/gnustep-xgps/Makefile6
242 files changed, 631 insertions, 633 deletions
diff --git a/devel/ElectricFence/Makefile b/devel/ElectricFence/Makefile
index c4e71fbbddbc..e59a286afe3e 100644
--- a/devel/ElectricFence/Makefile
+++ b/devel/ElectricFence/Makefile
@@ -1,17 +1,17 @@
# ex:ts=8
# New ports collection makefile for: Electric Fence
-# Version required: 0.0
# Date created: 13 November 1997
# Whom: jraynard
#
# $FreeBSD$
#
-DISTNAME= ElectricFence-2.0.5
-PKGNAME= electricfence-2.0.5
+PORTNAME= electricfence
+PORTVERSION= 2.0.5
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= devel/lang/c
+DISTNAME= ElectricFence-${PORTVERSION}
MAINTAINER= obrien@FreeBSD.org
diff --git a/devel/ORBacus/Makefile b/devel/ORBacus/Makefile
index 83a9de9741bb..542952ed343c 100644
--- a/devel/ORBacus/Makefile
+++ b/devel/ORBacus/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ORBacus
# Date created: 22 June 1998
# Whom: ejc@bazzle.com
-# Version required: 3.0
#
# $FreeBSD$
#
-DISTNAME= OB-3.2.1
-PKGNAME= ORBacus-3.2.1
+PORTNAME= ORBacus
+PORTVERSION= 3.2.1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.ooc.com/pub/OB/3.2/
+DISTNAME= OB-${PORTVERSION}
MAINTAINER= ejc@bazzle.com
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 4e6eb9d53470..5cc80bbf3292 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: orbit
-# Version required: 0.5.1
# Date Created: 16 Aug 1998
# Whom: Chia-liang Kao <clkao@CirX.ORG>
#
# $FreeBSD$
#
-DISTNAME= ORBit-0.5.1
+PORTNAME= ORBit
+PORTVERSION= 0.5.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/ORBit
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 4e6eb9d53470..5cc80bbf3292 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: orbit
-# Version required: 0.5.1
# Date Created: 16 Aug 1998
# Whom: Chia-liang Kao <clkao@CirX.ORG>
#
# $FreeBSD$
#
-DISTNAME= ORBit-0.5.1
+PORTNAME= ORBit
+PORTVERSION= 0.5.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/ORBit
diff --git a/devel/SWIG-devel/Makefile b/devel/SWIG-devel/Makefile
index 9b4867e2b13b..857346790b85 100644
--- a/devel/SWIG-devel/Makefile
+++ b/devel/SWIG-devel/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: SWIG
-# Version required: 1.1p4
# Date created: 19 April 1996
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= swig1.1p5
-PKGNAME= swig-1.1p5
+PORTNAME= swig
+PORTVERSION= 1.1p5
CATEGORIES= devel python tcl82
MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
ftp://ftp.rge.com/pub/languages/swig/ \
ftp://ftp.mcc.ac.uk/pub/mvc/swig/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= erich@FreeBSD.org
diff --git a/devel/SWIG/Makefile b/devel/SWIG/Makefile
index 9b4867e2b13b..857346790b85 100644
--- a/devel/SWIG/Makefile
+++ b/devel/SWIG/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: SWIG
-# Version required: 1.1p4
# Date created: 19 April 1996
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= swig1.1p5
-PKGNAME= swig-1.1p5
+PORTNAME= swig
+PORTVERSION= 1.1p5
CATEGORIES= devel python tcl82
MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
ftp://ftp.rge.com/pub/languages/swig/ \
ftp://ftp.mcc.ac.uk/pub/mvc/swig/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= erich@FreeBSD.org
diff --git a/devel/SpecTcl/Makefile b/devel/SpecTcl/Makefile
index 8ebc6ccad5ca..65be89921367 100644
--- a/devel/SpecTcl/Makefile
+++ b/devel/SpecTcl/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: SpecTcl1.1
-# Version required: 1.1
# Date created: Fri Oct 3 18:50:53 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= SpecTcl1.1
-PKGNAME= SpecTcl-1.1
+PORTNAME= SpecTcl
+PORTVERSION= 1.1
CATEGORIES= devel tk80
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/guitools/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= andreas@FreeBSD.org
diff --git a/devel/a2dev/Makefile b/devel/a2dev/Makefile
index 758673ba408d..b82af8226d63 100644
--- a/devel/a2dev/Makefile
+++ b/devel/a2dev/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: a2dev
-# Version required: 1.0
# Date created: 1 July 1998
# Whom: Archie L. Cobbs <archie@whistle.com>
#
# $FreeBSD$
#
-DISTNAME= a2dev-1.2
+PORTNAME= a2dev
+PORTVERSION= 1.2
CATEGORIES= devel
MASTER_SITES= ftp://ftp.whistle.com/pub/archie/a2dev/
EXTRACT_SUFX= .tgz
diff --git a/devel/amulet/Makefile b/devel/amulet/Makefile
index 0d91506ba8ed..c54d787fbaa8 100644
--- a/devel/amulet/Makefile
+++ b/devel/amulet/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: amulet
-# Version required: 3.0
# Date created: 26 July 1997
# Whom: Filip Bovyn (bovynf@awe.be)
#
# $FreeBSD$
-DISTNAME= amulet
-PKGNAME= amulet-3.0
+PORTNAME= amulet
+PORTVERSION= 3.0
CATEGORIES= devel x11
MASTER_SITES= http://www.cs.cmu.edu/afs/cs/project/amulet/amulet3/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= bovynf@awe.be
diff --git a/devel/asl/Makefile b/devel/asl/Makefile
index 260d48d5564b..a887b9c4d5ac 100644
--- a/devel/asl/Makefile
+++ b/devel/asl/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: asl
-# Version required: 1.41r8
# Date created: 18 June 1997
# Whom: Thomas Gellekum <tg@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= asl-1.41r8
+PORTNAME= asl
+PORTVERSION= 1.41r8
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://john.ccac.rwth-aachen.de/pub/as/source/c_version/
diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile
index 4bba679063b9..4ac22eaf3061 100644
--- a/devel/astyle/Makefile
+++ b/devel/astyle/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: astyle
-# Version required: 1.11.6
# Date created: 31 Jan 1999
# Whom: Don Croyle <croyle@gelemna.ft-wayne.in.us>
#
# $FreeBSD$
#
-DISTNAME= astyle_1.11.6_src
-PKGNAME= astyle-1.11.6
+PORTNAME= astyle
+PORTVERSION= 1.11.6
CATEGORIES= devel textproc
MASTER_SITES= ftp://astyle.sourceforge.net/pub/astyle/stable/src/\
http://www.infonex.com/~dacroyle/freebsd/
+DISTNAME= ${PORTNAME}_${PORTVERSION}_src
EXTRACT_SUFX= .tgz
MAINTAINER= croyle@gelemna.ft-wayne.in.us
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 82c266256375..cf7c01fc44db 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: autoconf
-# Version required: 2.13
# Date created: 7 October 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= autoconf-2.13
+PORTNAME= autoconf
+PORTVERSION= 2.13
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index 82c266256375..cf7c01fc44db 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: autoconf
-# Version required: 2.13
# Date created: 7 October 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= autoconf-2.13
+PORTNAME= autoconf
+PORTVERSION= 2.13
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
diff --git a/devel/autoconf253/Makefile b/devel/autoconf253/Makefile
index 82c266256375..cf7c01fc44db 100644
--- a/devel/autoconf253/Makefile
+++ b/devel/autoconf253/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: autoconf
-# Version required: 2.13
# Date created: 7 October 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= autoconf-2.13
+PORTNAME= autoconf
+PORTVERSION= 2.13
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
diff --git a/devel/autoconf254/Makefile b/devel/autoconf254/Makefile
index 82c266256375..cf7c01fc44db 100644
--- a/devel/autoconf254/Makefile
+++ b/devel/autoconf254/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: autoconf
-# Version required: 2.13
# Date created: 7 October 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= autoconf-2.13
+PORTNAME= autoconf
+PORTVERSION= 2.13
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
diff --git a/devel/autoconf257/Makefile b/devel/autoconf257/Makefile
index 82c266256375..cf7c01fc44db 100644
--- a/devel/autoconf257/Makefile
+++ b/devel/autoconf257/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: autoconf
-# Version required: 2.13
# Date created: 7 October 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= autoconf-2.13
+PORTNAME= autoconf
+PORTVERSION= 2.13
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
diff --git a/devel/autoconf259/Makefile b/devel/autoconf259/Makefile
index 82c266256375..cf7c01fc44db 100644
--- a/devel/autoconf259/Makefile
+++ b/devel/autoconf259/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: autoconf
-# Version required: 2.13
# Date created: 7 October 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= autoconf-2.13
+PORTNAME= autoconf
+PORTVERSION= 2.13
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
diff --git a/devel/autoconf26/Makefile b/devel/autoconf26/Makefile
index 82c266256375..cf7c01fc44db 100644
--- a/devel/autoconf26/Makefile
+++ b/devel/autoconf26/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: autoconf
-# Version required: 2.13
# Date created: 7 October 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= autoconf-2.13
+PORTNAME= autoconf
+PORTVERSION= 2.13
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile
index 82c266256375..cf7c01fc44db 100644
--- a/devel/autoconf261/Makefile
+++ b/devel/autoconf261/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: autoconf
-# Version required: 2.13
# Date created: 7 October 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= autoconf-2.13
+PORTNAME= autoconf
+PORTVERSION= 2.13
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile
index 82c266256375..cf7c01fc44db 100644
--- a/devel/autoconf262/Makefile
+++ b/devel/autoconf262/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: autoconf
-# Version required: 2.13
# Date created: 7 October 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= autoconf-2.13
+PORTNAME= autoconf
+PORTVERSION= 2.13
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
diff --git a/devel/autoconf267/Makefile b/devel/autoconf267/Makefile
index 82c266256375..cf7c01fc44db 100644
--- a/devel/autoconf267/Makefile
+++ b/devel/autoconf267/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: autoconf
-# Version required: 2.13
# Date created: 7 October 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= autoconf-2.13
+PORTNAME= autoconf
+PORTVERSION= 2.13
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile
index 82c266256375..cf7c01fc44db 100644
--- a/devel/autoconf268/Makefile
+++ b/devel/autoconf268/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: autoconf
-# Version required: 2.13
# Date created: 7 October 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= autoconf-2.13
+PORTNAME= autoconf
+PORTVERSION= 2.13
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 1867e0f55354..a31ea876ed3a 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: automake
-# Version required: 1.4
# Date created: 15 March 1997
# Whom: FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= automake-1.4
+PORTNAME= automake
+PORTVERSION= 1.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
index 1867e0f55354..a31ea876ed3a 100644
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: automake
-# Version required: 1.4
# Date created: 15 March 1997
# Whom: FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= automake-1.4
+PORTNAME= automake
+PORTVERSION= 1.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 1867e0f55354..a31ea876ed3a 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: automake
-# Version required: 1.4
# Date created: 15 March 1997
# Whom: FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= automake-1.4
+PORTNAME= automake
+PORTVERSION= 1.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile
index 1867e0f55354..a31ea876ed3a 100644
--- a/devel/automake15/Makefile
+++ b/devel/automake15/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: automake
-# Version required: 1.4
# Date created: 15 March 1997
# Whom: FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= automake-1.4
+PORTNAME= automake
+PORTVERSION= 1.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
diff --git a/devel/automake16/Makefile b/devel/automake16/Makefile
index 1867e0f55354..a31ea876ed3a 100644
--- a/devel/automake16/Makefile
+++ b/devel/automake16/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: automake
-# Version required: 1.4
# Date created: 15 March 1997
# Whom: FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= automake-1.4
+PORTNAME= automake
+PORTVERSION= 1.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
diff --git a/devel/automake17/Makefile b/devel/automake17/Makefile
index 1867e0f55354..a31ea876ed3a 100644
--- a/devel/automake17/Makefile
+++ b/devel/automake17/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: automake
-# Version required: 1.4
# Date created: 15 March 1997
# Whom: FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= automake-1.4
+PORTNAME= automake
+PORTVERSION= 1.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
diff --git a/devel/automake18/Makefile b/devel/automake18/Makefile
index 1867e0f55354..a31ea876ed3a 100644
--- a/devel/automake18/Makefile
+++ b/devel/automake18/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: automake
-# Version required: 1.4
# Date created: 15 March 1997
# Whom: FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= automake-1.4
+PORTNAME= automake
+PORTVERSION= 1.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile
index 1867e0f55354..a31ea876ed3a 100644
--- a/devel/automake19/Makefile
+++ b/devel/automake19/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: automake
-# Version required: 1.4
# Date created: 15 March 1997
# Whom: FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= automake-1.4
+PORTNAME= automake
+PORTVERSION= 1.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
diff --git a/devel/avltree/Makefile b/devel/avltree/Makefile
index 4a9671a843a1..0b477e8421d1 100644
--- a/devel/avltree/Makefile
+++ b/devel/avltree/Makefile
@@ -1,11 +1,11 @@
# New ports collection makefile for: avltree
-# Version required: 1.1
# Date created: 13 January 2000
# Whom: Bill Ross <bross@nas.nasa.gov>
#
# $FreeBSD$
-DISTNAME= avltree-1.1
+PORTNAME= avltree
+PORTVERSION= 1.1
CATEGORIES= devel
MASTER_SITES= ftp://odin.compchem.ucsf.edu/pub/amber/
diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile
index 1c3c3ff98941..077114f233fa 100644
--- a/devel/bcc/Makefile
+++ b/devel/bcc/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: bcc
-# Version required: "1995 Mar 12 10:29 UTC"
# Date created: 26 March 1995
# Whom: joerg
#
# $FreeBSD$
#
-DISTNAME= bcc
-PKGNAME= bcc-95.3.12
+PORTNAME= bcc
+PORTVERSION= 1995.03.12
CATEGORIES= devel lang
+DISTNAME= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
diff --git a/devel/binutils-m68k/Makefile b/devel/binutils-m68k/Makefile
index b8a41226b6f5..5d92ba313da1 100644
--- a/devel/binutils-m68k/Makefile
+++ b/devel/binutils-m68k/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for: m68kbinutils-2.9.1
-# Version required: 2.9.1
+# New ports collection makefile for: m68kbinutils
# Date created: 7 July 1998
# Whom: Jerry Hicks <jhicks@glenatl.glenayre.com>
#
# $FreeBSD$
#
-DISTNAME= binutils-2.9.1
-PKGNAME= m68kbinutils-2.9.1
+PORTNAME= binutils
+PORTVERSION= 2.9.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= binutils
+PKGNAMEPREFIX= m68k
MAINTAINER= Jerry.Hicks@Glenayre.com
diff --git a/devel/bison-devel/Makefile b/devel/bison-devel/Makefile
index 3f4abde39e5e..ac70c15d1481 100644
--- a/devel/bison-devel/Makefile
+++ b/devel/bison-devel/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: bison
-# Version required: 0.0
# Date created: 27 Mar 1999
# Whom: Jerry Hicks
#
# $FreeBSD$
#
-DISTNAME= bison-1.28
+PORTNAME= bison
+PORTVERSION= 1.28
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= bison
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 3f4abde39e5e..ac70c15d1481 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: bison
-# Version required: 0.0
# Date created: 27 Mar 1999
# Whom: Jerry Hicks
#
# $FreeBSD$
#
-DISTNAME= bison-1.28
+PORTNAME= bison
+PORTVERSION= 1.28
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= bison
diff --git a/devel/bison175/Makefile b/devel/bison175/Makefile
index 3f4abde39e5e..ac70c15d1481 100644
--- a/devel/bison175/Makefile
+++ b/devel/bison175/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: bison
-# Version required: 0.0
# Date created: 27 Mar 1999
# Whom: Jerry Hicks
#
# $FreeBSD$
#
-DISTNAME= bison-1.28
+PORTNAME= bison
+PORTVERSION= 1.28
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= bison
diff --git a/devel/bison1875/Makefile b/devel/bison1875/Makefile
index 3f4abde39e5e..ac70c15d1481 100644
--- a/devel/bison1875/Makefile
+++ b/devel/bison1875/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: bison
-# Version required: 0.0
# Date created: 27 Mar 1999
# Whom: Jerry Hicks
#
# $FreeBSD$
#
-DISTNAME= bison-1.28
+PORTNAME= bison
+PORTVERSION= 1.28
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= bison
diff --git a/devel/bison2/Makefile b/devel/bison2/Makefile
index 3f4abde39e5e..ac70c15d1481 100644
--- a/devel/bison2/Makefile
+++ b/devel/bison2/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: bison
-# Version required: 0.0
# Date created: 27 Mar 1999
# Whom: Jerry Hicks
#
# $FreeBSD$
#
-DISTNAME= bison-1.28
+PORTNAME= bison
+PORTVERSION= 1.28
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= bison
diff --git a/devel/bison20/Makefile b/devel/bison20/Makefile
index 3f4abde39e5e..ac70c15d1481 100644
--- a/devel/bison20/Makefile
+++ b/devel/bison20/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: bison
-# Version required: 0.0
# Date created: 27 Mar 1999
# Whom: Jerry Hicks
#
# $FreeBSD$
#
-DISTNAME= bison-1.28
+PORTNAME= bison
+PORTVERSION= 1.28
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= bison
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 6bc70af25568..28362ca9857e 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: boehm-gc
-# Version required: 5.0alpha3
# Date created: 15 November 1996
# Whom: Mike McGaughey <mmcg@cs.monash.edu.au>
#
# $FreeBSD$
#
-DISTNAME= gc5.0alpha4
-PKGNAME= boehm-gc-5.0a4
+PORTNAME= boehm-gc
+PORTVERSION= 5.0a4
CATEGORIES= devel
MASTER_SITES= http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/ \
http://reality.sgi.com/boehm_mti/gc_source/
+DISTNAME= gc5.0alpha4
MAINTAINER= mmcg@cs.monash.edu.au
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 80a0f8db7282..f197fbd9b771 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bonobo
-# Version required: 0.9
# Date created: 8th October 1999
# Whom: Ade Lovett <ade@lovett.com>
#
# $FreeBSD$
#
-DISTNAME= bonobo-0.9
+PORTNAME= bonobo
+PORTVERSION= 0.9
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/bonobo
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 54a8c3f4d3d3..3cca099f0c6b 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: bugbuddy
-# Version required: 0.7
# Date created: 23rd February 2000
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= bug-buddy-0.7
-PKGNAME= bugbuddy-0.7
+PORTNAME= bugbuddy
+PORTVERSION= 0.7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/bug-buddy
+DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index 54a8c3f4d3d3..3cca099f0c6b 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: bugbuddy
-# Version required: 0.7
# Date created: 23rd February 2000
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= bug-buddy-0.7
-PKGNAME= bugbuddy-0.7
+PORTNAME= bugbuddy
+PORTVERSION= 0.7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/bug-buddy
+DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index 54a8c3f4d3d3..3cca099f0c6b 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: bugbuddy
-# Version required: 0.7
# Date created: 23rd February 2000
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= bug-buddy-0.7
-PKGNAME= bugbuddy-0.7
+PORTNAME= bugbuddy
+PORTVERSION= 0.7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/bug-buddy
+DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/devel/c_c++_reference/Makefile b/devel/c_c++_reference/Makefile
index fd1f82dca4e5..66d4f12413c1 100644
--- a/devel/c_c++_reference/Makefile
+++ b/devel/c_c++_reference/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: c_c++_reference.tar.gz
-# Version required: 1.08
# Date created: 8 March 2000
# Whom: imura@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= c_c++_reference
-PKGNAME= c_c++_reference${QTTYPE}-1.08
+PORTNAME= c_c++_reference${QTTYPE}
+PORTVERSION= 1.08
CATEGORIES= devel
MASTER_SITES= ftp://129.187.206.68/pub/unix/ide/KDevelop/documentation/ \
ftp://gd.tuwien.ac.at/hci/KDevelop/documentation/ \
ftp://fara.cs.uni-potsdam.de/pub/kdevelop/documentation/
+DISTNAME= c_c++_reference
MAINTAINER= imura@FreeBSD.org
diff --git a/devel/cccc/Makefile b/devel/cccc/Makefile
index 08d695a7e40e..92713d6266cb 100644
--- a/devel/cccc/Makefile
+++ b/devel/cccc/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: cccc
-# Version required: 2.1.1
# Date created: 12 September 1997
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= cccc-2.1.1.src
-PKGNAME= cccc-2.1.1
+PORTNAME= cccc
+PORTVERSION= 2.1.1
CATEGORIES= devel textproc www
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= devel/lang/c++
+DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= obrien@FreeBSD.org
diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index 73126dcf1bb8..2633c0954819 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: cdecl
-# Version required: 0.0
# Date created: Sat Sep 04, 1999
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= cdecl-2.5
+PORTNAME= cdecl
+PORTVERSION= 2.5
CATEGORIES= devel
MASTER_SITES= ftp://ftp.netsw.org/netsw/SoftEng/Lang/C/Tools/cdecl/ \
ftp://ftp.cc.gatech.edu/ac121/linux/devel/lang/c/ \
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 161677dbd9b4..ab9815538ab2 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cdk
-# Version required: 4.9.1
# Date created: 6 May 1999
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= cdk-4.9.1
+PORTNAME= cdk
+PORTVERSION= 4.9.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= libs/ui
diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile
index c96cbc56a44c..2daa4688e17d 100644
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia/Makefile
@@ -1,11 +1,11 @@
# New ports collection Makefile for: cervisia
-# Version required: 0.5.0
# Date created: 17 Nov 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
-DISTNAME= cervisia-0.5.0
+PORTNAME= cervisia
+PORTVERSION= 0.5.0
CATEGORIES= devel
MASTER_SITES= http://download.sourceforge.net/cervisia/
diff --git a/devel/cflow/Makefile b/devel/cflow/Makefile
index 2de29caffbe0..6e103d08cd18 100644
--- a/devel/cflow/Makefile
+++ b/devel/cflow/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cflow
-# Version required: 2.0
# Date created: 28 Sept 1995
# Whom: dchapes@zeus.leitch.com
#
# $FreeBSD$
#
-DISTNAME= cflow-2.0
+PORTNAME= cflow
+PORTVERSION= 2.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= devel/lang/c
diff --git a/devel/clig/Makefile b/devel/clig/Makefile
index db79045e1a7e..3ce8073ccec7 100644
--- a/devel/clig/Makefile
+++ b/devel/clig/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: clig
-# Version required: 1.0.2
# Date created: 27 July 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= clig-1.1.3
+PORTNAME= clig
+PORTVERSION= 1.1.3
CATEGORIES= devel tcl82
MASTER_SITES= http://wsd.iitb.fhg.de/~kir/clighome/
diff --git a/devel/codecrusader/Makefile b/devel/codecrusader/Makefile
index 1457ccfca67b..194eca6742eb 100644
--- a/devel/codecrusader/Makefile
+++ b/devel/codecrusader/Makefile
@@ -1,17 +1,16 @@
# New ports collection makefile for: Code Crusader
-# Version required: 2.1.3
# Date created: 30 July 1999
# Whom: Davec <davec@unforgettable.com>
#
# $FreeBSD$
#
-DISTNAME= code_crusader_source-2.1.4
-PKGNAME= code_crusader-2.1.4
+PORTNAME= code_crusader
+PORTVERSION= 2.1.4
CATEGORIES= devel
MASTER_SITES= ftp://ftp.its.caltech.edu/pub/jafl/programs/jcc/source/ \
ftp://ftp.its.caltech.edu/pub/jafl/jx/source-1.5.3/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+DISTFILES= ${PORTNAME}_source-${PORTVERSION}${EXTRACT_SUFX} \
JTree_source-1.1.7.tar.gz \
JX_source-1.5.3.tar.gz \
JToolBar_source-0.5.4.tar.gz
diff --git a/devel/cons/Makefile b/devel/cons/Makefile
index 404706a78ca7..78d5505569a9 100644
--- a/devel/cons/Makefile
+++ b/devel/cons/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cons
-# Version required: 1.6b1
# Date created: 11 December 1998
# Whom: rv@fore.com
#
# $FreeBSD$
#
-DISTNAME= cons-${CONSVER}
+PORTNAME= cons
+PORTVERSION= 1.7
CATEGORIES= devel
MASTER_SITES= http://www.dsmit.com/cons/ \
http://www.telerama.com/~bgarcia/cons/
@@ -16,11 +16,9 @@ MAINTAINER= rv@fore.com
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MD5.pm:${PORTSDIR}/security/p5-MD5
-CONSVER= 1.7
-
USE_PERL5= yes
NO_BUILD= yes
-PLIST_SUB= CONS_VER=${CONSVER}
+PLIST_SUB= CONS_VER=${PORTVERSION}
MAN1= cons.1
DOCS= CHANGES COPYRIGHT INSTALL MANIFEST README RELEASE cons.html
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index 869357e5a814..1ee158ed86ff 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -1,12 +1,12 @@
# New ports collection Makefile for: cook
-# Version required: 2.11
# Date created: 31 January 2000
# Whom: jasone
#
# $FreeBSD$
#
-DISTNAME= cook-2.11
+PORTNAME= cook
+PORTVERSION= 2.11
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www.canb.auug.org.au/~millerp/cook/
diff --git a/devel/cproto/Makefile b/devel/cproto/Makefile
index e87eb39985dc..1cce2430f214 100644
--- a/devel/cproto/Makefile
+++ b/devel/cproto/Makefile
@@ -1,12 +1,12 @@
# ports collection makefile for: cproto
-# Version required: 4.6b
# Date created: 2000 Feb. 13
# Whom: Abel Chow <abel_chow@yahoo.com>
#
# $FreeBSD$
#
-DISTNAME= cproto-4.6
+PORTNAME= cproto
+PORTVERSION= 4.6
CATEGORIES= devel
MASTER_SITES= http://www.vex.net/~cthuang/cproto/
diff --git a/devel/crossgo32-djgpp2-pdcurses/Makefile b/devel/crossgo32-djgpp2-pdcurses/Makefile
index a05f11782296..99cce1a1b903 100644
--- a/devel/crossgo32-djgpp2-pdcurses/Makefile
+++ b/devel/crossgo32-djgpp2-pdcurses/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: pdcurses
-# Version required: 2.2
# Date created: Sun Jun 22 16:57:39 EST 1997
# Whom: Joel Sutton <sutton@aardvark.apana.org.au)
#
# $FreeBSD$
#
-DISTNAME= pdc22
-PKGNAME= crossgo32-djgpp2-pdcurses-2.2
+PORTNAME= crossgo32-djgpp2-pdcurses
+PORTVERSION= 2.2
CATEGORIES= devel
MASTER_SITES= ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2tk/ \
ftp://ftp.cdrom.com/pub/simtelnet/gnu/djgpp/v2tk/
+DISTNAME= pdc22
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/crossgo32-djgpp2/Makefile b/devel/crossgo32-djgpp2/Makefile
index 0640faa1c34f..c2227de337e6 100644
--- a/devel/crossgo32-djgpp2/Makefile
+++ b/devel/crossgo32-djgpp2/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: djgpp2 cross compiler kit
-# Version required: 2.01
# Date created: Sun Jun 22 16:57:39 EST 1997
# Whom: Joel Sutton <sutton@aardvark.apana.org.au>
#
# $FreeBSD$
#
-DISTNAME= djcrx201
-PKGNAME= crossgo32-djgpp2-2.01
+PORTNAME= crossgo32-djgpp2
+PORTVERSION= 2.01
CATEGORIES= devel
MASTER_SITES= ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2/old/ \
ftp://ftp.cdrom.com/pub/simtelnet/gnu/djgpp/v2/old/
+DISTNAME= djcrx201
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/crossgo32/Makefile b/devel/crossgo32/Makefile
index 634c3cf608e8..cdcaba5f1fe5 100644
--- a/devel/crossgo32/Makefile
+++ b/devel/crossgo32/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: crossgo32
-# Version required: 1.3
# Date created: 6 Mar 97
# Whom: Pedro Giffuni <giffunip@asme.org>
# Date updated: Sun Jun 22 16:11:40 EST 1997
@@ -8,12 +7,13 @@
# $FreeBSD$
#
-DISTNAME= crosstree-1.3
-PKGNAME= crossgo32-1.3
+PORTNAME= crossgo32
+PORTVERSION= 1.3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://sourceware.cygnus.com/pub/crossgcc/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} dosrel-1.0${EXTRACT_SUFX}
+DISTFILES= crosstree-${PORTVERSION}${EXTRACT_SUFX} \
+ dosrel-1.0${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/crossm68k/Makefile b/devel/crossm68k/Makefile
index 0aed50f29170..f1935bd10fd4 100644
--- a/devel/crossm68k/Makefile
+++ b/devel/crossm68k/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: crossm68k
-# Version required: 2.0
# Date created: 7 July 1997
# Whom: Jerry Hicks <jhicks@glenatl.glenayre.com>
#
# $FreeBSD$
#
-DISTNAME= crossm68k-2.0
+PORTNAME= crossm68k
+PORTVERSION= 2.0
CATEGORIES= devel
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/devel/cs/Makefile b/devel/cs/Makefile
index a7fabcc67645..a4c6604e0683 100644
--- a/devel/cs/Makefile
+++ b/devel/cs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cs
-# Version required: 0.5
# Date created: 22 May 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= cs-0.5
+PORTNAME= cs
+PORTVERSION= 0.5
CATEGORIES= devel
MASTER_SITES= ftp://cantor.informatik.rwth-aachen.de/pub/unix/
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index 0b0314957535..bb5bdc47e557 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -1,12 +1,12 @@
# ports collection makefile for: cscope
-# Version required: 13.7
# Date created: 1998-11-21
# Whom: Castor Fu
#
# $FreeBSD$
#
-DISTNAME= cscope-13.7
+PORTNAME= cscope
+PORTVERSION= 13.7
CATEGORIES= devel
MAINTAINER= castor@alumni.caltech.edu
diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile
index d0e3f84a9413..4987e6ecea73 100644
--- a/devel/cssc/Makefile
+++ b/devel/cssc/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: CSSC
-# Version required: 0.10beta.pl1
# Date created: 31 Mar 1999
# Whom: Oliver Fromme
#
# $FreeBSD$
#
-DISTNAME= CSSC-0.10beta.pl1
-PKGNAME= cssc-0.10b.1
+PORTNAME= cssc
+PORTVERSION= 0.10b.1
CATEGORIES= devel
MASTER_SITES= ftp://alpha.gnu.org/gnu/CSSC/
+DISTNAME= CSSC-0.10beta.pl1
MAINTAINER= olli@fromme.com
diff --git a/devel/ctags/Makefile b/devel/ctags/Makefile
index f7684a584458..9b29b82855c9 100644
--- a/devel/ctags/Makefile
+++ b/devel/ctags/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: exctags
-# Version required: 3.4
# Date created: 4 June 1996
# Whom: jkoshy
#
# $FreeBSD$
#
-DISTNAME= ctags-3.4
+PORTNAME= ctags
+PORTVERSION= 3.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE}\
http://fly.hiwaay.net/~darren/archives/ \
diff --git a/devel/cutils/Makefile b/devel/cutils/Makefile
index 073ef3cb0a46..ffea0ad096bf 100644
--- a/devel/cutils/Makefile
+++ b/devel/cutils/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cutils
-# Version required: 1.4
# Date created: 26 November 1996
# Whom: Sandro Sigala
#
# $FreeBSD$
#
-DISTNAME= cutils-1.4
+PORTNAME= cutils
+PORTVERSION= 1.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/devel/cvsmapfs/Makefile b/devel/cvsmapfs/Makefile
index 9731900d9399..0da393833d98 100644
--- a/devel/cvsmapfs/Makefile
+++ b/devel/cvsmapfs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cvsmapfs
-# Version required: 1.3
# Date created: 17 January 2000
# Whom: rip@pinetec.co.za
#
# $FreeBSD$
#
-DISTNAME= cvsmapfs-1.3
+PORTNAME= cvsmapfs
+PORTVERSION= 1.3
CATEGORIES= devel
MASTER_SITES= ftp://ftp.pn.com/pub/bb/cvsmapfs/
diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index b61866d0237b..194a77c77248 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cvsweb
-# Version required: 1.80
# Date created: 27 Jun 1999
# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= cvsweb-1.80
+PORTNAME= cvsweb
+PORTVERSION= 1.80
CATEGORIES= devel www
MASTER_SITES= http://stud.fh-heilbronn.de/~zeller/download/
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index b61866d0237b..194a77c77248 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cvsweb
-# Version required: 1.80
# Date created: 27 Jun 1999
# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= cvsweb-1.80
+PORTNAME= cvsweb
+PORTVERSION= 1.80
CATEGORIES= devel www
MASTER_SITES= http://stud.fh-heilbronn.de/~zeller/download/
diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
index 14431d69fb95..ee8f2aa25799 100644
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: cweb
-# Version required: 3.41
# Date created: 10 Feb 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= cweb
-PKGNAME= cweb-3.41
+PORTNAME= cweb
+PORTVERSION= 3.41
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= web/c_cpp/cweb
+DISTNAME= ${PORTNAME}
MAINTAINER= tg@FreeBSD.org
diff --git a/devel/cxref/Makefile b/devel/cxref/Makefile
index d0d8400b0234..a8df5ec51584 100644
--- a/devel/cxref/Makefile
+++ b/devel/cxref/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cxref
-# Version required: 1.5b
# Date created: 23 October 1996
# Whom: Thomas Gellekum <tg@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= cxref-1.5b
+PORTNAME= cxref
+PORTVERSION= 1.5b
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://ftp.demon.co.uk/pub/unix/tools/
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index ea37ffdea97a..3ac3af71a884 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: ddd
-# Version required: 0.0
# Date created: Tue Jan 28, 1997
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= ddd-3.2.1
+PORTNAME= ddd
+PORTVERSION= 3.2.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ddd
diff --git a/devel/dmake/Makefile b/devel/dmake/Makefile
index 758ce0a932ec..e3264fc524fc 100644
--- a/devel/dmake/Makefile
+++ b/devel/dmake/Makefile
@@ -1,20 +1,20 @@
# New ports collection makefile for: dmake
-# Version required: 4.1
# Date created: 31 July 1995
# Whom: nils@guru.ims.uni-stuttgart.de
#
# $FreeBSD$
#
-DISTNAME= dmake-v4.1-src-export.all-unknown-all
-PKGNAME= dmake-4.1
+PORTNAME= dmake
+PORTVERSION= 4.1
CATEGORIES= devel
MASTER_SITES= ftp://plg.uwaterloo.ca/pub/dmake/ \
http://dmake.wticorp.com/SourceDistribution/
+DISTNAME= ${PORTNAME}-v${PORTVERSION}-src-export.all-unknown-all
MAINTAINER= ports@FreeBSD.org
-WRKSRC= ${WRKDIR}/dmake
+WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GMAKE= yes
MAKE_ENV= CC=${CC}
MAKEFILE= makefile
diff --git a/devel/doc++/Makefile b/devel/doc++/Makefile
index 21dee7759d81..6a0cf27f5ec1 100644
--- a/devel/doc++/Makefile
+++ b/devel/doc++/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: DOC++
# Date created: 20 Dec 1998
# Whom: Ruslan@Shevchenko.Kiev.UA
-# Version required: 3.3.15
#
# $FreeBSD$
#
-DISTNAME= doc++-3.3.15
+PORTNAME= doc++
+PORTVERSION= 3.3.15
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www.imaginator.com/doc++/
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 96eec3b58ff2..eca88b3bdf18 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,20 +1,19 @@
# New ports collection makefile for: doxygen
-# Version required: 1.1.0
# Date created: 20 March 1998
# Whom: Joep Grooten <joep@di.nl>
#
# $FreeBSD$
#
-DISTNAME= doxygen-${VERSION}.src
-PKGNAME= doxygen-${VERSION}
+PORTNAME= doxygen
+PORTVERSION= 1.1.0
CATEGORIES= devel
MASTER_SITES= http://www.stack.nl/~dimitri/doxygen/dl/
+DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= joep@di.nl
WRKSRC= ${WRKDIR}/${PKGNAME}
-VERSION= 1.1.0
USE_QT= yes
USE_PERL5= yes
MAKE_ENV+= QTDIR="${X11BASE}" PCFLAGS="${CFLAGS}" PCXXFLAGS="${CXXFLAGS}"
diff --git a/devel/elftoaout/Makefile b/devel/elftoaout/Makefile
index 7c6602e94f15..61f740ed8b99 100644
--- a/devel/elftoaout/Makefile
+++ b/devel/elftoaout/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: elftoaout
-# Version required: 2.0
# Date created: 3 Jul 1998
# Whom: kchowksey@hss.hns.com
#
# $FreeBSD$
#
-DISTNAME= elftoaout-2.0
+PORTNAME= elftoaout
+PORTVERSION= 2.0
CATEGORIES= devel
MASTER_SITES= ftp://sunsite.mff.cuni.cz/OS/Linux/Sparc/local/ultra/
EXTRACT_SUFX= .tgz
diff --git a/devel/f77flow/Makefile b/devel/f77flow/Makefile
index 6b5167e38aa2..a5104355b5f7 100644
--- a/devel/f77flow/Makefile
+++ b/devel/f77flow/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: f77flow
-# Version required: 0.12
# Date created: 25 June 1997
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= f77flow-0.12
+PORTNAME= f77flow
+PORTVERSION= 0.12
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= devel/lang/fortran
diff --git a/devel/fastcrc/Makefile b/devel/fastcrc/Makefile
index 707819930052..96aff86e998b 100644
--- a/devel/fastcrc/Makefile
+++ b/devel/fastcrc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: fastcrc
-# Version required: 1.0
# Date created: 27 April 1999
# Whom: G. Adam Stanislav <adam@whizkidtech.net>
#
# $FreeBSD$
#
-DISTNAME= fastcrc-1.0
+PORTNAME= fastcrc
+PORTVERSION= 1.0
CATEGORIES= devel
MASTER_SITES= http://www.whizkidtech.net/fports/
diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile
index c1041bf3b782..d5697c1cd69e 100644
--- a/devel/fhist/Makefile
+++ b/devel/fhist/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: fhist
-# Version required: 1.6
# Date created: Jan 05 2000
# Whom: <jkoshy@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= fhist-1.6
+PORTNAME= fhist
+PORTVERSION= 1.6
CATEGORIES= devel
MASTER_SITES= http://www.canb.auug.org.au/~millerp/ \
ftp://ftp.agso.gov.au/pub/Aegis/ \
diff --git a/devel/flick/Makefile b/devel/flick/Makefile
index a70995439a0a..c04bd8cf7dbb 100644
--- a/devel/flick/Makefile
+++ b/devel/flick/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: flick
-# Version required: 2.1
# Date created: 21 Mar 1998
# Whom: giffunip@asme.org
#
# $FreeBSD$
#
-DISTNAME= flick-2.1-src
-PKGNAME= flick-2.1
+PORTNAME= flick
+PORTVERSION= 2.1
CATEGORIES= devel
MASTER_SITES= ftp://flux.cs.utah.edu/flux/flick/2.1/
+DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/flux/Makefile b/devel/flux/Makefile
index 96f7ff9987ee..ae35ec176099 100644
--- a/devel/flux/Makefile
+++ b/devel/flux/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flux
-# Version required: 0.3.0
# Date created: 18 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= flux-0.3.0
+PORTNAME= flux
+PORTVERSION= 0.3.0
CATEGORIES= devel
MASTER_SITES= ftp://ftp.styx.net/projects/flux/
diff --git a/devel/fortran-utils/Makefile b/devel/fortran-utils/Makefile
index 5118876f4125..ad66d6db26d8 100644
--- a/devel/fortran-utils/Makefile
+++ b/devel/fortran-utils/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: fortran-utils
-# Version required: 1.1
# Date created: 19 Dec 1999
# Whom: kris@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= fortran-utils-1.1
+PORTNAME= fortran-utils
+PORTVERSION= 1.1
CATEGORIES= devel
MASTER_SITES= http://people.FreeBSD.org/~kris/distfiles/
diff --git a/devel/fpp/Makefile b/devel/fpp/Makefile
index 3061d9d053c4..09dada3c2a38 100644
--- a/devel/fpp/Makefile
+++ b/devel/fpp/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Sun fortran preprocessor fpp
-# Version required: 1.1
# Date created: 30 January 1996
# Whom: vazquez@iqm.unicamp.br
#
# $FreeBSD$
#
-DISTNAME= fdfpp
-PKGNAME= fpp-1.1
+PORTNAME= fpp
+PORTVERSION= 1.1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.netlib.org/fortran/
+DISTNAME= fdfpp
EXTRACT_SUFX= .tgz
MAINTAINER= vazquez@iqm.unicamp.br
diff --git a/devel/freelibiberty/Makefile b/devel/freelibiberty/Makefile
index 9f19bcfab2b9..bc57fb19f9ed 100644
--- a/devel/freelibiberty/Makefile
+++ b/devel/freelibiberty/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: free-libiberty
-# Version required: 0.2
# Date created: 30 October 1999
# Whom: James Howard <howardjp@wam.umd.edu>
#
# $FreeBSD$
#
-DISTNAME= libiberty-0.2
-PKGNAME= freelibiberty-0.2
+PORTNAME= freelibiberty
+PORTVERSION= 0.2
CATEGORIES= devel
MASTER_SITES= ftp://ftp.wam.umd.edu/pub/howardjp/software/libiberty/ \
http://www.wam.umd.edu/~howardjp/software/libiberty/ \
ftp://dragon.ham.muohio.edu/pub/howardjp/software/libiberty/
+DISTNAME= libiberty-${PORTVERSION}
MAINTAINER= howardjp@wam.umd.edu
diff --git a/devel/ftnchek/Makefile b/devel/ftnchek/Makefile
index b15ec70b1a45..502f19fbb0eb 100644
--- a/devel/ftnchek/Makefile
+++ b/devel/ftnchek/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: ftnchek
-# Version required: 2.11.0
# Date created: 4 May 1998
# Whom: kargl@apl.washington.edu
#
# $FreeBSD$
-DISTNAME= ftnchek
-PKGNAME= ftnchek-2.11.2
+PORTNAME= ftnchek
+PORTVERSION= 2.11.2
CATEGORIES= devel
MASTER_SITES= ftp://ftp.netlib.org/fortran/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= kargl@apl.washington.edu
diff --git a/devel/gaa/Makefile b/devel/gaa/Makefile
index 10140affa2db..9b812442918f 100644
--- a/devel/gaa/Makefile
+++ b/devel/gaa/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gaa
-# Version required: 1.5
# Date created: 2 February 1999
# Whom: Dima Sivachenko <dima@chg.ru>
#
# $FreeBSD$
#
-DISTNAME= gaa-1.5
+PORTNAME= gaa
+PORTVERSION= 1.5
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
EXTRACT_SUFX= .tgz
@@ -16,6 +16,6 @@ MAINTAINER= dima@chg.ru
GNU_CONFIGURE= yes
post-install:
- @ ${CAT} ${PKGDIR}/MESSAGE
+ @ ${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/devel/gcc-6811/Makefile b/devel/gcc-6811/Makefile
index 34e994cdc571..c444192426b7 100644
--- a/devel/gcc-6811/Makefile
+++ b/devel/gcc-6811/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: gcc11
-# Version required: 2.6.3
# Date created: Thu Sep 14 11:10:01 CDT 1995
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gcc11
-PKGNAME= gcc11-2.6.3
+PORTNAME= gcc11
+PORTVERSION= 2.6.3
CATEGORIES= devel
MASTER_SITES= ftp://nyquist.ee.ualberta.ca/pub/motorola/68hc11/gcc/
DISTFILES= gcc-6811-fsf.tar.gz gcc-2.6.3.tar.gz
diff --git a/devel/gcc-m68k/Makefile b/devel/gcc-m68k/Makefile
index 75fc17de8cb0..238839592def 100644
--- a/devel/gcc-m68k/Makefile
+++ b/devel/gcc-m68k/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for: m68kgcc-2.8.1
-# Version required: 2.8.1
+# New ports collection makefile for: m68kgcc
# Date created: 7 July 1998
# Whom: Jerry Hicks <jhicks@glenatl.glenayre.com>
#
# $FreeBSD$
#
-DISTNAME= gcc-2.8.1
-PKGNAME= m68kgcc-2.8.1
+PORTNAME= gcc
+PORTVERSION= 2.8.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gcc
+PKGNAMEPREFIX= m68k
MAINTAINER= Jerry.Hicks@Glenayre.com
diff --git a/devel/gdb-m68k/Makefile b/devel/gdb-m68k/Makefile
index cb8df02bfbb7..4117a62f4505 100644
--- a/devel/gdb-m68k/Makefile
+++ b/devel/gdb-m68k/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: m68kgdb
-# Version required: 4.18
# Date created: 7 Jul 98
# Whom: Jerry Hicks <Jerry.Hicks@Glenayre.com>
#
# $FreeBSD$
#
-DISTNAME= gdb-4.18
-PKGNAME= m68kgdb-4.18
+PORTNAME= gdb
+PORTVERSION= 4.18
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gdb
+PKGNAMEPREFIX= m68k
MAINTAINER= Jerry.Hicks@Glenayre.com
diff --git a/devel/gettext-devel/Makefile b/devel/gettext-devel/Makefile
index deeee97f1147..5fddf32abdea 100644
--- a/devel/gettext-devel/Makefile
+++ b/devel/gettext-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gettext
-# Version required: 0.10.35
# Date created: 16 March 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gettext-0.10.35
+PORTNAME= gettext
+PORTVERSION= 0.10.35
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gettext
diff --git a/devel/gettext-old/Makefile b/devel/gettext-old/Makefile
index deeee97f1147..5fddf32abdea 100644
--- a/devel/gettext-old/Makefile
+++ b/devel/gettext-old/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gettext
-# Version required: 0.10.35
# Date created: 16 March 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gettext-0.10.35
+PORTNAME= gettext
+PORTVERSION= 0.10.35
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gettext
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index deeee97f1147..5fddf32abdea 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gettext
-# Version required: 0.10.35
# Date created: 16 March 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gettext-0.10.35
+PORTNAME= gettext
+PORTVERSION= 0.10.35
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gettext
diff --git a/devel/gide/Makefile b/devel/gide/Makefile
index 66c2e3b2b922..35a915103d7e 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: gIDE
-# Version required: 0.1.7
# Date created: 29 Jul 1998
# Whom: rom
#
# $FreeBSD$
#
-DISTNAME= gIDE-0.1.7
-PKGNAME= gide-0.1.7
+PORTNAME= gide
+PORTVERSION= 0.1.7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://gide.pn.org/
MASTER_SITE_SUBDIR= unstable/sources/gIDE
+DISTNAME= gIDE-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 6644fa52d186..758472e8ff56 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: indent
-# Version required: 2.2.2
# Date created: 28 August 1997
# Whom: Kapil Chowksey <kchowksey@hss.hns.com>
#
# $FreeBSD$
#
-DISTNAME= indent-2.2.2
-PKGNAME= gindent-2.2.2
+PORTNAME= gindent
+PORTVERSION= 2.2.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= indent
+DISTNAME= indent-${PORTVERSION}
MAINTAINER= kchowksey@hss.hns.com
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 4d9e1e0762db..baab79372d33 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: glade
-# Version required: 0.5.7
# Date created: 29 June 1998
# Whom: Dom Mitchell <dom@myrddin.demon.co.uk>
#
# $FreeBSD$
#
-DISTNAME= glade-0.5.7
+PORTNAME= glade
+PORTVERSION= 0.5.7
CATEGORIES= devel
MASTER_SITES= http://glade.pn.org/
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 4d9e1e0762db..baab79372d33 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: glade
-# Version required: 0.5.7
# Date created: 29 June 1998
# Whom: Dom Mitchell <dom@myrddin.demon.co.uk>
#
# $FreeBSD$
#
-DISTNAME= glade-0.5.7
+PORTNAME= glade
+PORTVERSION= 0.5.7
CATEGORIES= devel
MASTER_SITES= http://glade.pn.org/
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index da3f5863ad29..b26becfd0e57 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: glib12
-# Version required: 1.2.7
# Date Created: 28 July 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= glib-1.2.7
+PORTNAME= glib
+PORTVERSION= 1.2.7
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
diff --git a/devel/glib13/Makefile b/devel/glib13/Makefile
index da3f5863ad29..b26becfd0e57 100644
--- a/devel/glib13/Makefile
+++ b/devel/glib13/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: glib12
-# Version required: 1.2.7
# Date Created: 28 July 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= glib-1.2.7
+PORTNAME= glib
+PORTVERSION= 1.2.7
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index da3f5863ad29..b26becfd0e57 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: glib12
-# Version required: 1.2.7
# Date Created: 28 July 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= glib-1.2.7
+PORTNAME= glib
+PORTVERSION= 1.2.7
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index a285fb196791..80e751f991f9 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: GNU make
-# Version required: 3.78.1
# Date created: 11 September 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= make-3.78.1
-PKGNAME= g${DISTNAME}
+PORTNAME= gmake
+PORTVERSION= 3.78.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= make
+DISTNAME= make-${PORTVERSION}
MAINTAINER= jseger@FreeBSD.org
diff --git a/devel/gmake381/Makefile b/devel/gmake381/Makefile
index a285fb196791..80e751f991f9 100644
--- a/devel/gmake381/Makefile
+++ b/devel/gmake381/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: GNU make
-# Version required: 3.78.1
# Date created: 11 September 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= make-3.78.1
-PKGNAME= g${DISTNAME}
+PORTNAME= gmake
+PORTVERSION= 3.78.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= make
+DISTNAME= make-${PORTVERSION}
MAINTAINER= jseger@FreeBSD.org
diff --git a/devel/gnu-autoconf/Makefile b/devel/gnu-autoconf/Makefile
index 82c266256375..cf7c01fc44db 100644
--- a/devel/gnu-autoconf/Makefile
+++ b/devel/gnu-autoconf/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: autoconf
-# Version required: 2.13
# Date created: 7 October 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= autoconf-2.13
+PORTNAME= autoconf
+PORTVERSION= 2.13
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile
index 1867e0f55354..a31ea876ed3a 100644
--- a/devel/gnu-automake/Makefile
+++ b/devel/gnu-automake/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: automake
-# Version required: 1.4
# Date created: 15 March 1997
# Whom: FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= automake-1.4
+PORTNAME= automake
+PORTVERSION= 1.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile
index 99758290624a..c14a10b6f01f 100644
--- a/devel/gnu-libtool/Makefile
+++ b/devel/gnu-libtool/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libtool
-# Version required: 1.3.4
# Date created: 6 May 1998
# Whom: Motoyuki Kasahara <m-kasahr@sra.co.jp>
#
# $FreeBSD$
#
-DISTNAME= libtool-1.3.4
+PORTNAME= libtool
+PORTVERSION= 1.3.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index f1abb996ff78..67bdd9f9e9d9 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnustep
-# Version required: 0.6.5
# Date created: 03 October 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gstep-core-0.6.5
-PKGNAME= gnustep-0.6.5
+PORTNAME= gnustep
+PORTVERSION= 0.6.5
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
ftp://ftp.peanuts.org/Mirrors/GNUstep/gnustep/core/
+DISTNAME= gstep-core-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index f1abb996ff78..67bdd9f9e9d9 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnustep
-# Version required: 0.6.5
# Date created: 03 October 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gstep-core-0.6.5
-PKGNAME= gnustep-0.6.5
+PORTNAME= gnustep
+PORTVERSION= 0.6.5
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
ftp://ftp.peanuts.org/Mirrors/GNUstep/gnustep/core/
+DISTNAME= gstep-core-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile
index 57fa1051ff0e..466ca3e3c7f6 100644
--- a/devel/gperf/Makefile
+++ b/devel/gperf/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gperf
-# Version required: 2.7
# Date created: 19.04.1999
# Whom: dirk.meyer@dinoex.sub.org
#
# $FreeBSD$
#
-DISTNAME= gperf-2.7
+PORTNAME= gperf
+PORTVERSION= 2.7
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gperf
diff --git a/devel/gtksheet/Makefile b/devel/gtksheet/Makefile
index 2a39309f913c..cd6f90294bdf 100644
--- a/devel/gtksheet/Makefile
+++ b/devel/gtksheet/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtksheet
-# Version required: 7.6
# Date created: Jun 22 1999
# Whom: Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= gtksheet-8.0
+PORTNAME= gtksheet
+PORTVERSION= 8.0
CATEGORIES= devel
MASTER_SITES= http://magnet.fsu.edu/~feiguin/gtk/src/
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index c82bd7f18794..14e6f2a7479b 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: id-utils
-# Version required: 3.2
# Date created: 22 Aug 1996
# Whom: pst@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= id-utils-3.2
+PORTNAME= id-utils
+PORTVERSION= 3.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= id-utils
diff --git a/devel/idutils/Makefile b/devel/idutils/Makefile
index c82bd7f18794..14e6f2a7479b 100644
--- a/devel/idutils/Makefile
+++ b/devel/idutils/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: id-utils
-# Version required: 3.2
# Date created: 22 Aug 1996
# Whom: pst@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= id-utils-3.2
+PORTNAME= id-utils
+PORTVERSION= 3.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= id-utils
diff --git a/devel/ilu/Makefile b/devel/ilu/Makefile
index 6d55f44bc852..cf85965f1c01 100644
--- a/devel/ilu/Makefile
+++ b/devel/ilu/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: ilu
-# Version required: 2.0alpha13
# Date created: 29.9.1997
# Whom: cracauer@cons.org "Martin Cracauer"
#
# $FreeBSD$
#
-DISTNAME= ilu-2.0alpha13
-PKGNAME= ilu-2.0a13
+PORTNAME= ilu
+PORTVERSION= 2.0a13
CATEGORIES= devel
MASTER_SITES= ftp://parcftp.xerox.com/pub/ilu/2.0a13/ \
http://www2.cons.org:8000/freebsd-distfiles/ \
http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
+DISTNAME= ${PORTNAME}-2.0alpha13
PATCH_SITES= http://www2.cons.org:8000/freebsd-distfiles/ \
http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile
index f6ed9808c5f4..2cb235875111 100644
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: Imake
-# Version required: 3.3.6
# Date created: 01 Mar 2000
# Whom: max
#
# $FreeBSD$
#
-DISTNAME= X336src-1
-PKGNAME= imake-1.0
+PORTNAME= imake
+PORTVERSION= 1.0
CATEGORIES= devel
MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/source/ \
ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
+DISTNAME= X336src-1
EXTRACT_SUFX= .tgz
MAINTAINER= max@FreeBSD.org
diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index f6ed9808c5f4..2cb235875111 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: Imake
-# Version required: 3.3.6
# Date created: 01 Mar 2000
# Whom: max
#
# $FreeBSD$
#
-DISTNAME= X336src-1
-PKGNAME= imake-1.0
+PORTNAME= imake
+PORTVERSION= 1.0
CATEGORIES= devel
MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/source/ \
ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
+DISTNAME= X336src-1
EXTRACT_SUFX= .tgz
MAINTAINER= max@FreeBSD.org
diff --git a/devel/jam/Makefile b/devel/jam/Makefile
index 69ce9def50a4..c7088956a9ae 100644
--- a/devel/jam/Makefile
+++ b/devel/jam/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: jam
-# Version required: 2.2
# Date created: 10 July 1998
# Whom: Jeffrey Hsu <hsu@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= jam-2.2
+PORTNAME= jam
+PORTVERSION= 2.2
CATEGORIES= devel
MASTER_SITES= ftp://ftp1.perforce.com/pub/jam/
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index ffbfd8926bc6..e7788d954ab2 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdbg
-# Version required: 1.1.1
# Date created: 02 November 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= kdbg-1.1.1
+PORTNAME= kdbg
+PORTVERSION= 1.1.1
CATEGORIES= devel kde
MASTER_SITES= http://members.telecom.at/~johsixt/ \
ftp://ftp.eudaptics.co.at/pub/people/jsixt/
diff --git a/devel/kdelibdocs/Makefile b/devel/kdelibdocs/Makefile
index 33b7d0f55cb8..b84f235551b8 100644
--- a/devel/kdelibdocs/Makefile
+++ b/devel/kdelibdocs/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: kdelibdocs
-# Version required: 1.1
# Date created: 8 Feb 2000
# Whom: imura@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= kdelibdocs-1.1
-PKGNAME?= kdelibdocs-1.1
+PORTNAME?= kdelibdocs
+PORTVERSION?= 1.1
CATEGORIES= devel kde
MASTER_SITES= ftp://129.187.206.68/pub/unix/ide/KDevelop/documentation/ \
ftp://gd.tuwien.ac.at/hci/KDevelop/documentation/ \
ftp://fara.cs.uni-potsdam.de/pub/kdevelop/documentation/
+DISTNAME= kdelibdocs-1.1
MAINTAINER= imura@FreeBSD.org
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index c1a5f49b1e6b..60e08c91761c 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdevelop
-# Version required: 1.1 (final)
# Date created: 12 Aug 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= kdevelop-1.1
+PORTNAME= kdevelop
+PORTVERSION= 1.1
CATEGORIES= devel
MASTER_SITES= ftp://fara.cs.uni-potsdam.de/pub/kdevelop/ \
ftp://129.187.206.68/pub/unix/ide/KDevelop/ \
diff --git a/devel/kpp/Makefile b/devel/kpp/Makefile
index bb2dde5c8653..b16ec30b3adb 100644
--- a/devel/kpp/Makefile
+++ b/devel/kpp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kpp
-# Version required: 0.16d
# Date created: 19 Nov 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= kpp-0.16d
+PORTNAME= kpp
+PORTVERSION= 0.16d
CATEGORIES= devel
MASTER_SITES= http://www.msoe.edu/~geiseri/files/
diff --git a/devel/ktranslator/Makefile b/devel/ktranslator/Makefile
index a02a80f8e656..99f390963640 100644
--- a/devel/ktranslator/Makefile
+++ b/devel/ktranslator/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ktranslator
-# Version required: 0.4.0
# Date created: 23 May 1998
# Whom: Hans Petter Bieker <hanspb@persbraten.vgs.no>
#
# $FreeBSD$
#
-DISTNAME= ktranslator-0.4.0
+PORTNAME= ktranslator
+PORTVERSION= 0.4.0
CATEGORIES= devel kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1/apps/utils
diff --git a/devel/lclint/Makefile b/devel/lclint/Makefile
index 422dcdd77e5a..615b6b077a15 100644
--- a/devel/lclint/Makefile
+++ b/devel/lclint/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: lclint
-# Version required: 2.4b
# Date created: 9 September 1996
# Whom: moeding
#
# $FreeBSD$
#
-DISTNAME= lclint-2.4b
+PORTNAME= lclint
+PORTVERSION= 2.4b
CATEGORIES= devel
MASTER_SITES= http://www.sds.lcs.mit.edu/lclint/ftp/lclint/ \
ftp://ftp.deva.net/pub/sources/programming/linting/ \
diff --git a/devel/libPropList/Makefile b/devel/libPropList/Makefile
index b2186ce94aea..908570c10acf 100644
--- a/devel/libPropList/Makefile
+++ b/devel/libPropList/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: libPropList
-# Version required: 0.10.1
# Date Created: 6 December 1998
# Whom: Glenn Johnson
#
# $FreeBSD$
#
-DISTNAME= libPropList-0.10.1
-PKGNAME= libproplist-0.10.1
+PORTNAME= libproplist
+PORTVERSION= 0.10.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_WINDOWMAKER}
MASTER_SITE_SUBDIR= libs
+DISTNAME= libPropList-${PORTVERSION}
MAINTAINER= gljohns@bellsouth.net
diff --git a/devel/libU77/Makefile b/devel/libU77/Makefile
index c108b4aa88f9..4088d104ac2a 100644
--- a/devel/libU77/Makefile
+++ b/devel/libU77/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libU77
-# Version required: 2.6
# Date Created: 8 October 1998
# Whom: Glenn Johnson <gjohnson@nola.srrc.usda.gov>
#
# $FreeBSD$
#
-DISTNAME= libU77-2.6
+PORTNAME= libU77
+PORTVERSION= 2.6
CATEGORIES= devel
MASTER_SITES= http://flo.mech.eng.usyd.edu.au/~norris/src/
diff --git a/devel/libcache/Makefile b/devel/libcache/Makefile
index 91c0a5653a36..3e107f274315 100644
--- a/devel/libcache/Makefile
+++ b/devel/libcache/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libcache
-# Version required: 1.0.0
# Date created: 04 Feb 2000
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= libcache-1.0.0
+PORTNAME= libcache
+PORTVERSION= 1.0.0
CATEGORIES= devel
MASTER_SITES= http://www.afro-productions.com/
diff --git a/devel/libcii/Makefile b/devel/libcii/Makefile
index bd9613741dbe..ec97dbb56f7e 100644
--- a/devel/libcii/Makefile
+++ b/devel/libcii/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: libcii
-# Version required: 1.1
# Date created: 21 April 1998
# Whom: J Han <hjh@photino.com>
#
# $FreeBSD$
#
-DISTNAME= cii11
-PKGNAME= libcii-1.1
+PORTNAME= libcii
+PORTVERSION= 1.1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.cs.princeton.edu/pub/packages/cii/
+DISTNAME= cii11
MAINTAINER= hjh@photino.com
diff --git a/devel/libdlmalloc/Makefile b/devel/libdlmalloc/Makefile
index 29066aa7906d..1c4f2d897de0 100644
--- a/devel/libdlmalloc/Makefile
+++ b/devel/libdlmalloc/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: Doug Lea malloc library
-# Version required: 2.5.3b
# Date created: 3 June 1995
# Whom: roberto
#
# $FreeBSD$
#
-DISTNAME= dlmalloc
-PKGNAME= dlmalloc-2.6.5
+PORTNAME= dlmalloc
+PORTVERSION= 2.6.5
CATEGORIES= devel
MASTER_SITES= ftp://gee.cs.oswego.edu/pub/misc/
DISTFILES= malloc-2.6.5.c
diff --git a/devel/libffi-devel/Makefile b/devel/libffi-devel/Makefile
index d59f83132221..ae0157fc51b5 100644
--- a/devel/libffi-devel/Makefile
+++ b/devel/libffi-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libffi
-# Version required: 1.20
# Date created: 14, June, 1998
# Whom: Horance Chou <horance@freedom.ie.cycu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= libffi-1.20
+PORTNAME= libffi
+PORTVERSION= 1.20
CATEGORIES= devel
MASTER_SITES= ftp://sourceware.cygnus.com/pub/libffi/
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index d59f83132221..ae0157fc51b5 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libffi
-# Version required: 1.20
# Date created: 14, June, 1998
# Whom: Horance Chou <horance@freedom.ie.cycu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= libffi-1.20
+PORTNAME= libffi
+PORTVERSION= 1.20
CATEGORIES= devel
MASTER_SITES= ftp://sourceware.cygnus.com/pub/libffi/
diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile
index caf8d5722170..e3ea962f2d37 100644
--- a/devel/libg++/Makefile
+++ b/devel/libg++/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: GNU glib++
-# Version required: 0.0
# Date created: Wed, 23 Feb 2000
# Whom: David O'Brien <obrien@NUXI.com>
#
# $FreeBSD$
#
-DISTNAME= libg++-2.8.1.3
+PORTNAME= libg++
+PORTVERSION= 2.8.1.3
CATEGORIES= devel
MASTER_SITES= http://www.m-hollstein.de/libgxx/ \
ftp://ftp.valinux.com/pub/support/hjl/ \
@@ -17,7 +17,7 @@ MASTER_SITES= http://www.m-hollstein.de/libgxx/ \
${MASTER_SITE_GNU}
PATCH_SITES= http://www.m-hollstein.de/libgxx/
-PATCHFILES= libg++-2.8.1.3-20000312.diff.gz
+PATCHFILES= ${DISTNAME}-20000312.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= obrien@FreeBSD.org
diff --git a/devel/libgetline/Makefile b/devel/libgetline/Makefile
index 9ee347aeaea8..fa74f8bdd451 100644
--- a/devel/libgetline/Makefile
+++ b/devel/libgetline/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: getline library
-# Version required: 3.9
# Date created: 3 June 1995
# Whom: roberto
#
# $FreeBSD$
#
-DISTNAME= getline-39-src
-PKGNAME= getline-3.9
+PORTNAME= getline
+PORTVERSION= 3.9
CATEGORIES= devel
MASTER_SITES= ftp://ftp.sco.com/skunkware/src/lib/
+DISTNAME= ${PORTNAME}-39-src
MAINTAINER= jhix@mindspring.com
diff --git a/devel/libgii/Makefile b/devel/libgii/Makefile
index 6c52d75dab3d..e92208e1cc83 100644
--- a/devel/libgii/Makefile
+++ b/devel/libgii/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libgii
-# Version required: 0.6
# Date created: 4 January 2000
# Whom: mwest@uct.ac.za
#
# $FreeBSD$
#
-DISTNAME= libgii-0.6
+PORTNAME= libgii
+PORTVERSION= 0.6
CATEGORIES= devel
MASTER_SITES= ftp://ftp.ggi-project.org/pub/ggi/ggi/2_0_beta_2.1/
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 9dc44dfcfc1a..7a5a8bfaa785 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libglade
-# Version required: 0.12
# Date created: 18 August 1999
# Whom: Ade Lovett <ade@lovett.com>
#
# $FreeBSD$
#
-DISTNAME= libglade-0.12
+PORTNAME= libglade
+PORTVERSION= 0.12
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libglade
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 9dc44dfcfc1a..7a5a8bfaa785 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libglade
-# Version required: 0.12
# Date created: 18 August 1999
# Whom: Ade Lovett <ade@lovett.com>
#
# $FreeBSD$
#
-DISTNAME= libglade-0.12
+PORTNAME= libglade
+PORTVERSION= 0.12
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libglade
diff --git a/devel/libgnugetopt/Makefile b/devel/libgnugetopt/Makefile
index a898d097e308..f58c4456e6f8 100644
--- a/devel/libgnugetopt/Makefile
+++ b/devel/libgnugetopt/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libgnugetopt
-# Version required: 1.1
# Date created: 2 May 1999
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= libgnugetopt-1.1
+PORTNAME= libgnugetopt
+PORTVERSION= 1.1
CATEGORIES= devel
MASTER_SITES= http://people.FreeBSD.org/~andy/distfiles/
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index b350e9882217..4fb7f22d24f6 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libgtop
-# Version required: 1.0.7
# Date Created: 26 Sep 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= libgtop-1.0.7
+PORTNAME= libgtop
+PORTVERSION= 1.0.7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libgtop
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index b350e9882217..4fb7f22d24f6 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libgtop
-# Version required: 1.0.7
# Date Created: 26 Sep 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= libgtop-1.0.7
+PORTNAME= libgtop
+PORTVERSION= 1.0.7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libgtop
diff --git a/devel/libmalloc/Makefile b/devel/libmalloc/Makefile
index 79c30649c6b9..ebd90204e56d 100644
--- a/devel/libmalloc/Makefile
+++ b/devel/libmalloc/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# Ports collection makefile for: Mark Moraes malloc library
-# Version required: 0.0
# Date created: 11 January 1995
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= malloc-1.18
-PKGNAME= libmalloc-1.18
+PORTNAME= libmalloc
+PORTVERSION= 1.18
CATEGORIES= devel
MASTER_SITES= ftp://ftp.cs.toronto.edu/pub/moraes/
+DISTNAME= malloc-${PORTVERSION}
MAINTAINER= obrien@FreeBSD.org
diff --git a/devel/libshhmsg/Makefile b/devel/libshhmsg/Makefile
index 2809489edb72..97c1bad7eaeb 100644
--- a/devel/libshhmsg/Makefile
+++ b/devel/libshhmsg/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: libshhmsg
-# Version required: 1.4.0
# Date created: 1 May 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= shhmsg-1.4.0
-PKGNAME= libshhmsg-1.4.0
+PORTNAME= libshhmsg
+PORTVERSION= 1.4.0
CATEGORIES= devel
MASTER_SITES= http://home.sol.no/~sverrehu/pub-unix/files/
+DISTNAME= shhmsg-${PORTVERSION}
MAINTAINER= obrien@FreeBSD.org
diff --git a/devel/libshhopt/Makefile b/devel/libshhopt/Makefile
index d23052ec09ef..81adcde356cf 100644
--- a/devel/libshhopt/Makefile
+++ b/devel/libshhopt/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: libshhopt
-# Version required: 1.1.6
# Date created: 11 April 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= shhopt-1.1.6
-PKGNAME= libshhopt-1.1.6
+PORTNAME= libshhopt
+PORTVERSION= 1.1.6
CATEGORIES= devel
MASTER_SITES= http://home.sol.no/~sverrehu/pub-unix/files/
+DISTNAME= shhopt-${PORTVERSION}
MAINTAINER= obrien@FreeBSD.org
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index c08d009ca220..1c84a64f52af 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libsigc++
-# Version required: 0.8.6
# Date created: 27 January 2000
# Whom: Joe Lu <JoeLu@JoeLu.m8.ntu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= libsigc++-0.8.6
+PORTNAME= libsigc++
+PORTVERSION= 0.8.6
CATEGORIES= devel
MASTER_SITES= ftp://ftp.ece.ucdavis.edu/pub/kenelson/libsigc++/
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index c08d009ca220..1c84a64f52af 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libsigc++
-# Version required: 0.8.6
# Date created: 27 January 2000
# Whom: Joe Lu <JoeLu@JoeLu.m8.ntu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= libsigc++-0.8.6
+PORTNAME= libsigc++
+PORTVERSION= 0.8.6
CATEGORIES= devel
MASTER_SITES= ftp://ftp.ece.ucdavis.edu/pub/kenelson/libsigc++/
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index c08d009ca220..1c84a64f52af 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libsigc++
-# Version required: 0.8.6
# Date created: 27 January 2000
# Whom: Joe Lu <JoeLu@JoeLu.m8.ntu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= libsigc++-0.8.6
+PORTNAME= libsigc++
+PORTVERSION= 0.8.6
CATEGORIES= devel
MASTER_SITES= ftp://ftp.ece.ucdavis.edu/pub/kenelson/libsigc++/
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 802f5fa37598..390833b17557 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: S-Lang library
-# Version required: 1.4.0
# Date created: 11 July 1996
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= slang-1.4.0
-PKGNAME= libslang-1.4.0
+PORTNAME= libslang
+PORTVERSION= 1.4.0
CATEGORIES= devel
MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/
+DISTNAME= slang-${PORTVERSION}
MAINTAINER= xaa+ports@timewasters.nl
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 99758290624a..c14a10b6f01f 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libtool
-# Version required: 1.3.4
# Date created: 6 May 1998
# Whom: Motoyuki Kasahara <m-kasahr@sra.co.jp>
#
# $FreeBSD$
#
-DISTNAME= libtool-1.3.4
+PORTNAME= libtool
+PORTVERSION= 1.3.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
diff --git a/devel/libtool13/Makefile b/devel/libtool13/Makefile
index 99758290624a..c14a10b6f01f 100644
--- a/devel/libtool13/Makefile
+++ b/devel/libtool13/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libtool
-# Version required: 1.3.4
# Date created: 6 May 1998
# Whom: Motoyuki Kasahara <m-kasahr@sra.co.jp>
#
# $FreeBSD$
#
-DISTNAME= libtool-1.3.4
+PORTNAME= libtool
+PORTVERSION= 1.3.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
diff --git a/devel/libtool14/Makefile b/devel/libtool14/Makefile
index 99758290624a..c14a10b6f01f 100644
--- a/devel/libtool14/Makefile
+++ b/devel/libtool14/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libtool
-# Version required: 1.3.4
# Date created: 6 May 1998
# Whom: Motoyuki Kasahara <m-kasahr@sra.co.jp>
#
# $FreeBSD$
#
-DISTNAME= libtool-1.3.4
+PORTNAME= libtool
+PORTVERSION= 1.3.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile
index 99758290624a..c14a10b6f01f 100644
--- a/devel/libtool15/Makefile
+++ b/devel/libtool15/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libtool
-# Version required: 1.3.4
# Date created: 6 May 1998
# Whom: Motoyuki Kasahara <m-kasahr@sra.co.jp>
#
# $FreeBSD$
#
-DISTNAME= libtool-1.3.4
+PORTNAME= libtool
+PORTVERSION= 1.3.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
diff --git a/devel/libxalloc/Makefile b/devel/libxalloc/Makefile
index 07de05c4bf1b..95e0317060c5 100644
--- a/devel/libxalloc/Makefile
+++ b/devel/libxalloc/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: libxalloc
-# Version required: 1.0.3
# Date created: 12 April 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= xalloc-1.0.3
-PKGNAME= libxalloc-1.0.3
+PORTNAME= libxalloc
+PORTVERSION= 1.0.3
CATEGORIES= devel
MASTER_SITES= http://home.sol.no/~sverrehu/pub-unix/files/
+DISTNAME= xalloc-${PORTVERSION}
MAINTAINER= obrien@FreeBSD.org
diff --git a/devel/lincvs/Makefile b/devel/lincvs/Makefile
index d9a4be9ff3f2..31ff0bf263d5 100644
--- a/devel/lincvs/Makefile
+++ b/devel/lincvs/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: lincvs
-# Version required: 0.2.3
# Date created: 03 December 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= lincvs_0.2.3
-PKGNAME= lincvs-0.2.3
+PORTNAME= lincvs
+PORTVERSION= 0.2.3
CATEGORIES= devel kde
MASTER_SITES= http://ppprs1.phy.tu-dresden.de/~trogisch/lincvs/download/
+DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= jedgar@FreeBSD.org
diff --git a/devel/linux_devtools-6/Makefile b/devel/linux_devtools-6/Makefile
index 880a0389089a..61569f996ff0 100644
--- a/devel/linux_devtools-6/Makefile
+++ b/devel/linux_devtools-6/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: linux_devtools
-# Version required: 6.1
# Date created: Jul 9, 1999
# Whom: marcel@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= linux_devtools
-PKGNAME= linux_devtools-6.1
+PORTNAME= linux_devtools
+PORTVERSION= 6.1
CATEGORIES= devel emulators linux
MASTER_SITES= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
DISTFILES= ${RPM_KERNEL_HEADERS} \
diff --git a/devel/linux_devtools-7/Makefile b/devel/linux_devtools-7/Makefile
index 880a0389089a..61569f996ff0 100644
--- a/devel/linux_devtools-7/Makefile
+++ b/devel/linux_devtools-7/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: linux_devtools
-# Version required: 6.1
# Date created: Jul 9, 1999
# Whom: marcel@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= linux_devtools
-PKGNAME= linux_devtools-6.1
+PORTNAME= linux_devtools
+PORTVERSION= 6.1
CATEGORIES= devel emulators linux
MASTER_SITES= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
DISTFILES= ${RPM_KERNEL_HEADERS} \
diff --git a/devel/linux_devtools/Makefile b/devel/linux_devtools/Makefile
index 880a0389089a..61569f996ff0 100644
--- a/devel/linux_devtools/Makefile
+++ b/devel/linux_devtools/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: linux_devtools
-# Version required: 6.1
# Date created: Jul 9, 1999
# Whom: marcel@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= linux_devtools
-PKGNAME= linux_devtools-6.1
+PORTNAME= linux_devtools
+PORTVERSION= 6.1
CATEGORIES= devel emulators linux
MASTER_SITES= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
DISTFILES= ${RPM_KERNEL_HEADERS} \
diff --git a/devel/linux_kdump/Makefile b/devel/linux_kdump/Makefile
index 101aa8066e29..f3b3a1c77131 100644
--- a/devel/linux_kdump/Makefile
+++ b/devel/linux_kdump/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: linux_kdump
-# Version required: 1.2
# Date created: Nov 26 1997
# Whom: msmith@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= linux_kdump-1.4
+PORTNAME= linux_kdump
+PORTVERSION= 1.4
CATEGORIES= devel linux
MASTER_SITES= http://people.FreeBSD.org/~marcel/ \
ftp://ftp.scc.nl/pub/FreeBSD/distfiles/
diff --git a/devel/linuxthreads/Makefile b/devel/linuxthreads/Makefile
index 93500d701b6c..ed381b8fadfa 100644
--- a/devel/linuxthreads/Makefile
+++ b/devel/linuxthreads/Makefile
@@ -1,24 +1,24 @@
# New ports collection makefile for: linuxthreads
-# Version required: 2.1.2
# Date created: 14 Jan 1999
# Whom: Richard Seaman, Jr. <dick@tar.com>
#
# $FreeBSD$
#
-DISTNAME= glibc-linuxthreads-2.1.2
-PKGNAME= linuxthreads-2.1.2
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= glibc
-ONLY_FOR_ARCHS= i386
+PORTNAME= linuxthreads
+PORTVERSION= 2.1.2
+CATEGORIES= devel
+MASTER_SITES= ${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR= glibc
+DISTNAME= glibc-linuxthreads-${PORTVERSION}
MAINTAINER= jasone@freebsd.org
+
.include <bsd.port.pre.mk>
# This port only works on i386 right now.
-ONLY_FOR_ARCHS=i386
+ONLY_FOR_ARCHS= i386
.if ${OSVERSION} < 400015
BROKEN="Requires FreeBSD 4.0 or newer"
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 63f7a6cbbc05..50a13bbc33eb 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: m4
-# Version required: 1.4
# Date created: 25 October 1994
# Whom: mr
#
# $FreeBSD$
#
-DISTNAME= m4-1.4
+PORTNAME= m4
+PORTVERSION= 1.4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
+MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= m4
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/m6811-gcc/Makefile b/devel/m6811-gcc/Makefile
index 34e994cdc571..c444192426b7 100644
--- a/devel/m6811-gcc/Makefile
+++ b/devel/m6811-gcc/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: gcc11
-# Version required: 2.6.3
# Date created: Thu Sep 14 11:10:01 CDT 1995
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gcc11
-PKGNAME= gcc11-2.6.3
+PORTNAME= gcc11
+PORTVERSION= 2.6.3
CATEGORIES= devel
MASTER_SITES= ftp://nyquist.ee.ualberta.ca/pub/motorola/68hc11/gcc/
DISTFILES= gcc-6811-fsf.tar.gz gcc-2.6.3.tar.gz
diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile
index 29fc600411cc..be154a4ea00e 100644
--- a/devel/makedepend/Makefile
+++ b/devel/makedepend/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: makedepend
-# Version required: 95.07.05
# Date created: August 15th 1997
# Whom: Ian Vaudrey <i.vaudrey@bigfoot.com>
#
# $FreeBSD$
#
-DISTNAME= cyrus-imapd-v1.5.14
-PKGNAME= makedepend-95.07.05
+PORTNAME= makedepend
+PORTVERSION= 1995.07.05
CATEGORIES= devel
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+DISTNAME= cyrus-imapd-v1.5.14
MAINTAINER= i.vaudrey@bigfoot.com
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index b99de550ebb7..6f0de917ed96 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mico
-# Version required: 2.3.1
# Date created: 11 July 1998
# Whom: Marc G. Fournier <scrappy@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= mico-2.3.1
+PORTNAME= mico
+PORTVERSION= 2.3.1
CATEGORIES= devel
MASTER_SITES= http://diamant-atm.vsb.cs.uni-frankfurt.de/~mico/
diff --git a/devel/mkcmd/Makefile b/devel/mkcmd/Makefile
index a83f6ae34086..2d76ed523ac3 100644
--- a/devel/mkcmd/Makefile
+++ b/devel/mkcmd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mkcmd
-# Version required: 8.13d
# Date created: 17 November 1999
# Whom: ajk@waterspout.com
#
# $FreeBSD$
#
-DISTNAME= mkcmd-8.13d
+PORTNAME= mkcmd
+PORTVERSION= 8.13d
CATEGORIES= devel
MASTER_SITES= ftp://ftp.physics.purdue.edu/pub/pundits/
EXTRACT_SUFX= .tgz
diff --git a/devel/mkmf/Makefile b/devel/mkmf/Makefile
index c2a15804d3a0..2cf9ae97d0a1 100644
--- a/devel/mkmf/Makefile
+++ b/devel/mkmf/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mkmf
-# Version required: 4.11
# Date created: 14 Mar 1996
# Whom: se
#
# $FreeBSD$
#
-DISTNAME= mkmf
-PKGNAME= mkmf-4.11
+PORTNAME= mkmf
+PORTVERSION= 4.11
CATEGORIES= devel
MASTER_SITES= ftp://ftp.uni-koeln.de/util/
+DISTNAME= ${PORTNAME}
MAINTAINER= se@FreeBSD.org
diff --git a/devel/mm/Makefile b/devel/mm/Makefile
index 4adcee4a1e64..d323c8663cf5 100644
--- a/devel/mm/Makefile
+++ b/devel/mm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mm
-# Version required: 1.0.12
# Date Created: 14 March 1999
# Whom: Ralf S. Engelschall
#
# $FreeBSD$
#
-DISTNAME= mm-1.0.12
+PORTNAME= mm
+PORTVERSION= 1.0.12
CATEGORIES= devel
MASTER_SITES= http://www.engelschall.com/sw/mm/ \
ftp://ftp.engelschall.com/sw/mm/
diff --git a/devel/mprof/Makefile b/devel/mprof/Makefile
index e968b2ba78ef..8d1f27758cc9 100644
--- a/devel/mprof/Makefile
+++ b/devel/mprof/Makefile
@@ -1,15 +1,15 @@
# ex:ts=8
# Ports collection makefile for: mprof
-# Version required: 0.0
# Date created: Sat Nov 5 01:16:33 PST 1994
# Whom: hsu
#
# $FreeBSD$
#
-DISTNAME= mprof-3.0
+PORTNAME= mprof
+PORTVERSION= 3.0
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.cs.colorado.edu/pub/misc/
+MASTER_SITES= ftp://ftp.cs.colorado.edu/pub/misc/
EXTRACT_SUFX= .tar.Z
MAINTAINER= obrien@FreeBSD.org
diff --git a/devel/msrc0/Makefile b/devel/msrc0/Makefile
index f4f9f178d9cd..f88e0eee3a6e 100644
--- a/devel/msrc0/Makefile
+++ b/devel/msrc0/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: msrc0
-# Version required: 0.6
# Date created: 17 November 1999
# Whom: ajk@waterspout.com
#
# $FreeBSD$
#
-DISTNAME= msrc0-0.6
+PORTNAME= msrc0
+PORTVERSION= 0.6
CATEGORIES= devel
MASTER_SITES= ftp://ftp.physics.purdue.edu/pub/pundits/
EXTRACT_SUFX= .tgz
diff --git a/devel/nana/Makefile b/devel/nana/Makefile
index c9e6a4a57c32..6a5383aca56c 100644
--- a/devel/nana/Makefile
+++ b/devel/nana/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nana
-# Version required: 2.4
# Date created: 30th May 1999
# Whom: Phil Maker <pjm@gnu.org>
#
# $FreeBSD$
#
-DISTNAME= nana-2.4
+PORTNAME= nana
+PORTVERSION= 2.4
CATEGORIES= devel
MASTER_SITES= ftp://ftp.cs.ntu.edu.au/pub/nana/
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index 9f68914ed5c5..0bda6228b26c 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nasm
-# Version required: 0.98
# Date created: 7 April 1998
# Whom: Murray Stokely <murray@cdrom.com>
#
# $FreeBSD$
#
-DISTNAME= nasm-0.98
+PORTNAME= nasm
+PORTVERSION= 0.98
CATEGORIES= devel lang
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= devel/lang/assemblers
diff --git a/devel/ncurses-devel/Makefile b/devel/ncurses-devel/Makefile
index 61dfee184b71..ee18c91c9f37 100644
--- a/devel/ncurses-devel/Makefile
+++ b/devel/ncurses-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ncurses
-# Version required: 4.2
# Date created: 23 September 1997
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= ncurses-4.2
+PORTNAME= ncurses
+PORTVERSION= 4.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.clark.net/pub/dickey/ncurses/4.2/
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 61dfee184b71..ee18c91c9f37 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ncurses
-# Version required: 4.2
# Date created: 23 September 1997
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= ncurses-4.2
+PORTNAME= ncurses
+PORTVERSION= 4.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.clark.net/pub/dickey/ncurses/4.2/
diff --git a/devel/newlib-m68k/Makefile b/devel/newlib-m68k/Makefile
index 46a1716b20dc..b91134a45e45 100644
--- a/devel/newlib-m68k/Makefile
+++ b/devel/newlib-m68k/Makefile
@@ -1,15 +1,15 @@
-# New ports collection makefile for: m68k-newlib-1.8.1
-# Version required: 1.8.1
+# New ports collection makefile for: m68k-newlib
# Date created: 7 July 1998
# Whom: Jerry Hicks <jhicks@glenatl.glenayre.com>
#
# $FreeBSD$
#
-DISTNAME= newlib-1.8.1
-PKGNAME= m68knewlib-1.8.1
+PORTNAME= newlib
+PORTVERSION= 1.8.1
CATEGORIES= devel
MASTER_SITES= ftp://sourceware.cygnus.com/pub/newlib/
+PKGNAMEPREFIX= m68k
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index e1b1578aea1d..bdc3ea39da48 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: newt
-# Version required: 0.50-13
# Date created: 08 Jan 2000
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= newt-0.50-13
-PKGNAME= newt-0.50.13
+PORTNAME= newt
+PORTVERSION= 0.50.13
CATEGORIES= devel
MASTER_SITES= \
ftp://ftp.cdrom.com/pub/linux/redhat/redhat-6.1/SRPMS/SRPMS/ \
ftp://ftp.redhat.com/pub/redhat/redhat-6.1/SRPMS/SRPMS/ \
ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/redhat-6.1/SRPMS/SRPMS/
+DISTNAME= ${PORTNAME}-0.50-13
EXTRACT_SUFX= .src.rpm
MAINTAINER= will@FreeBSD.org
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index 571c359f0021..201287bff45b 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: noweb
-# Version required: noweb-2.9a
# Date created: 29 July 1995
# Whom: Thomas Gellekum <tg@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= noweb-2.9a
+PORTNAME= noweb
+PORTVERSION= 2.9a
CATEGORIES= devel
MASTER_SITES= ftp://ftp.cs.virginia.edu/pub/nr/
EXTRACT_SUFX= .tgz
diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 46be3bd55f7e..cfb6218320bf 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: omniORB
# Date created: 14 May 1997
# Whom: ejc@bazzle.com
-# Version required: 2.8.0
#
# $FreeBSD$
#
-DISTNAME= omniORB_280
-PKGNAME= omniORB-2.8.0
+PORTNAME= omniORB
+PORTVERSION= 2.8.0
CATEGORIES= devel
MASTER_SITES= ftp://ftp.orl.co.uk/pub/omniORB/
+DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//g}
MAINTAINER= ejc@bazzle.com
diff --git a/devel/p5-AppConfig/Makefile b/devel/p5-AppConfig/Makefile
index a625a5e48636..046cab7d90a4 100644
--- a/devel/p5-AppConfig/Makefile
+++ b/devel/p5-AppConfig/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-AppConfig
-# Version required: 1.52
# Date created: 23 October 1999
# Whom: Igor Vinokurov <igor@zynaps.ru>
#
# $FreeBSD$
#
-DISTNAME= AppConfig-1.52
-PKGNAME= p5-AppConfig-1.52
+PORTNAME= AppConfig
+PORTVERSION= 1.52
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= App/ABW
+PKGNAMEPREFIX= p5-
MAINTAINER= igor@zynaps.ru
diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index 3522bae54ad1..1c95db8be013 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-BSD-Resource
-# Version required: 1.0701
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= BSD-Resource-1.0701
-PKGNAME= p5-BSD-Resource-1.0701
+PORTNAME= BSD-Resource
+PORTVERSION= 1.0701
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= BSD
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-C-Scan/Makefile b/devel/p5-C-Scan/Makefile
index 2576f70ca013..fe62c9b4496b 100644
--- a/devel/p5-C-Scan/Makefile
+++ b/devel/p5-C-Scan/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-C-Scan
-# Version required: 0.5
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= C-Scan-0.5
-PKGNAME= p5-C-Scan-0.5
+PORTNAME= C-Scan
+PORTVERSION= 0.5
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= C
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile
index 99175bff75d6..a6d45c2a0866 100644
--- a/devel/p5-Config-IniFiles/Makefile
+++ b/devel/p5-Config-IniFiles/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: p5-IniConf
-# Version required: 0.92
# Date created: October 21st 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= IniConf.pm-0.92
-PKGNAME= p5-IniConf-0.92
+PORTNAME= IniConf
+PORTVERSION= 0.92
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= IniConf
+DISTNAME= ${PORTNAME}.pm-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-ConfigReader/Makefile b/devel/p5-ConfigReader/Makefile
index 88013d59a3da..3e8855cde232 100644
--- a/devel/p5-ConfigReader/Makefile
+++ b/devel/p5-ConfigReader/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-ConfigReader
-# Version required: 0.5
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= ConfigReader-0.5
-PKGNAME= p5-ConfigReader-0.5
+PORTNAME= ConfigReader
+PORTVERSION= 0.5
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ConfigReader
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index edd21b40f279..d60905ed271c 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Curses
-# Version required: 1.02
# Date created: October 17th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Curses-1.02
-PKGNAME= p5-Curses-1.02
+PORTNAME= Curses
+PORTVERSION= 1.02
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Curses
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Data-Flow/Makefile b/devel/p5-Data-Flow/Makefile
index 85db9dd4ea33..75232b6d5820 100644
--- a/devel/p5-Data-Flow/Makefile
+++ b/devel/p5-Data-Flow/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Data-Flow
-# Version required: 0.05
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Data-Flow-0.05
-PKGNAME= p5-Data-Flow-0.05
+PORTNAME= Data-Flow
+PORTVERSION= 0.05
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Data
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Data-ShowTable/Makefile b/devel/p5-Data-ShowTable/Makefile
index 2aab64bfedef..a1e9ce984346 100644
--- a/devel/p5-Data-ShowTable/Makefile
+++ b/devel/p5-Data-ShowTable/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Data-ShowTable
-# Version required: 3.3
# Date created: September 10th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Data-ShowTable-3.3
-PKGNAME= p5-Data-ShowTable-3.3
+PORTNAME= Data-ShowTable
+PORTVERSION= 3.3
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Data
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Date-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index 7419ca201c54..d599db5d9299 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Date-Calc
-# Version required: 4.3
# Date created: 25 February 2000
# Whom: Brad Hendrickse <bradh@uunet.co.za>
#
# $FreeBSD$
#
-DISTNAME= Date-Calc-4.3
-PKGNAME= p5-Date-Calc-4.3
+PORTNAME= Date-Calc
+PORTVERSION= 4.3
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Date
+PKGNAMEPREFIX= p5-
MAINTAINER= bradh@uunet.co.za
diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 59d901424f20..c78a7ce1eefb 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Date-Manip
-# Version required: 5.*
# Date created: April 28th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= DateManip-5.35
-PKGNAME= p5-Date-Manip-5.35
+PORTNAME= DateManip
+PORTVERSION= 5.35
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Date
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Devel-DProf/Makefile b/devel/p5-Devel-DProf/Makefile
index a39340776cc9..058dd1036b8c 100644
--- a/devel/p5-Devel-DProf/Makefile
+++ b/devel/p5-Devel-DProf/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Devel-DProf
-# Version required: 19990108
# Date created: June 15th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= DProf-19990108
-PKGNAME= p5-Devel-DProf-19990108
+PORTNAME= DProf
+PORTVERSION= 19990108
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Devel
+PKGNAMEPREFIX= p5-Devel-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Devel-Peek/Makefile b/devel/p5-Devel-Peek/Makefile
index c2b59d506e69..91cf90dcba47 100644
--- a/devel/p5-Devel-Peek/Makefile
+++ b/devel/p5-Devel-Peek/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Devel-Peek
-# Version required: 0.94
# Date created: June 15th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Devel-Peek-0.94
-PKGNAME= p5-Devel-Peek-0.94
+PORTNAME= Devel-Peek
+PORTVERSION= 0.94
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Devel
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Devel-Symdump/Makefile b/devel/p5-Devel-Symdump/Makefile
index 63db541aa388..54a9ed9acaf5 100644
--- a/devel/p5-Devel-Symdump/Makefile
+++ b/devel/p5-Devel-Symdump/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Devel-Symdump
-# Version required: 2.00
# Date created: June 15th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Devel-Symdump-2.00
-PKGNAME= p5-Devel-Symdump-2.00
+PORTNAME= Devel-Symdump
+PORTVERSION= 2.00
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Devel
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Errno/Makefile b/devel/p5-Errno/Makefile
index 0ab747cdc359..fe8fa1c1f598 100644
--- a/devel/p5-Errno/Makefile
+++ b/devel/p5-Errno/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Errno
-# Version required: 1.02
# Date created: June 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Errno-1.02
-PKGNAME= p5-Errno-1.02
+PORTNAME= Errno
+PORTVERSION= 1.02
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Errno
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-File-BasicFlock/Makefile b/devel/p5-File-BasicFlock/Makefile
index ddc1eae947eb..dcb060e60fe2 100644
--- a/devel/p5-File-BasicFlock/Makefile
+++ b/devel/p5-File-BasicFlock/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-File-BasicFlock
-# Version required: 96.072401
# Date created: 1996/10/24
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= File-BasicFLock-96.072401
-PKGNAME= p5-File-BasicFlock-96.072401
+PORTNAME= File-BasicFlock
+PORTVERSION= 96.072401
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= File
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-File-Lock/Makefile b/devel/p5-File-Lock/Makefile
index 8ffd5eaf4637..937b10b87b53 100644
--- a/devel/p5-File-Lock/Makefile
+++ b/devel/p5-File-Lock/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-File-Lock
-# Version required: 0.9
# Date created: October 17th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= File-Lock-0.9
-PKGNAME= p5-File-Lock-0.9
+PORTNAME= File-Lock
+PORTVERSION= 0.9
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= File
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-File-MMagic/Makefile b/devel/p5-File-MMagic/Makefile
index 58a7a168a2b2..0573a4eccfca 100644
--- a/devel/p5-File-MMagic/Makefile
+++ b/devel/p5-File-MMagic/Makefile
@@ -5,12 +5,12 @@
# $FreeBSD$
#
-PORTNAME= p5-File-MMagic
+PORTNAME= File-MMagic
PORTVERSION= 1.06
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ../../authors/id/K/KN/KNOK
-DISTNAME= File-MMagic-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= knu@idaemons.org
diff --git a/devel/p5-File-Slurp/Makefile b/devel/p5-File-Slurp/Makefile
index 5fa3bf8c8b24..f183bd2d4464 100644
--- a/devel/p5-File-Slurp/Makefile
+++ b/devel/p5-File-Slurp/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-File-Slurp
-# Version required: 98.071901
# Date created: October 17th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= File-Slurp-98.071901
-PKGNAME= p5-File-Slurp-98.071901
+PORTNAME= File-Slurp
+PORTVERSION= 98.071901
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= File
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-File-Sync/Makefile b/devel/p5-File-Sync/Makefile
index 32182bd098e3..52cab3bd6fbe 100644
--- a/devel/p5-File-Sync/Makefile
+++ b/devel/p5-File-Sync/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: p5-File-Sync
-# Version required: 0.08
# Date created: 6 March 1998
# Whom: Jun Kuriyama <kuriyama@opt.phys.waseda.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= File-Sync-0.08
-PKGNAME= p5-File-Sync-0.08
+PORTNAME= File-Sync
+PORTVERSION= 0.08
+PKGNAMEPREFIX= p5-
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= File
diff --git a/devel/p5-File-Tools/Makefile b/devel/p5-File-Tools/Makefile
index 893342928a20..b77ab6a55a9c 100644
--- a/devel/p5-File-Tools/Makefile
+++ b/devel/p5-File-Tools/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-File-Tools
-# Version required: 2.0
# Date created: October 17th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= File-Tools-2.0
-PKGNAME= p5-File-Tools-2.0
+PORTNAME= File-Tools
+PORTVERSION= 2.0
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= File
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Filter/Makefile b/devel/p5-Filter/Makefile
index 707a9bacb1fa..39f8cb2f996f 100644
--- a/devel/p5-Filter/Makefile
+++ b/devel/p5-Filter/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Filter
-# Version required: 1.14
# Date created: June 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Filter-1.14
-PKGNAME= p5-Filter-1.14
+PORTNAME= Filter
+PORTVERSION= 1.14
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Filter
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-FreezeThaw/Makefile b/devel/p5-FreezeThaw/Makefile
index d7963ecacc0d..57e623d1e570 100644
--- a/devel/p5-FreezeThaw/Makefile
+++ b/devel/p5-FreezeThaw/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-FreezeThaw
-# Version required: 0.3
# Date created: September 10th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= FreezeThaw-0.3
-PKGNAME= p5-FreezeThaw-0.3
+PORTNAME= FreezeThaw
+PORTVERSION= 0.3
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= FreezeThaw
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-IO-Stty/Makefile b/devel/p5-IO-Stty/Makefile
index 4ee82caf2bcd..dc8f22927a2c 100644
--- a/devel/p5-IO-Stty/Makefile
+++ b/devel/p5-IO-Stty/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: p5-IO-Stty
-# Version required: 0.02
# Date created: 14 Jan 2000
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= IO-Stty-.02
-PKGNAME= p5-IO-Stty-0.02
+PORTNAME= IO-Stty
+PORTVERSION= 0.02
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= IO
+DISTNAME= ${PORTNAME}-.02
+PKGNAMEPREFIX= p5-
MAINTAINER= will@FreeBSD.org
diff --git a/devel/p5-IO-Tty/Makefile b/devel/p5-IO-Tty/Makefile
index 080dc1367091..b65562f7739b 100644
--- a/devel/p5-IO-Tty/Makefile
+++ b/devel/p5-IO-Tty/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-IO-Tty
-# Version required: 0.02
# Date created: 14 Jan 2000
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= IO-Tty-0.02
-PKGNAME= p5-IO-Tty-0.02
+PORTNAME= IO-Tty
+PORTVERSION= 0.02
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= IO
+PKGNAMEPREFIX= p5-
MAINTAINER= will@FreeBSD.org
diff --git a/devel/p5-IO-stringy/Makefile b/devel/p5-IO-stringy/Makefile
index 0410808e8f54..a2c558c1a9f7 100644
--- a/devel/p5-IO-stringy/Makefile
+++ b/devel/p5-IO-stringy/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-IO-stringy
-# Version required: 1.203
# Date created: April 27 1998
# Whom: Eivind Eklund <eivind@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= IO-stringy-1.203
-PKGNAME= p5-IO-stringy-1.203
+PORTNAME= IO-stringy
+PORTVERSION= 1.203
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= IO
+PKGNAMEPREFIX= p5-
MAINTAINER= eivind@FreeBSD.org
diff --git a/devel/p5-Include/Makefile b/devel/p5-Include/Makefile
index 6609a644ec1e..6a04068bb753 100644
--- a/devel/p5-Include/Makefile
+++ b/devel/p5-Include/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Include
-# Version required: 1.02a
# Date created: October 21st 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Include-1.02a
-PKGNAME= p5-Include-1.02a
+PORTNAME= Include
+PORTVERSION= 1.02a
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Include
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-IniConf/Makefile b/devel/p5-IniConf/Makefile
index 99175bff75d6..a6d45c2a0866 100644
--- a/devel/p5-IniConf/Makefile
+++ b/devel/p5-IniConf/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: p5-IniConf
-# Version required: 0.92
# Date created: October 21st 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= IniConf.pm-0.92
-PKGNAME= p5-IniConf-0.92
+PORTNAME= IniConf
+PORTVERSION= 0.92
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= IniConf
+DISTNAME= ${PORTNAME}.pm-${PORTVERSION}
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Locale-PGetText/Makefile b/devel/p5-Locale-PGetText/Makefile
index 71ab8bfb8709..c11c94b5c022 100644
--- a/devel/p5-Locale-PGetText/Makefile
+++ b/devel/p5-Locale-PGetText/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Locale-PGetText
-# Version required: 0.16
# Date created: 27 January 2000
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Locale-PGetText-0.16
-PKGNAME= p5-Locale-PGetText-0.16
+PORTNAME= Locale-PGetText
+PORTVERSION= 0.16
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Locale
+PKGNAMEPREFIX= p5-
MAINTAINER= nakai@FreeBSD.org
diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index 5b293d8b384e..627fa05ab6c8 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-gettext
-# Version required: 1.01
# Date created: 1 February 2000
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= gettext-1.01
-PKGNAME= p5-gettext-1.01
+PORTNAME= gettext
+PORTVERSION= 1.01
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Locale
+PKGNAMEPREFIX= p5-
MAINTAINER= dima@Chg.RU
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index b51e05458439..c4931a6b1f8f 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: p5-PV
-# Version required: 1.0
# Date created: April 18th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= perlvision
-PKGNAME= p5-PV-1.0
+PORTNAME= PV
+PORTVERSION= 1.0
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= PV
+PKGNAMEPREFIX= p5-
+DISTNAME= perlvision
EXTRACT_SUFX= .tgz
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Parse-RecDescent/Makefile b/devel/p5-Parse-RecDescent/Makefile
index 3d4312213ff0..6d4ea735528f 100644
--- a/devel/p5-Parse-RecDescent/Makefile
+++ b/devel/p5-Parse-RecDescent/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Parse-RecDescent
-# Version required: 1.66
# Date created: July 9th 1999
# Whom: Jerry Hicks <wghicks@bellsouth.net>
#
# $FreeBSD$
#
-DISTNAME= Parse-RecDescent-1.66
-PKGNAME= p5-Parse-RecDescent-1.66
+PORTNAME= Parse-RecDescent
+PORTVERSION= 1.66
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Parse
+PKGNAMEPREFIX= p5-
MAINTAINER= jhix@mindspring.com
diff --git a/devel/p5-Penguin-Easy/Makefile b/devel/p5-Penguin-Easy/Makefile
index 088aa249eb01..2c7025643c90 100644
--- a/devel/p5-Penguin-Easy/Makefile
+++ b/devel/p5-Penguin-Easy/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Penguin-Easy
-# Version required: 1.1
# Date created: May 28th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Penguin-Easy-1.1
-PKGNAME= p5-Penguin-Easy-1.1
+PORTNAME= Penguin-Easy
+PORTVERSION= 1.1
CATEGORIES= devel security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Penguin
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Penguin/Makefile b/devel/p5-Penguin/Makefile
index 5337b122471c..3beb2cac669d 100644
--- a/devel/p5-Penguin/Makefile
+++ b/devel/p5-Penguin/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Penguin
-# Version required: 3.00
# Date created: May 28th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Penguin-3.00
-PKGNAME= p5-Penguin-3.00
+PORTNAME= Penguin
+PORTVERSION= 3.00
CATEGORIES= devel security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Penguin
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Proc-Simple/Makefile b/devel/p5-Proc-Simple/Makefile
index 2a2eab9e1111..414fd46ed130 100644
--- a/devel/p5-Proc-Simple/Makefile
+++ b/devel/p5-Proc-Simple/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Proc-Simple
-# Version required: 1.12
# Date created: June 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Proc-Simple-1.12
-PKGNAME= p5-Proc-Simple-1.12
+PORTNAME= Proc-Simple
+PORTVERSION= 1.12
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Proc
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-ReadLine-Gnu/Makefile b/devel/p5-ReadLine-Gnu/Makefile
index 39839d07ed09..597e87f667e5 100644
--- a/devel/p5-ReadLine-Gnu/Makefile
+++ b/devel/p5-ReadLine-Gnu/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-ReadLine-Gnu
-# Version required: 1.09
# Date created: 19 February 1998
# Whom: Matthew Hunt <mph@pobox.com>
#
# $FreeBSD$
#
-DISTNAME= Term-ReadLine-Gnu-1.09
-PKGNAME= p5-ReadLine-Gnu-1.09
+PORTNAME= Term-ReadLine-Gnu
+PORTVERSION= 1.09
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Term
+PKGNAMEPREFIX= p5-
MAINTAINER= mph@freebsd.org
diff --git a/devel/p5-ReadLine-Perl/Makefile b/devel/p5-ReadLine-Perl/Makefile
index c6c0d7885cf2..e33a230ef8e9 100644
--- a/devel/p5-ReadLine-Perl/Makefile
+++ b/devel/p5-ReadLine-Perl/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-ReadLine-Perl
-# Version required: 0.9907
# Date created: 20 February 1998
# Whom: Matthew Hunt <mph@pobox.com>
#
# $FreeBSD$
#
-DISTNAME= Term-ReadLine-Perl-0.9907
-PKGNAME= p5-ReadLine-Perl-0.9907
+PORTNAME= Term-ReadLine-Perl
+PORTVERSION= 0.9907
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Term
+PKGNAMEPREFIX= p5-
MAINTAINER= mph@freebsd.org
diff --git a/devel/p5-Religion/Makefile b/devel/p5-Religion/Makefile
index 2a1569bd2dc5..5c1203c24de4 100644
--- a/devel/p5-Religion/Makefile
+++ b/devel/p5-Religion/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Religion
-# Version required: 1.04
# Date created: October 24th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Religion-1.04
-PKGNAME= p5-Religion-1.04
+PORTNAME= Religion
+PORTVERSION= 1.04
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Religion
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Resources/Makefile b/devel/p5-Resources/Makefile
index 719ac9c39066..c9da51d67774 100644
--- a/devel/p5-Resources/Makefile
+++ b/devel/p5-Resources/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Resources
-# Version required: 1.04
# Date created: October 24th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Resources-1.04
-PKGNAME= p5-Resources-1.04
+PORTNAME= Resources
+PORTVERSION= 1.04
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Resources
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Sort-Versions/Makefile b/devel/p5-Sort-Versions/Makefile
index b6b0c795ca58..604134808ec6 100644
--- a/devel/p5-Sort-Versions/Makefile
+++ b/devel/p5-Sort-Versions/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: p5-Sort-Versions
-# Version required: 1.1
# Date created: June 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= SortVersions-1.1
-PKGNAME= p5-Sort-Versions-1.1
+PORTNAME= SortVersions
+PORTVERSION= 1.1
+PKGNAMEPREFIX= p5-
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Sort
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index c824cbf923d9..a5ee1b3e1fdb 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Storable
-# Version required: 0.6.7
# Date created: July 7th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Storable-0.6.7
-PKGNAME= p5-Storable-0.6.7
+PORTNAME= Storable
+PORTVERSION= 0.6.7
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Storable
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Term-ANSIColor/Makefile b/devel/p5-Term-ANSIColor/Makefile
index 598c56b8a70d..338cb4bf367c 100644
--- a/devel/p5-Term-ANSIColor/Makefile
+++ b/devel/p5-Term-ANSIColor/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: ANSIColor
-# Version required: 1.01
# Date created: 1 December 1999
# Whom: Denis Shaposhnikov <dsh@vlink.ru>
#
# $FreeBSD$
#
-DISTNAME= ANSIColor-1.01
-PKGNAME= p5-Term-ANSIColor-1.01
+PORTNAME= Term-ANSIColor
+PORTVERSION= 1.01
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Term
+DISTNAME= ANSIColor-1.01
+PKGNAMEPREFIX= p5-
MAINTAINER= dsh@vlink.ru
diff --git a/devel/p5-Term-Query/Makefile b/devel/p5-Term-Query/Makefile
index 6a258f6fb8f7..32fc655cef0c 100644
--- a/devel/p5-Term-Query/Makefile
+++ b/devel/p5-Term-Query/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Term-Query
-# Version required: 2.0
# Date created: 21 May 1998
# Whom: Garrett Wollman <wollman@lcs.mit.edu>
#
# $FreeBSD$
#
-DISTNAME= Term-Query-2.0
-PKGNAME= p5-Term-Query-2.0
+PORTNAME= Term-Query
+PORTVERSION= 2.0
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Term
+PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Term-ReadKey/Makefile b/devel/p5-Term-ReadKey/Makefile
index acb9bc635d35..ce2bb92ef1df 100644
--- a/devel/p5-Term-ReadKey/Makefile
+++ b/devel/p5-Term-ReadKey/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Term-ReadKey
-# Version required: 2.12
# Date created: June 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= TermReadKey-2.12
-PKGNAME= p5-Term-ReadKey-2.12
+PORTNAME= TermReadKey
+PORTVERSION= 2.12
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Term
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index 0d86dbd6a77f..334b1b3f50bf 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Time-HiRes
-# Version required: 1.20
# Date created: 13 June 1999
# Whom: Stephen J. Roznowski <sjr@home.net>
#
# $FreeBSD$
#
-DISTNAME= Time-HiRes-01.20
-PKGNAME= p5-Time-HiRes-01.20
+PORTNAME= Time-HiRes
+PORTVERSION= 01.20
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Time
+PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Time/Makefile b/devel/p5-Time/Makefile
index dd6d26430cd4..e00b8f5c2822 100644
--- a/devel/p5-Time/Makefile
+++ b/devel/p5-Time/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for: p5-Time-961002
-# Version required: 98.112901
+# New ports collection makefile for: p5-Time
# Date created: October 12th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Time-modules-98.112901
-PKGNAME= p5-Time-981129
+PORTNAME= Time-modules
+PORTVERSION= 98.112901
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Time
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/p5-TimeDate/Makefile b/devel/p5-TimeDate/Makefile
index 68e770357068..a943bb357902 100644
--- a/devel/p5-TimeDate/Makefile
+++ b/devel/p5-TimeDate/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-TimeDate
-# Version required: 1.08
# Date created: Mon Sep 1 17:03:41 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= TimeDate-1.08
-PKGNAME= p5-TimeDate-1.08
+PORTNAME= TimeDate
+PORTVERSION= 1.08
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Date
+PKGNAMEPREFIX= p5-
MAINTAINER= dima@Chg.RU
diff --git a/devel/p5-TraceFuncs/Makefile b/devel/p5-TraceFuncs/Makefile
index 3974fe65f81a..7d4f50d48836 100644
--- a/devel/p5-TraceFuncs/Makefile
+++ b/devel/p5-TraceFuncs/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-TraceFuncs
-# Version required: 0.1
# Date created: June 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= traceFunc-0.1
-PKGNAME= p5-TraceFuncs-0.1
+PORTNAME= traceFunc
+PORTVERSION= 0.1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Devel
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 73edb9bee134..ed11ac80c2fa 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -1,20 +1,20 @@
# New ports collection makefile for: patch
-# Version required: 2.5
# Date created: 21 Jan 1998
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= patch-2.5
+PORTNAME= patch
+PORTVERSION= 2.5
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= patch
-MAINTAINER= ache@FreeBSD.org
+MAINTAINER= ache@FreeBSD.org
GNU_CONFIGURE= yes
-MAN1= patch.1
+MAN1= patch.1
.include <bsd.port.mk>
diff --git a/devel/pccts/Makefile b/devel/pccts/Makefile
index 6390f967f0be..cb3a689cba90 100644
--- a/devel/pccts/Makefile
+++ b/devel/pccts/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: pccts
-# Version required: 1.33.22
# Date created: 22 June 1997
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= pccts133mr
-PKGNAME= pccts-1.33.22
+PORTNAME= pccts
+PORTVERSION= 1.33.22
CATEGORIES= devel
MASTER_SITES= http://www.polhode.com/
+DISTNAME= pccts133mr
MAINTAINER= obrien@FreeBSD.org
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index c4b9e6c130cb..f3bbd7f554af 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: pcre
-# Version required: 3.1
# Date created: 08 July 1998
# Whom: dom
#
# $FreeBSD$
#
-DISTNAME= pcre-3.1
-CATEGORIES= devel
-MASTER_SITES= ftp://ftp.cus.cam.ac.uk/pub/software/programs/pcre/
+PORTNAME= pcre
+PORTVERSION= 3.1
+CATEGORIES= devel
+MASTER_SITES= ftp://ftp.cus.cam.ac.uk/pub/software/programs/pcre/
-MAINTAINER= dom@myrddin.demon.co.uk
+MAINTAINER= dom@myrddin.demon.co.uk
# Implies GNU_CONFIGURE.
USE_LIBTOOL= yes
diff --git a/devel/pharmacy/Makefile b/devel/pharmacy/Makefile
index 6a8bf7f32858..5758bd4b294f 100644
--- a/devel/pharmacy/Makefile
+++ b/devel/pharmacy/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pharmacy
-# Version required: 0.2.1
# Date created: 02 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= pharmacy-0.2.1
+PORTNAME= pharmacy
+PORTVERSION= 0.2.1
CATEGORIES= devel gnome
MASTER_SITES= http://home.earthlink.net/~nawalker/pharmacy/
diff --git a/devel/picprog/Makefile b/devel/picprog/Makefile
index c0a095216e40..36e0f06547ca 100644
--- a/devel/picprog/Makefile
+++ b/devel/picprog/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: picprog
-# Version required: 1.0
# Date created: 31 August 1999
# Whom: Johan Kerckaert <kirk@bricsnet.com>
#
# $FreeBSD$
#
-DISTNAME= picprog-1.0
+PORTNAME= picprog
+PORTVERSION= 1.0
CATEGORIES= devel
MASTER_SITES= http://hyvatti.iki.fi/~jaakko/pic/
diff --git a/devel/pmake/Makefile b/devel/pmake/Makefile
index 5b5134a314d9..6bc0422c94c5 100644
--- a/devel/pmake/Makefile
+++ b/devel/pmake/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pmake
-# Version required: 2.1.33
# Date created: 12 November 1998
# Whom: steve
#
# $FreeBSD$
#
-DISTNAME= pmake-2.1.33
+PORTNAME= pmake
+PORTVERSION= 2.1.33
CATEGORIES= devel
MASTER_SITES= ftp://ftp.icsi.berkeley.edu/pub/ai/stolcke/software/
EXTRACT_SUFX= .tar.Z
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index d69bee600f09..cb9c6038291c 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: popt
-# Version required: 1.4
# Date Created: 29 Dec 1999
# Whom: Yuan-Chen Cheng <ycheng@sinica.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= popt-1.4
+PORTNAME= popt
+PORTVERSION= 1.4
CATEGORIES= devel
MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/current/SRPMS/SRPMS/ \
ftp://ftp.cdrom.com/pub/linux/redhat/current/SRPMS/SRPMS/
diff --git a/devel/portcheckout/Makefile b/devel/portcheckout/Makefile
index 54cc14170b3c..d9704983963d 100644
--- a/devel/portcheckout/Makefile
+++ b/devel/portcheckout/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: portcheckout
-# Version required: 1.0
# Date created: 1 November 1998
# Whom: wosch
#
# $FreeBSD$
#
-DISTNAME= portcheckout-2.0
+PORTNAME= portcheckout
+PORTVERSION= 2.0
CATEGORIES= devel
-MASTER_SITES= http://www.de.freebsd.org/~wosch/src/
+MASTER_SITES= http://www.de.freebsd.org/~wosch/src/
-MAINTAINER= wosch@FreeBSD.org
+MAINTAINER= wosch@FreeBSD.org
-USE_PERL5= yes
+USE_PERL5= yes
MAN1= portcheckout.1
MANCOMPRESSED= maybe
diff --git a/devel/portlint/Makefile b/devel/portlint/Makefile
index 90db3c62bf3d..af1951f13d4d 100644
--- a/devel/portlint/Makefile
+++ b/devel/portlint/Makefile
@@ -6,7 +6,8 @@
# $FreeBSD$
#
-DISTNAME= portlint-2.1.3
+PORTNAME= portlint
+PORTVERSION= 2.1.3
CATEGORIES= devel
DISTFILES= # empty
diff --git a/devel/prcs/Makefile b/devel/prcs/Makefile
index 168385068370..b6ac9c7fc922 100644
--- a/devel/prcs/Makefile
+++ b/devel/prcs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: prcs
-# Version required: 1.2.4
# Date created: 17 Sep 96
# Whom: jmacd@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= prcs-1.2.8
+PORTNAME= prcs
+PORTVERSION= 1.2.8
CATEGORIES= devel
MASTER_SITES= ftp://ftp.xcf.berkeley.edu/pub/prcs/
diff --git a/devel/pth-devel/Makefile b/devel/pth-devel/Makefile
index 2d5b7e446327..908cf9a77a9a 100644
--- a/devel/pth-devel/Makefile
+++ b/devel/pth-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pth
-# Version required: 1.3b2
# Date Created: 17 Aug 1999
# Whom: Ralf S. Engelschall
#
# $FreeBSD$
#
-DISTNAME= pth-1.3b2
+PORTNAME= pth
+PORTVERSION= 1.3b2
CATEGORIES= devel
MASTER_SITES= ftp://alpha.gnu.org/gnu/pth/ \
ftp://ftp.engelschall.com/sw/pth/
diff --git a/devel/pth/Makefile b/devel/pth/Makefile
index 2080b1cbf962..c4a00c01c29a 100644
--- a/devel/pth/Makefile
+++ b/devel/pth/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pth
-# Version required: 1.3.3
# Date Created: 23 May 1999
# Whom: Ralf S. Engelschall
#
# $FreeBSD$
#
-DISTNAME= pth-1.3.3
+PORTNAME= pth
+PORTVERSION= 1.3.3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.engelschall.com/sw/pth/
diff --git a/devel/py-kjbuckets/Makefile b/devel/py-kjbuckets/Makefile
index cd5c12d2b17f..22358043dea7 100644
--- a/devel/py-kjbuckets/Makefile
+++ b/devel/py-kjbuckets/Makefile
@@ -1,16 +1,17 @@
# Ports collection Makefile for: kjbuckets
-# Version required: 2.2
# Date created: 03/27/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= kjb
-PKGNAME= py-kjbuckets-2.2
-CATEGORIES= devel
+PORTNAME= kjbuckets
+PORTVERSION= 2.2
+CATEGORIES= devel python
MASTER_SITES= http://www.chordate.com/kjbuckets/ \
http://www.nectar.com/distfiles/
+PKGNAMEPREFIX= py-
+DISTNAME= kjb
MAINTAINER= nectar@FreeBSD.org
diff --git a/devel/py-mxDateTime/Makefile b/devel/py-mxDateTime/Makefile
index e138d8d9ad4a..790e90d321a5 100644
--- a/devel/py-mxDateTime/Makefile
+++ b/devel/py-mxDateTime/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: py-mxDateTime
-# Version required: 1.3.0
# Date created: 12 May 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= mxDateTime-1.3.0
-PKGNAME= py-mxDateTime-1.3.0
+PORTNAME= mxDateTime
+PORTVERSION= 1.3.0
CATEGORIES= devel python
MASTER_SITES= http://starship.skyport.net/~lemburg/
+PKGNAMEPREFIX= py-
MAINTAINER= tg@FreeBSD.org
diff --git a/devel/py-mxStack/Makefile b/devel/py-mxStack/Makefile
index 046b71614433..b42f04182a5e 100644
--- a/devel/py-mxStack/Makefile
+++ b/devel/py-mxStack/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: py-mxStack
-# Version required: 0.3.0
# Date created: 14 May 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= mxStack-0.3.0
-PKGNAME= py-mxStack-0.3.0
+PORTNAME= mxStack
+PORTVERSION= 0.3.0
CATEGORIES= devel python
MASTER_SITES= http://starship.skyport.net/~lemburg/
+PKGNAMEPREFIX= py-
MAINTAINER= tg@FreeBSD.org
diff --git a/devel/py-mxTools/Makefile b/devel/py-mxTools/Makefile
index 91b13d4d9b6a..97572a046b7b 100644
--- a/devel/py-mxTools/Makefile
+++ b/devel/py-mxTools/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: py-mxTools
-# Version required: 1.0.0
# Date created: 20 May 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= mxTools-1.0.0
-PKGNAME= py-mxTools-1.0.0
+PORTNAME= mxTools
+PORTVERSION= 1.0.0
CATEGORIES= devel python
MASTER_SITES= http://starship.skyport.net/~lemburg/
+PKGNAMEPREFIX= py-
MAINTAINER= tg@FreeBSD.org
diff --git a/devel/splint/Makefile b/devel/splint/Makefile
index 422dcdd77e5a..615b6b077a15 100644
--- a/devel/splint/Makefile
+++ b/devel/splint/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: lclint
-# Version required: 2.4b
# Date created: 9 September 1996
# Whom: moeding
#
# $FreeBSD$
#
-DISTNAME= lclint-2.4b
+PORTNAME= lclint
+PORTVERSION= 2.4b
CATEGORIES= devel
MASTER_SITES= http://www.sds.lcs.mit.edu/lclint/ftp/lclint/ \
ftp://ftp.deva.net/pub/sources/programming/linting/ \
diff --git a/devel/swig11/Makefile b/devel/swig11/Makefile
index 9b4867e2b13b..857346790b85 100644
--- a/devel/swig11/Makefile
+++ b/devel/swig11/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: SWIG
-# Version required: 1.1p4
# Date created: 19 April 1996
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= swig1.1p5
-PKGNAME= swig-1.1p5
+PORTNAME= swig
+PORTVERSION= 1.1p5
CATEGORIES= devel python tcl82
MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
ftp://ftp.rge.com/pub/languages/swig/ \
ftp://ftp.mcc.ac.uk/pub/mvc/swig/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= erich@FreeBSD.org
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 9b4867e2b13b..857346790b85 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: SWIG
-# Version required: 1.1p4
# Date created: 19 April 1996
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= swig1.1p5
-PKGNAME= swig-1.1p5
+PORTNAME= swig
+PORTVERSION= 1.1p5
CATEGORIES= devel python tcl82
MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
ftp://ftp.rge.com/pub/languages/swig/ \
ftp://ftp.mcc.ac.uk/pub/mvc/swig/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= erich@FreeBSD.org
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 9b4867e2b13b..857346790b85 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: SWIG
-# Version required: 1.1p4
# Date created: 19 April 1996
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= swig1.1p5
-PKGNAME= swig-1.1p5
+PORTNAME= swig
+PORTVERSION= 1.1p5
CATEGORIES= devel python tcl82
MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
ftp://ftp.rge.com/pub/languages/swig/ \
ftp://ftp.mcc.ac.uk/pub/mvc/swig/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= erich@FreeBSD.org
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index f1abb996ff78..67bdd9f9e9d9 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnustep
-# Version required: 0.6.5
# Date created: 03 October 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gstep-core-0.6.5
-PKGNAME= gnustep-0.6.5
+PORTNAME= gnustep
+PORTVERSION= 0.6.5
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
ftp://ftp.peanuts.org/Mirrors/GNUstep/gnustep/core/
+DISTNAME= gstep-core-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index f1abb996ff78..67bdd9f9e9d9 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnustep
-# Version required: 0.6.5
# Date created: 03 October 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gstep-core-0.6.5
-PKGNAME= gnustep-0.6.5
+PORTNAME= gnustep
+PORTVERSION= 0.6.5
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
ftp://ftp.peanuts.org/Mirrors/GNUstep/gnustep/core/
+DISTNAME= gstep-core-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/lang/gnustep-objc/Makefile b/lang/gnustep-objc/Makefile
index f1abb996ff78..67bdd9f9e9d9 100644
--- a/lang/gnustep-objc/Makefile
+++ b/lang/gnustep-objc/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnustep
-# Version required: 0.6.5
# Date created: 03 October 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gstep-core-0.6.5
-PKGNAME= gnustep-0.6.5
+PORTNAME= gnustep
+PORTVERSION= 0.6.5
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
ftp://ftp.peanuts.org/Mirrors/GNUstep/gnustep/core/
+DISTNAME= gstep-core-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/ports-mgmt/portcheckout/Makefile b/ports-mgmt/portcheckout/Makefile
index 54cc14170b3c..d9704983963d 100644
--- a/ports-mgmt/portcheckout/Makefile
+++ b/ports-mgmt/portcheckout/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: portcheckout
-# Version required: 1.0
# Date created: 1 November 1998
# Whom: wosch
#
# $FreeBSD$
#
-DISTNAME= portcheckout-2.0
+PORTNAME= portcheckout
+PORTVERSION= 2.0
CATEGORIES= devel
-MASTER_SITES= http://www.de.freebsd.org/~wosch/src/
+MASTER_SITES= http://www.de.freebsd.org/~wosch/src/
-MAINTAINER= wosch@FreeBSD.org
+MAINTAINER= wosch@FreeBSD.org
-USE_PERL5= yes
+USE_PERL5= yes
MAN1= portcheckout.1
MANCOMPRESSED= maybe
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index 90db3c62bf3d..af1951f13d4d 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -6,7 +6,8 @@
# $FreeBSD$
#
-DISTNAME= portlint-2.1.3
+PORTNAME= portlint
+PORTVERSION= 2.1.3
CATEGORIES= devel
DISTFILES= # empty
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index f1abb996ff78..67bdd9f9e9d9 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnustep
-# Version required: 0.6.5
# Date created: 03 October 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gstep-core-0.6.5
-PKGNAME= gnustep-0.6.5
+PORTNAME= gnustep
+PORTVERSION= 0.6.5
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
ftp://ftp.peanuts.org/Mirrors/GNUstep/gnustep/core/
+DISTNAME= gstep-core-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/gnustep-xgps/Makefile b/x11-toolkits/gnustep-xgps/Makefile
index f1abb996ff78..67bdd9f9e9d9 100644
--- a/x11-toolkits/gnustep-xgps/Makefile
+++ b/x11-toolkits/gnustep-xgps/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnustep
-# Version required: 0.6.5
# Date created: 03 October 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gstep-core-0.6.5
-PKGNAME= gnustep-0.6.5
+PORTNAME= gnustep
+PORTVERSION= 0.6.5
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
ftp://ftp.peanuts.org/Mirrors/GNUstep/gnustep/core/
+DISTNAME= gstep-core-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org