summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/AbiWord/Makefile6
-rw-r--r--editors/AbiWord2/Makefile6
-rw-r--r--editors/abiword-devel/Makefile6
-rw-r--r--editors/abiword/Makefile6
-rw-r--r--editors/aee/Makefile4
-rw-r--r--editors/asedit/Makefile4
-rw-r--r--editors/axe/Makefile6
-rw-r--r--editors/beav/Makefile6
-rw-r--r--editors/biew/Makefile6
-rw-r--r--editors/bpatch/Makefile6
-rw-r--r--editors/bvi/Makefile4
-rw-r--r--editors/color-mate/Makefile4
-rw-r--r--editors/cooledit/Makefile4
-rw-r--r--editors/dedit/Makefile6
-rw-r--r--editors/e93/Makefile6
-rw-r--r--editors/elvis/Makefile6
-rw-r--r--editors/emacs/Makefile4
-rw-r--r--editors/emacs19/Makefile4
-rw-r--r--editors/emacs20-dl/Makefile6
-rw-r--r--editors/emacs20/Makefile4
-rw-r--r--editors/emacs22/Makefile4
-rw-r--r--editors/emacs23/Makefile4
-rw-r--r--editors/fb/Makefile6
-rw-r--r--editors/fine/Makefile6
-rw-r--r--editors/gedit/Makefile4
-rw-r--r--editors/gedit2/Makefile4
-rw-r--r--editors/gnotepad+/Makefile4
-rw-r--r--editors/gxedit/Makefile6
-rw-r--r--editors/hexedit/Makefile4
-rw-r--r--editors/jed/Makefile8
-rw-r--r--editors/joe-devel/Makefile6
-rw-r--r--editors/joe/Makefile6
-rw-r--r--editors/joe2/Makefile6
-rw-r--r--editors/jove/Makefile4
-rw-r--r--editors/le/Makefile4
-rw-r--r--editors/leim20/Makefile4
-rw-r--r--editors/lpe/Makefile4
-rw-r--r--editors/nedit/Makefile4
-rw-r--r--editors/openoffice-1.0/Makefile6
-rw-r--r--editors/openoffice-1.1-devel/Makefile6
-rw-r--r--editors/openoffice-1.1/Makefile6
-rw-r--r--editors/openoffice-2.0-devel/Makefile6
-rw-r--r--editors/openoffice-3-devel/Makefile6
-rw-r--r--editors/openoffice-3/Makefile6
-rw-r--r--editors/openoffice-devel/Makefile6
-rw-r--r--editors/openoffice.org-1.0/Makefile6
-rw-r--r--editors/openoffice.org-1.1-devel/Makefile6
-rw-r--r--editors/openoffice.org-1.1/Makefile6
-rw-r--r--editors/openoffice.org-2-RC/Makefile6
-rw-r--r--editors/openoffice.org-2-devel/Makefile6
-rw-r--r--editors/openoffice.org-2.0-devel/Makefile6
-rw-r--r--editors/openoffice.org-2.0/Makefile6
-rw-r--r--editors/openoffice.org-2/Makefile6
-rw-r--r--editors/openoffice.org-3-RC/Makefile6
-rw-r--r--editors/openoffice.org-3-devel/Makefile6
-rw-r--r--editors/openoffice.org-3/Makefile6
-rw-r--r--editors/openoffice.org-vcltesttool/Makefile6
-rw-r--r--editors/openoffice/Makefile6
-rw-r--r--editors/psgml-emacs20/Makefile1
-rw-r--r--editors/sam/Makefile6
-rw-r--r--editors/staroffice5/Makefile6
-rw-r--r--editors/staroffice52/Makefile6
-rw-r--r--editors/staroffice60/Makefile6
-rw-r--r--editors/staroffice70/Makefile6
-rw-r--r--editors/sted/Makefile4
-rw-r--r--editors/textedit/Makefile4
-rw-r--r--editors/the/Makefile6
-rw-r--r--editors/thoteditor/Makefile6
-rw-r--r--editors/uemacs/Makefile6
-rw-r--r--editors/uzap/Makefile6
-rw-r--r--editors/vigor/Makefile4
-rw-r--r--editors/vile/Makefile4
-rw-r--r--editors/vilearn/Makefile6
-rw-r--r--editors/vim-lite/Makefile3
-rw-r--r--editors/vim/Makefile7
-rw-r--r--editors/vim5/Makefile7
-rw-r--r--editors/vim6/Makefile7
-rw-r--r--editors/wily/Makefile4
-rw-r--r--editors/wordperfect/Makefile6
-rw-r--r--editors/xcoral/Makefile4
-rw-r--r--editors/xed/Makefile6
-rw-r--r--german/staroffice70/Makefile6
82 files changed, 217 insertions, 222 deletions
diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile
index d5a9ac1c4ed5..6876ff03ebd9 100644
--- a/editors/AbiWord/Makefile
+++ b/editors/AbiWord/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: AbiWord
-# Version required: 0.7.6
# Date created: 3 Mar 1999
# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= abi-${VERSION}
-PKGNAME= AbiWord-${VERSION}
+PORTNAME= AbiWord
+PORTVERSION= ${VERSION}
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/Version-${VERSION}/lf/
+DISTNAME= abi-${VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat-${VERSION}.tar.gz \
unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index d5a9ac1c4ed5..6876ff03ebd9 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: AbiWord
-# Version required: 0.7.6
# Date created: 3 Mar 1999
# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= abi-${VERSION}
-PKGNAME= AbiWord-${VERSION}
+PORTNAME= AbiWord
+PORTVERSION= ${VERSION}
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/Version-${VERSION}/lf/
+DISTNAME= abi-${VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat-${VERSION}.tar.gz \
unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index d5a9ac1c4ed5..6876ff03ebd9 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: AbiWord
-# Version required: 0.7.6
# Date created: 3 Mar 1999
# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= abi-${VERSION}
-PKGNAME= AbiWord-${VERSION}
+PORTNAME= AbiWord
+PORTVERSION= ${VERSION}
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/Version-${VERSION}/lf/
+DISTNAME= abi-${VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat-${VERSION}.tar.gz \
unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index d5a9ac1c4ed5..6876ff03ebd9 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: AbiWord
-# Version required: 0.7.6
# Date created: 3 Mar 1999
# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= abi-${VERSION}
-PKGNAME= AbiWord-${VERSION}
+PORTNAME= AbiWord
+PORTVERSION= ${VERSION}
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/Version-${VERSION}/lf/
+DISTNAME= abi-${VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat-${VERSION}.tar.gz \
unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz
diff --git a/editors/aee/Makefile b/editors/aee/Makefile
index 67d2e5b711d5..e9d120aea0f9 100644
--- a/editors/aee/Makefile
+++ b/editors/aee/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: aee
-# Version required: 2.2.1
# Date created: 19 Aug 1999
# Whom: Kelly Yancey <kbyanc@posi.net>
#
# $FreeBSD$
#
-DISTNAME= aee-2.2.1
+PORTNAME= aee
+PORTVERSION= 2.2.1
CATEGORIES= editors
MASTER_SITES= http://www.users.uswest.net/~hmahon/sources/ \
http://awwm.linuxberg.com/files/console/network/ \
diff --git a/editors/asedit/Makefile b/editors/asedit/Makefile
index aa76b5d274cf..b5634b43e302 100644
--- a/editors/asedit/Makefile
+++ b/editors/asedit/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: asedit
-# Version required: 1.3.2
# Date created: 28 Jul 1996
#
# Whom: Andreas Kohout <shanee@augusta.de>
@@ -7,7 +6,8 @@
# $FreeBSD$
#
-DISTNAME= asedit-1.3.2
+PORTNAME= asedit
+PORTVERSION= 1.3.2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= editors
diff --git a/editors/axe/Makefile b/editors/axe/Makefile
index 9ef34d5273f0..bce24f48ee65 100644
--- a/editors/axe/Makefile
+++ b/editors/axe/Makefile
@@ -1,12 +1,12 @@
-# New ports collection makefile for: aXe-6.1.2
-# Version required: 6.1.2
+# New ports collection makefile for: aXe
# Date created: 28 December 1994
# Whom: jc@irbs.com John Capo
#
# $FreeBSD$
#
-DISTNAME= aXe-6.1.2
+PORTNAME= aXe
+PORTVERSION= 6.1.2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= editors
diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index 1c316c43d714..bd8c44b76b06 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: beav
-# Version required: 1.40-13 (debian)
# Date created: 01 July 1995
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= beav_1.40-13
-PKGNAME= beav-1.40.13
+PORTNAME= beav
+PORTVERSION= 1.40.13
CATEGORIES= editors
MASTER_SITES= ftp://ftp.debian.org/debian/dists/stable/main/source/editors/
+DISTNAME= ${PORTNAME}_1.40-13
MAINTAINER= jseger@FreeBSD.org
diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index 5d48b51c67c5..6c5d06413ab1 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: biew
-# Version required: 5.0.1
# Date created: 04 February 2000
# Whom: Michael Vasilenko <acid@stu.cn.ua>
#
# $FreeBSD$
#
-DISTNAME= biew-501
-PKGNAME= biew-5.01
+PORTNAME= biew
+PORTVERSION= 5.01
CATEGORIES= editors
MASTER_SITES= ftp://biew.sourceforge.net/pub/biew/5.x/src/ \
http://download.sourceforge.net/biew/
+DISTNAME= ${PORTNAME}-501
MAINTAINER= ports@FreeBSD.org
diff --git a/editors/bpatch/Makefile b/editors/bpatch/Makefile
index f1d2b5fecf98..404212205687 100644
--- a/editors/bpatch/Makefile
+++ b/editors/bpatch/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: bpatch
-# Version required: no version information
# Date created: 18 March 1996
# Whom: joerg
#
# $FreeBSD$
#
-DISTNAME= bpatch
-PKGNAME= bpatch-1.0
+PORTNAME= bpatch
+PORTVERSION= 1.0
CATEGORIES= editors
MASTER_SITES= ftp://ftp.interface-business.de/pub/outgoing/
+DISTNAME= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index a14f32c480b4..eaab258a42de 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bvi
-# Version required: 1.2.0
# Date created: 05 November 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= bvi-1.2.0
+PORTNAME= bvi
+PORTVERSION= 1.2.0
CATEGORIES= editors
MASTER_SITES= http://bvi.linuxave.net/download/
EXTRACT_SUFX= .src.tar.gz
diff --git a/editors/color-mate/Makefile b/editors/color-mate/Makefile
index 6dc2d0cf5cdf..3b7502cc5dd3 100644
--- a/editors/color-mate/Makefile
+++ b/editors/color-mate/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: color-mate for emacs
-# Version required: 1.0.0.1
# Date created: 99/09/29
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= color-mate-10.0.1
+PORTNAME= color-mate
+PORTVERSION= 10.0.1
CATEGORIES= editors elisp
MASTER_SITES= http://www.netlab.is.tsukuba.ac.jp/~yokota/archive/
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 35bf6441fffd..5f666fae1b45 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cooledit
-# Version required: 3.11.3
# Date created: 18 November 1997
# Whom: brett@peloton.physics.montana.edu
#
# $FreeBSD$
#
-DISTNAME= cooledit-3.13.2
+PORTNAME= cooledit
+PORTVERSION= 3.13.2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www.netins.net/showcase/Comput-IT/cooledit/src/
diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile
index ff805558e001..3f25bc7662a6 100644
--- a/editors/dedit/Makefile
+++ b/editors/dedit/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: dedit
-# Version required: 0.5.6
# Date created: 26 January 2000
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= dedit_0.5.6
-PKGNAME= dedit-0.5.6
+PORTNAME= dedit
+PORTVERSION= 0.5.6
CATEGORIES= editors
MASTER_SITES= ftp://ftp.debian.org/debian/dists/unstable/main/source/editors/
+DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/editors/e93/Makefile b/editors/e93/Makefile
index 25fc08c8ce72..09ff4ceef9b0 100644
--- a/editors/e93/Makefile
+++ b/editors/e93/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: e93
-# Version required: 1.2r7X
# Date created: 21 June 1995
# Whom: Satoshi Asami (asami)
#
# $FreeBSD$
#
-DISTNAME= e93-1.2r7X
-PKGNAME= e93-1.2.7
+PORTNAME= e93
+PORTVERSION= 1.2.7
CATEGORIES= editors tcl82
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= editors
+DISTNAME= ${PORTNAME}-1.2r7X
MAINTAINER= ports@FreeBSD.org
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index 587f56d4c80f..16a0dc773b77 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: elvis
-# Version required: 2.1.4
# Date created: 1999-09-01
# Whom: Christian Weisgerber <naddy@unix-ag.uni-kl.de>
#
# $FreeBSD$
#
-DISTNAME= elvis-2.1_4
-PKGNAME= elvis-2.1.4
+PORTNAME= elvis
+PORTVERSION= 2.1.4
CATEGORIES= editors
MASTER_SITES= ftp://ftp.cs.pdx.edu/pub/elvis/ \
ftp://ftp.false.com/pub/elvis/ \
ftp://ftp.fh-wedel.de/pub/elvis/
+DISTNAME= ${PORTNAME}-2.1_4
MAINTAINER= ports@FreeBSD.org
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index cf00be6d1635..fd21bc2971ae 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: GNU emacs
-# Version required: 19.34b
# Date created: 29 October 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= emacs-19.34b
+PORTNAME= emacs
+PORTVERSION= 19.34b
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile
index cf00be6d1635..fd21bc2971ae 100644
--- a/editors/emacs19/Makefile
+++ b/editors/emacs19/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: GNU emacs
-# Version required: 19.34b
# Date created: 29 October 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= emacs-19.34b
+PORTNAME= emacs
+PORTVERSION= 19.34b
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile
index 528168d97940..ca41aab9bd40 100644
--- a/editors/emacs20-dl/Makefile
+++ b/editors/emacs20-dl/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: GNU emacs with dl
-# Version required: 20.6
# Date created: 10 October 1998
# Whom: shige
#
# $FreeBSD$
#
-DISTNAME= emacs-20.6
-PKGNAME= emacs-dl-20.6
+PORTNAME= emacs-dl
+PORTVERSION= 20.6
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
+DISTNAME= emacs-${PORTVERSION}
PATCH_SITES= ftp://ftp.m17n.org/pub/mule/dynamic-loading/ \
http://www.etl.go.jp/~tomo/comp/emacsen/
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 8e6cd456c638..3640b925ea0b 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: GNU emacs
-# Version required: 20.6
# Date created: 29 October 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= emacs-20.6
+PORTNAME= emacs
+PORTVERSION= 20.6
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index cf00be6d1635..fd21bc2971ae 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: GNU emacs
-# Version required: 19.34b
# Date created: 29 October 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= emacs-19.34b
+PORTNAME= emacs
+PORTVERSION= 19.34b
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index cf00be6d1635..fd21bc2971ae 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: GNU emacs
-# Version required: 19.34b
# Date created: 29 October 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= emacs-19.34b
+PORTNAME= emacs
+PORTVERSION= 19.34b
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
diff --git a/editors/fb/Makefile b/editors/fb/Makefile
index 83a4f67b1e4a..923a6d9e1275 100644
--- a/editors/fb/Makefile
+++ b/editors/fb/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: fb
-# Version required: 1.5
# Date created: Oct 15, 1999
# Whom: Mikhail Teterin
#
# $FreeBSD$
#
-DISTNAME= fb
-PKGNAME= fb-1.5
+PORTNAME= fb
+PORTVERSION= 1.5
CATEGORIES= editors
MASTER_SITES= http://home.MHO.net/JSwaby/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= _tar.gz
MAINTAINER= mi@aldan.algebra.com
diff --git a/editors/fine/Makefile b/editors/fine/Makefile
index ef2d969afcb2..7bd07f318f43 100644
--- a/editors/fine/Makefile
+++ b/editors/fine/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: FINE
-# Version required: 2.1
# Date created: 17 August 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= fine2.3
-PKGNAME= fine-2.3
+PORTNAME= fine
+PORTVERSION= 2.3
CATEGORIES= editors
MASTER_SITES= ftp://razor.fer.uni-lj.si/pub/software/bojank/fine/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= cpiazza@FreeBSD.org
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index d8ca98b3e23e..366d7207edce 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gedit
-# Version required: 0.6.1
# Date created: 4 May 1999
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= gedit-0.6.1
+PORTNAME= gedit
+PORTVERSION= 0.6.1
CATEGORIES= editors gnome
MASTER_SITES= http://gedit.pn.org/tar/
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index d8ca98b3e23e..366d7207edce 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gedit
-# Version required: 0.6.1
# Date created: 4 May 1999
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= gedit-0.6.1
+PORTNAME= gedit
+PORTVERSION= 0.6.1
CATEGORIES= editors gnome
MASTER_SITES= http://gedit.pn.org/tar/
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index ee46fa8c275b..df100a90f3f9 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnotepad+
-# Version required: 1.1.4
# Date created: 08-March-1999
# Whom: brett@peloton.physics.montana.edu
#
# $FreeBSD$
#
-DISTNAME= gnotepad+-1.1.4
+PORTNAME= gnotepad+
+PORTVERSION= 1.1.4
CATEGORIES= editors www
MASTER_SITES= http://ack.netpedia.net/gnp/
diff --git a/editors/gxedit/Makefile b/editors/gxedit/Makefile
index 33036331bc45..b6104d846b0d 100644
--- a/editors/gxedit/Makefile
+++ b/editors/gxedit/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gxedit
-# Version required: 1.23
# Date created: 01 Jul 1998
# Whom: Dom Mitchell <dom@myrddin.demon.co.uk>
#
# $FreeBSD$
#
-DISTNAME= GXedit1.23
-PKGNAME= gxedit-1.23
+PORTNAME= gxedit
+PORTVERSION= 1.23
CATEGORIES= editors
MASTER_SITES= http://mirrors.darkelf.net/GXedit/ \
http://www.linuxbox.com/~drow/GXedit/
+DISTNAME= GXedit${PORTVERSION}
MAINTAINER= dom@myrddin.demon.co.uk
diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index eafbfc40ebb9..d245a1870458 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: hexedit
-# Version required: 1.0.0
# Date created: 5 August 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= hexedit-1.1.0
+PORTNAME= hexedit
+PORTVERSION= 1.1.0
CATEGORIES= editors
MASTER_SITES= http://www.chez.com/prigaux/ \
${MASTER_SITE_SUNSITE}
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index fe1aaecbeeae..7ccc075b36e8 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Jed text editor
-# Version required: 0.98-7
# Date created: 22 APR 1997
# Whom: eric
#
# $FreeBSD$
#
-DISTNAME= jed0.98-7
-PKGNAME= jed-0.98.7
+PORTNAME= jed
+PORTVERSION= 0.98.7
CATEGORIES= editors
-MASTER_SITES= ftp://space.mit.edu/pub/davis/jed/v0.98/
+MASTER_SITES= ftp://space.mit.edu/pub/davis/jed/v0.98/
+DISTNAME= ${PORTNAME}0.98-7
PATCH_SITES= ftp://space.mit.edu/pub/davis/jed/v0.98/
PATCHFILES= BUGS
diff --git a/editors/joe-devel/Makefile b/editors/joe-devel/Makefile
index 837fa20725ab..3f31fb0f50f9 100644
--- a/editors/joe-devel/Makefile
+++ b/editors/joe-devel/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: joe
-# Version required: 2.8
# Date created: 01 Jul 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= joe2.8
-PKGNAME= joe-2.8
+PORTNAME= joe
+PORTVERSION= 2.8
CATEGORIES= editors
MASTER_SITES= ftp://ftp.std.com/src/editors/
+DISTNAME= ${PORTNAME}${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= will@FreeBSD.org
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 837fa20725ab..3f31fb0f50f9 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: joe
-# Version required: 2.8
# Date created: 01 Jul 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= joe2.8
-PKGNAME= joe-2.8
+PORTNAME= joe
+PORTVERSION= 2.8
CATEGORIES= editors
MASTER_SITES= ftp://ftp.std.com/src/editors/
+DISTNAME= ${PORTNAME}${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= will@FreeBSD.org
diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile
index 837fa20725ab..3f31fb0f50f9 100644
--- a/editors/joe2/Makefile
+++ b/editors/joe2/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: joe
-# Version required: 2.8
# Date created: 01 Jul 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= joe2.8
-PKGNAME= joe-2.8
+PORTNAME= joe
+PORTVERSION= 2.8
CATEGORIES= editors
MASTER_SITES= ftp://ftp.std.com/src/editors/
+DISTNAME= ${PORTNAME}${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= will@FreeBSD.org
diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index b4fe3be09706..b53ace23fe0b 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: jove
-# Version required: 4.16
# Date created: 21 August 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= jove-4.16
+PORTNAME= jove
+PORTVERSION= 4.16
CATEGORIES= editors
MASTER_SITES= ftp://relay.cs.toronto.edu/pub/moraes/jove/
diff --git a/editors/le/Makefile b/editors/le/Makefile
index d4087226909c..36360c0d8c21 100644
--- a/editors/le/Makefile
+++ b/editors/le/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: le
-# Version required: 1.5.7
# Date created: 16 October 1997
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= le-1.5.7
+PORTNAME= le
+PORTVERSION= 1.5.7
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://ftp.yars.free.net/pub/software/unix/util/texteditors/
diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile
index 771e1a61543d..67697f6e9de9 100644
--- a/editors/leim20/Makefile
+++ b/editors/leim20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: LEIM for emacs20
-# Version required: 20.6
# Date created: 10 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= leim-20.6
+PORTNAME= leim
+PORTVERSION= 20.6
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index 6d266e9ba85a..182d708e319a 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: lpe
-# Version required: 1.2.4
# Date created: 12 April 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= lpe-1.2.4
+PORTNAME= lpe
+PORTVERSION= 1.2.4
CATEGORIES= editors
MASTER_SITES= http://cdsmith.twu.net/lpe/
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 003301f88c4e..091f23760311 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nedit
-# Version required: 5.0.2
# Date created: 7 April 1996
# Whom: Daniel Eischen <deischen@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= nedit-5.1.1
+PORTNAME= nedit
+PORTVERSION= 5.1.1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nedit.org/pub/v5_1_1/ \
ftp://ftp.nedit.org/pub/contrib/misc/
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/psgml-emacs20/Makefile b/editors/psgml-emacs20/Makefile
index cb846f037f3f..793006bfbe79 100644
--- a/editors/psgml-emacs20/Makefile
+++ b/editors/psgml-emacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: psgml for emacs20
-# Version required: 1.1.6
# Date created: 23 January 1999
# Whom: shige
#
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 225772fe8f1c..f9eef4a22e70 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: sam
-# Version required: 4.3
# Date created: Sun Aug 13 12:36:14 CDT 1995
# Whom: erich@rrnet.com
#
# $FreeBSD$
#
-DISTNAME= sam
-PKGNAME= sam-4.3
+PORTNAME= sam
+PORTVERSION= 4.3
CATEGORIES= editors plan9
MASTER_SITES= ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .msg.gz
MAINTAINER= erich@FreeBSD.org
diff --git a/editors/staroffice5/Makefile b/editors/staroffice5/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/staroffice5/Makefile
+++ b/editors/staroffice5/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/staroffice52/Makefile
+++ b/editors/staroffice52/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/editors/sted/Makefile b/editors/sted/Makefile
index 8847fd87ba4b..0a4b3192a0b5 100644
--- a/editors/sted/Makefile
+++ b/editors/sted/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sted
-# Version required: 0.2.2
# Date created: 19 May 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= sted-0.2.2
+PORTNAME= sted
+PORTVERSION= 0.2.2
CATEGORIES= editors
MASTER_SITES= http://user.tninet.se/~uxm165t/
diff --git a/editors/textedit/Makefile b/editors/textedit/Makefile
index 43f3f8d7714c..c879d7ee6b52 100644
--- a/editors/textedit/Makefile
+++ b/editors/textedit/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: textedit
-# Version required: 1.0
# Date created: 3 January 1998
# Whom: jraynard
#
# $FreeBSD$
#
-DISTNAME= textedit-1.0
+PORTNAME= textedit
+PORTVERSION= 1.0
CATEGORIES= editors
MASTER_SITES= http://people.FreeBSD.org/~fenner/distfiles/
diff --git a/editors/the/Makefile b/editors/the/Makefile
index dcc7d90b60aa..d49108ba582a 100644
--- a/editors/the/Makefile
+++ b/editors/the/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: THE
-# Version required: 3.0
# Date created: 7 May 1999
# Whom: giffunip@asme.org
#
# $FreeBSD$
#
-DISTNAME= THE-3.0
-PKGNAME= the-3.0
+PORTNAME= the
+PORTVERSION= 3.0
CATEGORIES= editors
MASTER_SITES= ftp://ftp.lightlink.com/pub/hessling/THE/ \
ftp://ftp.qut.edu.au/pub/markh/THE/ \
ftp://ftp.wu-wien.ac.at/pub/src/Editors/THE/
+DISTNAME= THE-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/editors/thoteditor/Makefile b/editors/thoteditor/Makefile
index 55717e1b81e6..516619961dc6 100644
--- a/editors/thoteditor/Makefile
+++ b/editors/thoteditor/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: thot
-# Version required: 2.1e
# Date created: 1 Aug 1997
# Whom: Pedro Giffuni (orig)
#
# $FreeBSD$
#
-DISTNAME= thoteditor-src-2.1e
-PKGNAME= thoteditor-2.1
+PORTNAME= thoteditor
+PORTVERSION= 2.1e
CATEGORIES= editors www
MASTER_SITES= ftp://ftp.inrialpes.fr/pub/opera/sources/thot/ \
${MASTER_SITE_SUNSITE} \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://ftp.inrialpes.fr/pub/opera/sources/thot/ \
ftp://ftp.netlab.is.tsukuba.ac.jp/pub/editors/opera.inrialpes.fr/sources/thot/ \
ftp://ftp.agix.net/pub/infosystems/www/clients/amaya/thot/
MASTER_SITE_SUBDIR= apps/editors/X/thot
+DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= chuckr@FreeBSD.org
diff --git a/editors/uemacs/Makefile b/editors/uemacs/Makefile
index 0b28c4db4945..720bd41649f0 100644
--- a/editors/uemacs/Makefile
+++ b/editors/uemacs/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: MicroEmacs
-# Version required: 4.0
# Date created: 16 Jan 1995
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= ue400dev
-PKGNAME= uemacs-4.0
+PORTNAME= uemacs
+PORTVERSION= 4.0
CATEGORIES= editors
MASTER_SITES= ftp://aquest.com/pub/uemacs400/disk2/
+DISTNAME= ue400dev
MAINTAINER= ports@FreeBSD.org
diff --git a/editors/uzap/Makefile b/editors/uzap/Makefile
index 2dbb629b2018..55a210e4e634 100644
--- a/editors/uzap/Makefile
+++ b/editors/uzap/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: uzap
-# Version required: 1.0
# Date created: 19 Jun 1995
# Whom: joerg
#
# $FreeBSD$
#
-DISTNAME= uzap
-PKGNAME= uzap-1.0
+PORTNAME= uzap
+PORTVERSION= 1.0
CATEGORIES= editors
MASTER_SITES= ftp://ftp.interface-business.de/pub/outgoing/
+DISTNAME= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index 1850951804f7..4a5e79fe7d83 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: vigor
-# Version required: 0.014
# Date created: 17 Jan 2000
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= vigor-0.014
+PORTNAME= vigor
+PORTVERSION= 0.014
CATEGORIES= editors tk82 tcl82
MASTER_SITES= http://www.red-bean.com:8080/
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index eeba7832818d..2c64484c4e04 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: vile
-# Version required: 9.1
# Date created: Wed Nov 26, 1996
# Whom: pgf
#
# $FreeBSD$
#
-DISTNAME= vile-9.1
+PORTNAME= vile
+PORTVERSION= 9.1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.phred.org/pub/vile/ \
ftp://id.wing.net/pub/pgf/vile/
diff --git a/editors/vilearn/Makefile b/editors/vilearn/Makefile
index 71947bbdf00e..6c4995c4a082 100644
--- a/editors/vilearn/Makefile
+++ b/editors/vilearn/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: vilearn
-# Version required: 1.0
# Date created: 12 Dec 1997
# Whom: Ian Vaudrey <i.vaudrey@bigfoot.com>
#
# $FreeBSD$
#
-DISTNAME= vilearn
-PKGNAME= vilearn-1.0
+PORTNAME= vilearn
+PORTVERSION= 1.0
CATEGORIES= editors
MASTER_SITES= ftp://ftp.funet.fi/pub/Linux/util/networking/util-swan/pub/misc/ \
ftp://ftp.mcc.ac.uk/pub/linux/fi.mirror/util/networking/util-swan/pub/misc/ \
ftp://ftp.tu-chemnitz.de/pub/linux/funet-mirror/util/networking/util-swan/pub/misc/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .Z
MAINTAINER= i.vaudrey@bigfoot.com
diff --git a/editors/vim-lite/Makefile b/editors/vim-lite/Makefile
index e099294d69c9..afa63934af00 100644
--- a/editors/vim-lite/Makefile
+++ b/editors/vim-lite/Makefile
@@ -1,13 +1,12 @@
# ex:ts=8
# Ports collection makefile for: vim-lite
-# Version required: 0.0
# Date created: Fri Jun 25, 1999
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-PKGNAME= vim-lite-${PKGVER}
+PORTNAME= vim-lite
LITE= yes
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index b48dfc32e27e..65f6ea60880e 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,15 +1,13 @@
# ex:ts=8
# Ports collection makefile for: vim
-# Version required: 0.0
# Date created: Sat June 29, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-PKGVER= 5.6.12
-DISTNAME= vim-5.6
-PKGNAME?= vim-${PKGVER}
+PORTNAME?= vim
+PORTVERSION= 5.6.12
CATEGORIES= editors
MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
ftp://ftp.nuxi.com/pub/vim/unix/ \
@@ -17,6 +15,7 @@ MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
ftp://ftp.prz.tu-berlin.de/pub/unix/editors/vim/unix/ \
ftp://ftp.is.co.za/applications/editors/vim/ \
ftp://ftp.progsoc.uts.edu.au/pub/vim/
+DISTNAME= vim-5.6
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} ${DISTNAME}-rt${EXTRACT_SUFX}
PATCH_SITES= ${MASTER_SITES:S/unix/patches/}
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index b48dfc32e27e..65f6ea60880e 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -1,15 +1,13 @@
# ex:ts=8
# Ports collection makefile for: vim
-# Version required: 0.0
# Date created: Sat June 29, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-PKGVER= 5.6.12
-DISTNAME= vim-5.6
-PKGNAME?= vim-${PKGVER}
+PORTNAME?= vim
+PORTVERSION= 5.6.12
CATEGORIES= editors
MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
ftp://ftp.nuxi.com/pub/vim/unix/ \
@@ -17,6 +15,7 @@ MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
ftp://ftp.prz.tu-berlin.de/pub/unix/editors/vim/unix/ \
ftp://ftp.is.co.za/applications/editors/vim/ \
ftp://ftp.progsoc.uts.edu.au/pub/vim/
+DISTNAME= vim-5.6
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} ${DISTNAME}-rt${EXTRACT_SUFX}
PATCH_SITES= ${MASTER_SITES:S/unix/patches/}
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index b48dfc32e27e..65f6ea60880e 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -1,15 +1,13 @@
# ex:ts=8
# Ports collection makefile for: vim
-# Version required: 0.0
# Date created: Sat June 29, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-PKGVER= 5.6.12
-DISTNAME= vim-5.6
-PKGNAME?= vim-${PKGVER}
+PORTNAME?= vim
+PORTVERSION= 5.6.12
CATEGORIES= editors
MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
ftp://ftp.nuxi.com/pub/vim/unix/ \
@@ -17,6 +15,7 @@ MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
ftp://ftp.prz.tu-berlin.de/pub/unix/editors/vim/unix/ \
ftp://ftp.is.co.za/applications/editors/vim/ \
ftp://ftp.progsoc.uts.edu.au/pub/vim/
+DISTNAME= vim-5.6
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} ${DISTNAME}-rt${EXTRACT_SUFX}
PATCH_SITES= ${MASTER_SITES:S/unix/patches/}
diff --git a/editors/wily/Makefile b/editors/wily/Makefile
index 171644856408..95c466ba0b7e 100644
--- a/editors/wily/Makefile
+++ b/editors/wily/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wily
-# Version required: 0.13.36
# Date created: 23 September 1997
# Whom: koshy
#
# $FreeBSD$
#
-DISTNAME= wily-0.13.41
+PORTNAME= wily
+PORTVERSION= 0.13.41
CATEGORIES= editors plan9
MASTER_SITES= ftp://ftp.northsea.com/pub/plan9_unix/wily/src/ \
ftp://ftp.cs.york.ac.uk/pub/mhw/wily/src/ \
diff --git a/editors/wordperfect/Makefile b/editors/wordperfect/Makefile
index 2e5b887804ae..21a2f38360a4 100644
--- a/editors/wordperfect/Makefile
+++ b/editors/wordperfect/Makefile
@@ -1,5 +1,4 @@
# ports collection makefile for: wordperfect
-# Version required: 8.0
# Date created: 1998-Dec-10
# Whom: dugsong@OpenBSD.ORG
# msmith@freebsd.org
@@ -7,10 +6,11 @@
#
# $FreeBSD$
-DISTNAME= GUILG00
-PKGNAME= wordperfect-8.0
+PORTNAME= wordperfect
+PORTVERSION= 8.0
CATEGORIES= editors linux
MASTER_SITES=
+DISTNAME= GUILG00
EXTRACT_SUFX= .GZ
MAINTAINER= msmith@freebsd.org
diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile
index 88ccb93787c4..3e1fb881f757 100644
--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xcoral
-# Version required: 3.2
# Date created: 1995/10/02
# Whom: erich@rrnet.com
#
# $FreeBSD$
#
-DISTNAME= xcoral-3.2
+PORTNAME= xcoral
+PORTVERSION= 3.2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= editors
diff --git a/editors/xed/Makefile b/editors/xed/Makefile
index 9c762948be63..758f85ee4c6f 100644
--- a/editors/xed/Makefile
+++ b/editors/xed/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xed
-# Version required: 1.3
# Date created: 28 Jul 1996
# Whom: shanee
#
# $FreeBSD$
#
-DISTNAME= xed1.3
-PKGNAME= xed-1.3
+PORTNAME= xed
+PORTVERSION= 1.3
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= editors
+DISTNAME= ${PORTNAME}${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= shanee@augusta.de
diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile
index a257a6f90582..35ee080456e7 100644
--- a/german/staroffice70/Makefile
+++ b/german/staroffice70/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: StarOffice 5.1a
-# Version required: 5.1a
# Date created: 30 October 1999
# Whom: dkwiebe
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_01
-PKGNAME= staroffice-5.1a
+PORTNAME= staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= http://afug.hypermart.net/files/ \
http://www.hagenhomes.com/freebsd/files/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_01
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so