aboutsummaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
Diffstat (limited to 'textproc')
-rw-r--r--textproc/agrep/Makefile4
-rw-r--r--textproc/aspell/Makefile6
-rw-r--r--textproc/br-ispell/Makefile7
-rw-r--r--textproc/british-ispell/Makefile4
-rw-r--r--textproc/c2html/Makefile4
-rw-r--r--textproc/catdoc/Makefile4
-rw-r--r--textproc/chpp/Makefile4
-rw-r--r--textproc/cocoon/Makefile6
-rw-r--r--textproc/code2html/Makefile4
-rw-r--r--textproc/cole/Makefile4
-rw-r--r--textproc/dict/Makefile4
-rw-r--r--textproc/diffstat/Makefile4
-rw-r--r--textproc/docbook-241/Makefile4
-rw-r--r--textproc/docbook-300/Makefile4
-rw-r--r--textproc/docbook-310/Makefile6
-rw-r--r--textproc/docbook-400/Makefile6
-rw-r--r--textproc/docbook-sk/Makefile6
-rw-r--r--textproc/docbook-xml/Makefile6
-rw-r--r--textproc/docbook/Makefile7
-rw-r--r--textproc/docproj/Makefile5
-rw-r--r--textproc/dsssl-docbook-modular/Makefile6
-rw-r--r--textproc/dtd-catalogs/Makefile4
-rw-r--r--textproc/expat/Makefile6
-rw-r--r--textproc/expat2/Makefile6
-rw-r--r--textproc/freegrep/Makefile6
-rw-r--r--textproc/gaspell/Makefile6
-rw-r--r--textproc/gdict/Makefile4
-rw-r--r--textproc/glimpse/Makefile6
-rw-r--r--textproc/grap/Makefile4
-rw-r--r--textproc/gtkdiff/Makefile4
-rw-r--r--textproc/gxditview/Makefile5
-rw-r--r--textproc/hevea/Makefile4
-rw-r--r--textproc/htdig/Makefile4
-rw-r--r--textproc/html/Makefile4
-rw-r--r--textproc/info2html/Makefile4
-rw-r--r--textproc/isearch/Makefile6
-rw-r--r--textproc/iso12083/Makefile4
-rw-r--r--textproc/iso8879/Makefile6
-rw-r--r--textproc/ispell/Makefile5
-rw-r--r--textproc/jade/Makefile4
-rw-r--r--textproc/java2html/Makefile4
-rw-r--r--textproc/latex2html/Makefile4
-rw-r--r--textproc/latte/Makefile4
-rw-r--r--textproc/libxml/Makefile4
-rw-r--r--textproc/libxml2/Makefile4
-rw-r--r--textproc/linuxdoc/Makefile4
-rw-r--r--textproc/lotusxsl/Makefile6
-rw-r--r--textproc/man2html/Makefile6
-rw-r--r--textproc/mgdiff/Makefile6
-rw-r--r--textproc/mswordview/Makefile6
-rw-r--r--textproc/nfbtrans/Makefile6
-rw-r--r--textproc/nicetext/Makefile4
-rw-r--r--textproc/no-ispell/Makefile4
-rw-r--r--textproc/openjade/Makefile4
-rw-r--r--textproc/p5-Text-CSV_XS/Makefile5
-rw-r--r--textproc/p5-Text-Template/Makefile6
-rw-r--r--textproc/p5-XML-DOM/Makefile6
-rw-r--r--textproc/p5-XML-Parser/Makefile6
-rw-r--r--textproc/par/Makefile6
-rw-r--r--textproc/perl2html/Makefile4
-rw-r--r--textproc/py-mxTextTools/Makefile6
-rw-r--r--textproc/py-xml/Makefile6
-rw-r--r--textproc/rand/Makefile4
-rw-r--r--textproc/rman/Makefile4
-rw-r--r--textproc/sarep/Makefile5
-rw-r--r--textproc/se-ispell/Makefile6
-rw-r--r--textproc/sgmlformat/Makefile4
-rw-r--r--textproc/sgrep/Makefile4
-rw-r--r--textproc/sgrep2/Makefile4
-rw-r--r--textproc/sp/Makefile4
-rw-r--r--textproc/texi2html/Makefile6
-rw-r--r--textproc/textutils/Makefile4
-rw-r--r--textproc/tkdiff/Makefile4
-rw-r--r--textproc/tth/Makefile6
-rw-r--r--textproc/txt2html/Makefile4
-rw-r--r--textproc/unroff/Makefile6
-rw-r--r--textproc/urlview/Makefile4
-rw-r--r--textproc/wdiff/Makefile4
-rw-r--r--textproc/word2x/Makefile5
-rw-r--r--textproc/wv/Makefile6
-rw-r--r--textproc/xlhtml/Makefile7
-rw-r--r--textproc/xls2xml/Makefile4
-rw-r--r--textproc/xml4j/Makefile6
-rw-r--r--textproc/xp/Makefile9
-rw-r--r--textproc/xt/Makefile6
-rw-r--r--textproc/yodl/Makefile4
86 files changed, 212 insertions, 216 deletions
diff --git a/textproc/agrep/Makefile b/textproc/agrep/Makefile
index 66abbe4e8421..a7be73015a58 100644
--- a/textproc/agrep/Makefile
+++ b/textproc/agrep/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: agrep
-# Version required: 0.0
# Date created: Fri May 23, 1997
# Whom: David O'Brien (obrien@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= agrep-2.04
+PORTNAME= agrep
+PORTVERSION= 2.0.4
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.cs.arizona.edu/agrep/
EXTRACT_SUFX= .tar.Z
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 14b55526ee1f..5f05ace4cd5c 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: aspell
-# Version required: 0.29.1
# Date created: 7 December 1998
# Whom: Josh Gilliam <josh@quick.net>
#
# $FreeBSD$
#
-DISTNAME= aspell-.29.1
-PKGNAME= aspell-0.29.1
+PORTNAME= aspell
+PORTVERSION= 0.29.1
CATEGORIES= textproc
MASTER_SITES= http://download.sourceforge.net/aspell/
+DISTNAME= ${PORTNAME}-.29.1
MAINTAINER= ade@FreeBSD.org
diff --git a/textproc/br-ispell/Makefile b/textproc/br-ispell/Makefile
index e0570eabc76f..b3848c5686ed 100644
--- a/textproc/br-ispell/Makefile
+++ b/textproc/br-ispell/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: br-ispell
-# URL: http://www.ime.usp.br/~ueda/br.ispell/
-# Version required: 2.4
# Date created: 5 February 1999
# Whom: Joao Carlos Mendes Luis <jonny@jonny.eng.br>
#
# $FreeBSD$
#
-DISTNAME= br.ispell-2.4
-PKGNAME= br-ispell-2.4
+PORTNAME= br-ispell
+PORTVERSION= 2.4
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.ime.usp.br/pub/ueda/br.ispell/
+DISTNAME= br.ispell-2.4
MAINTAINER= jonny@jonny.eng.br
diff --git a/textproc/british-ispell/Makefile b/textproc/british-ispell/Makefile
index 97e5fbff0580..cb970537d2dd 100644
--- a/textproc/british-ispell/Makefile
+++ b/textproc/british-ispell/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: british-ispell
-# Version required: 3.1
# Date created: 10 February 2000
# Whom: Alexander Langer <alex@big.endian.de>
#
@@ -9,7 +8,8 @@
MAINTAINER= alex@big.endian.de
ISPELL_BRITISH= yes
-PKGNAME= british-ispell-3.1
+PORTNAME= british-ispell
+PORTVERSION= 3.1
MASTERDIR= ${.CURDIR}/../ispell
SCRIPTS_ENV= ISPELL_BRITISH=yes
diff --git a/textproc/c2html/Makefile b/textproc/c2html/Makefile
index 969984a129e7..9cad04d4fc5b 100644
--- a/textproc/c2html/Makefile
+++ b/textproc/c2html/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: c2html
-# Version required: 0.7.2
# Date created: 28 October 1997
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= c2html-0.7.2
+PORTNAME= c2html
+PORTVERSION= 0.7.2
CATEGORIES= textproc www
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/www/converters
diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index 8bbc295fb1cb..3866dafafe6f 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: catdoc
-# Version required: 0.90.1
# Date created: 11 November 1997
# Whom: Brion Moss <brion@queeg.com>
#
# $FreeBSD$
#
-DISTNAME= catdoc-0.90.3
+PORTNAME= catdoc
+PORTVERSION= 0.90.3
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_TEX_CTAN} \
ftp://ftp.ice.ru/pub/vitus/
diff --git a/textproc/chpp/Makefile b/textproc/chpp/Makefile
index b46c5f2678a7..53257513008d 100644
--- a/textproc/chpp/Makefile
+++ b/textproc/chpp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: chpp
-# Version required: 0.3.5
# Date created: 4 May 1999
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= chpp-0.3.5
+PORTNAME= chpp
+PORTVERSION= 0.3.5
CATEGORIES= textproc
MASTER_SITES= http://people.FreeBSD.org/~andy/distfiles/
diff --git a/textproc/cocoon/Makefile b/textproc/cocoon/Makefile
index 8af7d86d4e37..085f05503b34 100644
--- a/textproc/cocoon/Makefile
+++ b/textproc/cocoon/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Coccon
-# Version required: 1.5
# Date created: 27 June 1999
# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Cocoon_1.5
-PKGNAME= cocoon-1.5
+PORTNAME= cocoon
+PORTVERSION= 1.5
CATEGORIES= textproc www java
MASTER_SITES= http://java.apache.org/cocoon/dist/
+DISTNAME= Cocoon_${PORTVERSION}
EXTRACT_SUFX= .jar
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/code2html/Makefile b/textproc/code2html/Makefile
index dc7b2a41724e..d4a2e2457c12 100644
--- a/textproc/code2html/Makefile
+++ b/textproc/code2html/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: code2html
-# Version required: 0.8.9a
# Date created: 01 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= code2html-0.8.9a
+PORTNAME= code2html
+PORTVERSION= 0.8.9a
CATEGORIES= textproc
MASTER_SITES= ftp://code2html.sourceforge.net/pub/code2html/all/ \
http://www.cosy.sbg.ac.at/~ppalfrad/code2html/all/
diff --git a/textproc/cole/Makefile b/textproc/cole/Makefile
index 1a53290b158a..d765e015dfdf 100644
--- a/textproc/cole/Makefile
+++ b/textproc/cole/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cole
-# Version required: 2.0.1
# Date created: 4 November 1999
# Whom: Maxim Sobolev <sobomax@altavista.net>
#
# $FreeBSD$
#
-DISTNAME= cole-2.0.1
+PORTNAME= cole
+PORTVERSION= 2.0.1
CATEGORIES= textproc
MASTER_SITES= http://arturo.directmail.org/filters/archive/ \
http://homepages.go.com/~sobomax/filtersweb/
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index 148e7535a724..7bd0a0ebdb99 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -1,17 +1,19 @@
# ex:ts=8
# Ports collection makefile for: dict
-# Version required: 0.0
# Date created: 19 February 1998
# Whom: Josh Gilliam <josh@quick.net>
#
# $FreeBSD$
#
+PORTNAME= dict
+PORTVERSION= 1.4.9
DISTNAME= dictd-1.4.9
PKGNAME= dict-1.4.9
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.cs.unc.edu/pub/users/faith/dict/ \
ftp://ftp.dict.org/pub/dict/
+DISTNAME= ${PORTNAME}d-${PORTVERSION}
MAINTAINER= obrien@FreeBSD.org
diff --git a/textproc/diffstat/Makefile b/textproc/diffstat/Makefile
index 44276639a1da..c5f3951b3362 100644
--- a/textproc/diffstat/Makefile
+++ b/textproc/diffstat/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: diffstat
-# Version required: 1.27
# Date created: Oct 23, 1999
# Whom: Trevor Johnson <trevor@jpj.net>
#
# $FreeBSD$
#
-DISTNAME= diffstat-1.27
+PORTNAME= diffstat
+PORTVERSION= 1.27
CATEGORIES= textproc devel
MASTER_SITES= ftp://ftp.clark.net/pub/dickey/diffstat/ \
http://www.clark.net/pub/dickey/diffstat/
diff --git a/textproc/docbook-241/Makefile b/textproc/docbook-241/Makefile
index 01daee2fb251..f566c4016d60 100644
--- a/textproc/docbook-241/Makefile
+++ b/textproc/docbook-241/Makefile
@@ -1,5 +1,4 @@
#A New ports collection makefile for: docbook
-# Version required: 2.4.1
# Date created: 7 April 1997
# Whom: nik
#
@@ -8,7 +7,8 @@
# $FreeBSD$
#
-DISTNAME= docbook-241
+PORTNAME= docbook
+PORTVERSION= 241
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.ora.com/pub/davenport/
DISTFILES= docbk241.tar.Z
diff --git a/textproc/docbook-300/Makefile b/textproc/docbook-300/Makefile
index 35ced29f58c0..401f3047c076 100644
--- a/textproc/docbook-300/Makefile
+++ b/textproc/docbook-300/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: docbook-300
-# Version required: 3.0
# Date created: 7 April 1999
# Whom: nik
#
@@ -8,7 +7,8 @@
# $FreeBSD$
#
-DISTNAME= docbook-3.0
+PORTNAME= docbook
+PORTVERSION= 3.0
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.ora.com/pub/davenport/
DISTFILES= docbk30.tar.Z
diff --git a/textproc/docbook-310/Makefile b/textproc/docbook-310/Makefile
index fef5ba6fe537..2f2aff1fe7e9 100644
--- a/textproc/docbook-310/Makefile
+++ b/textproc/docbook-310/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: docbook-310
-# Version required: 3.0
# Date created: 7 April 1999
# Whom: nik
#
@@ -8,10 +7,11 @@
# $FreeBSD$
#
-DISTNAME= docbk31
-PKGNAME= docbook-3.1
+PORTNAME= docbook
+PORTVERSION= 3.1
CATEGORIES= textproc
MASTER_SITES= http://www.oasis-open.org/docbook/sgml/3.1/
+DISTNAME= docbk31
MAINTAINER= nik@FreeBSD.org
diff --git a/textproc/docbook-400/Makefile b/textproc/docbook-400/Makefile
index 325ae9d681f8..57b4134b80ee 100644
--- a/textproc/docbook-400/Makefile
+++ b/textproc/docbook-400/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: docbook-400
-# Version required: 4.0
# Date created: 4 April 2000
# Whom: asmodai
#
@@ -8,10 +7,11 @@
# $FreeBSD$
#
-DISTNAME= docbk40beta5
-PKGNAME= docbook-4.0
+PORTNAME= docbook
+PORTVERSION= 4.0
CATEGORIES= textproc
MASTER_SITES= http://www.oasis-open.org/docbook/sgml/4.0beta5/
+DISTNAME= docbk40beta5
MAINTAINER= asmodai@FreeBSD.org
diff --git a/textproc/docbook-sk/Makefile b/textproc/docbook-sk/Makefile
index 3415c6cc1fec..1231be9b7f64 100644
--- a/textproc/docbook-sk/Makefile
+++ b/textproc/docbook-sk/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: DocBook XML DTD
-# Version required: 3.1.7
# Date created: 28 March 1999
# Whom: kuriyama
#
# $FreeBSD$
#
-DISTNAME= db3x317
-PKGNAME= docbook-xml-3.1.7
+PORTNAME= docbook-xml
+PORTVERSION= 3.1.7
CATEGORIES= textproc
MASTER_SITES= http://nwalsh.com/docbook/xml/3.1.7/
+DISTNAME= db3x317
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index 3415c6cc1fec..1231be9b7f64 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: DocBook XML DTD
-# Version required: 3.1.7
# Date created: 28 March 1999
# Whom: kuriyama
#
# $FreeBSD$
#
-DISTNAME= db3x317
-PKGNAME= docbook-xml-3.1.7
+PORTNAME= docbook-xml
+PORTVERSION= 3.1.7
CATEGORIES= textproc
MASTER_SITES= http://nwalsh.com/docbook/xml/3.1.7/
+DISTNAME= db3x317
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index fa683da6ec93..f2b70c43c2f8 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: docbook
-# Version required: N/A
# Date created: 7 April 1999
# Whom: Nik Clayton <nik@freebsd.org>
#
@@ -8,11 +7,11 @@
# $FreeBSD$
#
-DISTNAME= docbook
-PKGNAME= docbook-1.0
+PORTNAME= docbook
+PORTVERSION= 1.0
CATEGORIES= textproc
MASTER_SITES= # empty
-DISTFILES= # empty
+DISTFILES= # empty
MAINTAINER= nik@freebsd.org
diff --git a/textproc/docproj/Makefile b/textproc/docproj/Makefile
index 7fa3e74964a2..e81943965da0 100644
--- a/textproc/docproj/Makefile
+++ b/textproc/docproj/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: docproj
-# Version required: around June 1998
# Date created: 27 June 1998
# Whom: Nik Clayton <nik@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= docproj
-PKGNAME= docproj-1.1
+PORTNAME= docproj
+PORTVERSION= 1.1
CATEGORIES= textproc
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile
index b00aa5174c47..ce06c324fc86 100644
--- a/textproc/dsssl-docbook-modular/Makefile
+++ b/textproc/dsssl-docbook-modular/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: DSSSL stylesheets for DocBook
-# Version required: 1.52
# Date created: 16 March 1998
# Whom: Jun Kuriyama <kuriyama@opt.phys.waseda.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= db152
-PKGNAME= dsssl-docbook-modular-1.52
+PORTNAME= dsssl-docbook-modular
+PORTVERSION= 1.52
CATEGORIES= textproc
MASTER_SITES= http://nwalsh.com/docbook/dsssl/
+DISTNAME= db152
DISTFILES= ${DISTNAME}.zip ${DISTNAME}d.zip
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/dtd-catalogs/Makefile b/textproc/dtd-catalogs/Makefile
index 401b1ad7f3ed..69fc88c30f5d 100644
--- a/textproc/dtd-catalogs/Makefile
+++ b/textproc/dtd-catalogs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: dtd-catalogs
-# Version required: 1.0
# Date created: 23 January 1999
# Whom: shige
#
# $FreeBSD$
#
-DISTNAME= dtd-catalogs-1.0
+PORTNAME= dtd-catalogs
+PORTVERSION= 1.0
CATEGORIES= textproc
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index 0d9f51a1d1ae..5aa0ad6c36bd 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: expat
-# Version required: 1.1
# Date created: Thu Aug 26 14:38:07 CEST 1999
# Whom: Dirk Froemberg <dirk@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= expat
-PKGNAME= expat-1.1
+PORTNAME= expat
+PORTVERSION= 1.1
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.jclark.com/pub/xml/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
+DISTNAME= ${PORTNAME}
MAINTAINER= dirk@FreeBSD.org
diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 0d9f51a1d1ae..5aa0ad6c36bd 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: expat
-# Version required: 1.1
# Date created: Thu Aug 26 14:38:07 CEST 1999
# Whom: Dirk Froemberg <dirk@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= expat
-PKGNAME= expat-1.1
+PORTNAME= expat
+PORTVERSION= 1.1
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.jclark.com/pub/xml/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
+DISTNAME= ${PORTNAME}
MAINTAINER= dirk@FreeBSD.org
diff --git a/textproc/freegrep/Makefile b/textproc/freegrep/Makefile
index a21dba749936..d7961c99c3e3 100644
--- a/textproc/freegrep/Makefile
+++ b/textproc/freegrep/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: grep
-# Version required: 0.15
# Date created: 8 June 1999
# Whom: Sheldon Hearn <sheldonh@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= grep-0.15
-PKGNAME= freegrep-0.15
+PORTNAME= freegrep
+PORTVERSION= 0.15
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.wam.umd.edu/pub/howardjp/software/grep/ \
http://www.wam.umd.edu/~howardjp/software/grep/ \
ftp://dragon.ham.muohio.edu/pub/howardjp/software/grep/
+DISTNAME= grep-${PORTVERSION}
MAINTAINER= howardjp@wam.umd.edu
diff --git a/textproc/gaspell/Makefile b/textproc/gaspell/Makefile
index 109d66e8b96b..58d89ea0fdef 100644
--- a/textproc/gaspell/Makefile
+++ b/textproc/gaspell/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: gaspell
-# Version required: 0.29.1
# Date created: 17th February 2000
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gaspell-.29.1
-PKGNAME= gaspell-0.29.1
+PORTNAME= gaspell
+PORTVERSION= 0.29.1
CATEGORIES= textproc gnome
MASTER_SITES= http://aspell.sourceforge.net/
+DISTNAME= ${PORTNAME}-.29.1
MAINTAINER= ade@FreeBSD.org
diff --git a/textproc/gdict/Makefile b/textproc/gdict/Makefile
index 3770ea8aad23..aeb75f95ea39 100644
--- a/textproc/gdict/Makefile
+++ b/textproc/gdict/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gdict
-# Version required: 0.7
# Date created: Sun Jul 18 1999
# Whom: domi@saargate.de
#
# $FreeBSD$
#
-DISTNAME= gdict-0.7
+PORTNAME= gdict
+PORTVERSION= 0.7
CATEGORIES= textproc
MASTER_SITES= http://www.psilord.com/code/gdict/
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index ed1f417789c8..7fb18f773b69 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: glimpse
-# Version required: 4.*
# Date created: 25 August 1996
# Whom: chuckr@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= glimpse-4.1.src
-PKGNAME= glimpse-4.1
+PORTNAME= glimpse
+PORTVERSION= 4.1
CATEGORIES= textproc databases
MASTER_SITES= ftp://ftp.cs.arizona.edu/glimpse/
+DISTNAME= ${PKGNAME}.src
EXTRACT_SUFX= .tar.Z
MAINTAINER= chuckr@freebsd.org
diff --git a/textproc/grap/Makefile b/textproc/grap/Makefile
index 4cde857c6583..181787f7126c 100644
--- a/textproc/grap/Makefile
+++ b/textproc/grap/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: grap
-# Version required: 1.02
# Date created: 4 February 2000
# Whom: faber@lunabase.org
#
# $FreeBSD$
#
-DISTNAME= grap-1.02
+PORTNAME= grap
+PORTVERSION= 1.02
CATEGORIES= textproc graphics
MASTER_SITES= http://www.lunabase.org/~faber/Vault/software/grap/
diff --git a/textproc/gtkdiff/Makefile b/textproc/gtkdiff/Makefile
index 6466353f6918..5d8d9b7f414f 100644
--- a/textproc/gtkdiff/Makefile
+++ b/textproc/gtkdiff/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtkdiff
-# Version required: 1.0.2
# Date created: 17 November 1999
# Whom: Maxim Sobolev
#
# $FreeBSD$
#
-DISTNAME= gtkdiff-1.0.2
+PORTNAME= gtkdiff
+PORTVERSION= 1.0.2
CATEGORIES= textproc gnome
MASTER_SITES= http://www.ainet.or.jp/~inoue/software/gtkdiff/
diff --git a/textproc/gxditview/Makefile b/textproc/gxditview/Makefile
index 2a2c950235f9..af19c12e8bdf 100644
--- a/textproc/gxditview/Makefile
+++ b/textproc/gxditview/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: gxditview
-# Version required: 1.10
# Date created: 24 June 1998
# Whom: Dom Mitchell <dom@myrddin.demon.co.uk>
#
# $FreeBSD$
#
-# Same version as the contrib groff sources...
-DISTNAME= gxditview-1.10
+PORTNAME= gxditview
+PORTVERSION= 1.10
CATEGORIES= textproc
DISTFILES= # none
diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index 34bcee582c30..5541620aec26 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: hevea
-# Version required: 1.0.4
# Date created: November 28 1999
# Whom: Stephen Montgomery-Smith <stephen@math.missouri.edu>
#
# $FreeBSD$
#
-DISTNAME= hevea-1.04
+PORTNAME= heavea
+PORTVERSION= 1.04
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/para/hevea/
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index a67433079701..6d16c4e35f84 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: htdig
-# Version required: 3.1.5
# Date created: 18 August 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= htdig-3.1.5
+PORTNAME= htdig
+PORTVERSION= 3.1.5
CATEGORIES= textproc www
MASTER_SITES= http://www.htdig.org/files/ \
${MASTER_SITE_SUNSITE} \
diff --git a/textproc/html/Makefile b/textproc/html/Makefile
index 13e40198d59f..8717e5894b42 100644
--- a/textproc/html/Makefile
+++ b/textproc/html/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: html
-# Version required: 4.0
# Date created: Sept 19, 1997
# Whom: jfieber
#
# $FreeBSD$
#
-DISTNAME= html-4.0b
+PORTNAME= html
+PORTVERSION= 4.0b
CATEGORIES= textproc
MASTER_SITES= http://fallout.campusview.indiana.edu/ports/distfiles/
diff --git a/textproc/info2html/Makefile b/textproc/info2html/Makefile
index 63f1a70e6e54..4d707bc5e77a 100644
--- a/textproc/info2html/Makefile
+++ b/textproc/info2html/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: info2html
-# Version required: 1.1
# Date created: 9 October 1997
# Whom: wosch
#
# $FreeBSD$
#
-DISTNAME= info2html-1.1
+PORTNAME= info2html
+PORTVERSION= 1.1
CATEGORIES= textproc
MASTER_SITES= http://www.de.freebsd.org/~wosch/src/
diff --git a/textproc/isearch/Makefile b/textproc/isearch/Makefile
index 7fbffae5b2e9..9f98b6d3e9a1 100644
--- a/textproc/isearch/Makefile
+++ b/textproc/isearch/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: isearch
-# Version required: 1.14
# Date created: 21 Sept 1996
# Whom: Pedro
#
# $FreeBSD$
#
-DISTNAME= Isearch-1.14
-PKGNAME= isearch-1.14
+PORTNAME= isearch
+PORTVERSION= 1.14
CATEGORIES= textproc databases
MASTER_SITES= ftp://ftp.cnidr.org/pub/NIDR.tools/Isearch/
+DISTNAME- Isearc-${PORTVERSION}
MAINTAINER= giffunip@asme.org
diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile
index 1e125fffcfbd..5b393d810c1e 100644
--- a/textproc/iso12083/Makefile
+++ b/textproc/iso12083/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: iso12083
-# Version required: 1993
# Date created: July 9, 1997
# Whom: jfieber
#
# $FreeBSD$
#
-DISTNAME= iso12083-1993
+PORTNAME= iso12083
+PORTVERSION= 1993
CATEGORIES= textproc
MASTER_SITES= ftp://info.ex.ac.uk/pub/SGML/ISO-12083/
DISTFILES= article.dtd book.dtd maths.dtd serial.dtd
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index f4f16cd3866d..74033b778620 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: iso8879
-# Version required: 1986
# Date created: June 19, 1997
# Whom: jfieber
#
# $FreeBSD$
#
-DISTNAME= isoENTS
-PKGNAME= iso8879-1986
+PORTNAME= iso8879
+PORTVERSION= 1986
CATEGORIES= textproc
MASTER_SITES= http://fallout.campusview.indiana.edu/ports/distfiles/
+DISTNAME= isoENTS
EXTRACT_SUFX= .zip
MAINTAINER= jfieber@FreeBSD.org
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 363a37be3820..686707715ef4 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: ispell
-# Version required: 3.1.20
# Date created: 6 November 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= ispell-3.1
-PKGNAME?= ispell-3.1.20c
+PORTNAME?= ispell
+PORTVERSION?= 3.1.20c
CATEGORIES= textproc elisp
MASTER_SITES= ftp://ftp.cs.ucla.edu/pub/ispell-3.1/ \
ftp://ftp.kiarchive.ru/pub/unix/text/ispell/
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index e6a5c88b8622..5f11130516f6 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: jade
-# Version required: 1.2
# Date created: June 19, 1997
# Whom: jfieber
#
# $FreeBSD$
#
-DISTNAME= jade-1.2.1
+PORTNAME= jade
+PORTVERSION= 1.2.1
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.jclark.com/pub/jade/
diff --git a/textproc/java2html/Makefile b/textproc/java2html/Makefile
index c72ac4074891..82b11bfd4bbc 100644
--- a/textproc/java2html/Makefile
+++ b/textproc/java2html/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: java2html
-# Version required: 0.7.2
# Date created: 21 March 1999
# Whom: Martin Kammerhofer
#
# $FreeBSD$
#
-DISTNAME= java2html-0.7.2
+PORTNAME= java2html
+PORTVERSION= 0.7.2
CATEGORIES= textproc www
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/www/converters
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 16d8b63bfda8..50a297854dd1 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: latex2html
-# Version required: 98.1
# Date created: 3 May 1998
# Whom: brett@peloton.physics.montana.edu
#
# $FreeBSD$
#
-DISTNAME= latex2html-98.1p1
+PORTNAME= latex2html
+PORTVERSION= 98.1p1
CATEGORIES= textproc
MASTER_SITES= http://www-dsed.llnl.gov/files/programs/unix/latex2html/sources/ \
ftp://ftp.mpn.com/pub/nikos/latex2html-mirror/sources/
diff --git a/textproc/latte/Makefile b/textproc/latte/Makefile
index f7a9bbbeb127..4dbc6d2c8d32 100644
--- a/textproc/latte/Makefile
+++ b/textproc/latte/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: latte
-# Version required: 1.1
# Date created: 15 August 1999
# Whom: Dominik Rothert <dr@domix.de>
#
# $FreeBSD$
#
-DISTNAME= latte-1.1
+PORTNAME= latte
+PORTVERSION= 1.1
CATEGORIES= textproc
MASTER_SITES= http://www.latte.org/ \
ftp://ftp.brasslantern.com/pub/zanshin/latte/
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index dc1223f9f66a..e2ae9d0ecd42 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libxml
-# Version required: 1.8.7
# Date created: 28 September 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= libxml-1.8.7
+PORTNAME= libxml
+PORTVERSION= 1.8.7
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libxml
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index dc1223f9f66a..e2ae9d0ecd42 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libxml
-# Version required: 1.8.7
# Date created: 28 September 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= libxml-1.8.7
+PORTNAME= libxml
+PORTVERSION= 1.8.7
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libxml
diff --git a/textproc/linuxdoc/Makefile b/textproc/linuxdoc/Makefile
index 952398980caa..50ba05202ebf 100644
--- a/textproc/linuxdoc/Makefile
+++ b/textproc/linuxdoc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: linuxdoc
-# Version required: 1.1
# Date created: July 8, 1997
# Whom: jfieber
#
# $FreeBSD$
#
-DISTNAME= linuxdoc-1.1
+PORTNAME= linuxdoc
+PORTVERSION= 1.1
CATEGORIES= textproc
MASTER_SITES= http://fallout.campusview.indiana.edu/ports/distfiles/
diff --git a/textproc/lotusxsl/Makefile b/textproc/lotusxsl/Makefile
index f52430701c8c..799468f8611e 100644
--- a/textproc/lotusxsl/Makefile
+++ b/textproc/lotusxsl/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: LotusXSL
-# Version required: 0.18.4
# Date created: 23 June 1999
# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= lotusxsl_0_18_4
-PKGNAME= lotusxsl-0.18.4
+PORTNAME= lotusxsl
+PORTVERSION= 0.18.4
CATEGORIES= textproc
MASTER_SITES= http://www.alphaworks.ibm.com/formula/lotusxsl/
#MASTER_SITES= http://apps.alphaworks.ibm.com/technologies/lotusxsl/
+DISTNAME= ${PORTNAME}_0_18_4
EXTRACT_SUFX= .zip
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/man2html/Makefile b/textproc/man2html/Makefile
index 1bc14526d3c3..c55e87c2351a 100644
--- a/textproc/man2html/Makefile
+++ b/textproc/man2html/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: man2html
-# Version required: 3.0.1
# Date created: 29 August 1998
# Whom: Dima Sivachenko <demon@gpad.ac.ru>
#
# $FreeBSD$
#
-DISTNAME= man2html3.0.1
-PKGNAME= man2html-3.0.1
+PORTNAME= man2html
+PORTVERSION= 3.0.1
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= demon@gpad.ac.ru
diff --git a/textproc/mgdiff/Makefile b/textproc/mgdiff/Makefile
index 881929ad5fa2..000b0fcd19d4 100644
--- a/textproc/mgdiff/Makefile
+++ b/textproc/mgdiff/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: mgdiff
-# Version required: 1.0
# Date created: 22 October 1996
# Whom: andreas@marvin.robin.de
#
# $FreeBSD$
#
-DISTNAME= mgdiff
-PKGNAME= mgdiff-1.0
+PORTNAME= mgdiff
+PORTVERSION= 1.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
+DISTNAME= ${PORTNAME}
MAINTAINER= andreas@marvin.robin.de
diff --git a/textproc/mswordview/Makefile b/textproc/mswordview/Makefile
index 91b97338cd0e..62f91af60032 100644
--- a/textproc/mswordview/Makefile
+++ b/textproc/mswordview/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mswordview
-# Version required: 0.5.14
# Date created: Fri Nov 6 09:06:33 PST 1998
# Whom: sumikawa@kame.net
#
# $FreeBSD$
#
-DISTNAME= mswordview-0.5.14-bw6
-PKGNAME= mswordview-0.5.14.6
+PORTNAME= mswordview
+PORTVERSION= 0.5.14.6
CATEGORIES= textproc
MASTER_SITES= http://www.csn.ul.ie/~caolan/publink/mswordview/
+DISTNAME= ${PORTNAME}-0.5.14-bw6
MAINTAINER= sumikawa@kame.net
diff --git a/textproc/nfbtrans/Makefile b/textproc/nfbtrans/Makefile
index 8a0ff09ca660..aba5e97dcd64 100644
--- a/textproc/nfbtrans/Makefile
+++ b/textproc/nfbtrans/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: nfbtrans
-# Version required: 7.55
# Date created: 30 Aug 1998
# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= nfbtr755
-PKGNAME= nfbtrans-7.55
+PORTNAME= nfbtrans
+PORTVERSION= 7.55
CATEGORIES= textproc
MASTER_SITES= ftp://nfb.org/braille/nfbtrans/
+DISTNAME= nfbtr755
EXTRACT_SUFX= .exe
MAINTAINER= max@FreeBSD.org
diff --git a/textproc/nicetext/Makefile b/textproc/nicetext/Makefile
index ab598b64503d..055364c3e970 100644
--- a/textproc/nicetext/Makefile
+++ b/textproc/nicetext/Makefile
@@ -1,11 +1,11 @@
# New ports collection makefile for: nicetext
-# Version required: 0.9
# Date created: 20 February 1998
# Whom: Mark Chapman <markc@ctgi.net>
#
# $FreeBSD$
-DISTNAME= nicetext-0.9
+PORTNAME= nicetext
+PORTVERSION= 0.9
CATEGORIES= textproc
MASTER_SITES= ftp://ctgi.net/pub/ctgi/nicetext/src/ \
ftp://nicetext.com/pub/nicetext/src/
diff --git a/textproc/no-ispell/Makefile b/textproc/no-ispell/Makefile
index f4607a38b483..3a8d5792a1f9 100644
--- a/textproc/no-ispell/Makefile
+++ b/textproc/no-ispell/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: no-ispell
-# Version required: 1.1
# Date created: 10 February 2000
# Whom: Alexander Langer <alex@big.endian.de>
#
@@ -9,7 +8,8 @@
MAINTAINER= alex@big.endian.de
ISPELL_NO= yes
-PKGNAME= no-ispell-1.1
+PORTNAME= no-ispell
+PORTVERSION= 1.1
MASTERDIR= ${.CURDIR}/../ispell
.include "${MASTERDIR}/Makefile"
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index e6a5c88b8622..5f11130516f6 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: jade
-# Version required: 1.2
# Date created: June 19, 1997
# Whom: jfieber
#
# $FreeBSD$
#
-DISTNAME= jade-1.2.1
+PORTNAME= jade
+PORTVERSION= 1.2.1
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.jclark.com/pub/jade/
diff --git a/textproc/p5-Text-CSV_XS/Makefile b/textproc/p5-Text-CSV_XS/Makefile
index cb314df13393..4997f6b241d6 100644
--- a/textproc/p5-Text-CSV_XS/Makefile
+++ b/textproc/p5-Text-CSV_XS/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: Text::CSV_XS
-# Version required: 0.*
# Date created: Fri Nov 19 03:11:08 MSK 1999
# Whom: Ache
#
# $FreeBSD$
#
-DISTNAME= Text-CSV_XS-0.20
+PORTNAME= p5-Text-CSV_XS
+PORTVERSION= 0.20
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Text
+DISTNAME= Text-CSV_XS-0.20
MAINTAINER= ache@FreeBSD.org
diff --git a/textproc/p5-Text-Template/Makefile b/textproc/p5-Text-Template/Makefile
index 8b1e3e7a8bf2..5e51c3e696dc 100644
--- a/textproc/p5-Text-Template/Makefile
+++ b/textproc/p5-Text-Template/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: Text::Template
-# Version required: 1.20
# Date created: Thu Oct 28 01:58:13 EDT 1999
# Whom: Bill "I hate Perl" Fumerola
#
# $FreeBSD$
#
-DISTNAME= Text-Template-1.20
-PKGNAME= p5-Text-Template-1.20
+PORTNAME= p5-Text-Template
+PORTVERSION= 1.20
CATEGORIES= textproc perl5
MASTER_SITES= http://www.plover.com/~mjd/perl/Template/ \
${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Text
+DISTNAME= Text-Template-1.20
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-XML-DOM/Makefile b/textproc/p5-XML-DOM/Makefile
index e4bf79c949b3..cfd431694cf0 100644
--- a/textproc/p5-XML-DOM/Makefile
+++ b/textproc/p5-XML-DOM/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: XML::DOM
-# Version required: 1.25
# Date created: 7 Nov 1999
# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= XML-DOM-1.25
-PKGNAME= p5-XML-DOM-1.25
+PORTNAME= p5-XML-DOM
+PORTVERSION= 1.25
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ../../authors/id/E/EN/ENNO
+DISTNAME= XML-DOM-1.25
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index 784427ec0fd8..096f82b216fb 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: XML::Parser
-# Version required: 2.27
# Date created: 15 Nov 1998
# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= XML-Parser-2.27
-PKGNAME= p5-XML-Parser-2.27
+PORTNAME= p5-XML-Parser
+PORTVERSION= 2.27
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
http://wwwx.netheaven.com/~coopercc/xmlparser/
MASTER_SITE_SUBDIR= ../by-authors/id/C/CO/COOPERCL
+DISTNAME= XML-Parser-2.27
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/par/Makefile b/textproc/par/Makefile
index 37795d33fac2..ca79a9bf3801 100644
--- a/textproc/par/Makefile
+++ b/textproc/par/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Par
-# Version required: 1.50
# Date created: 6 Aug 1997
# Whom: mark@grondar.za
#
# $FreeBSD$
#
-DISTNAME= Par150
-PKGNAME= par-1.50
+PORTNAME= par
+PORTVERSION= 1.50
CATEGORIES= textproc
MASTER_SITES= http://www.cs.berkeley.edu/~amc/Par/
+DISTNAME= Par150
MAINTAINER= mark@grondar.za
diff --git a/textproc/perl2html/Makefile b/textproc/perl2html/Makefile
index 19fbbad61681..173f5182e92c 100644
--- a/textproc/perl2html/Makefile
+++ b/textproc/perl2html/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: perl2html
-# Version required: 0.7.2
# Date created: 27 May 1999
# Whom: Martin Kammerhofer
#
# $FreeBSD$
#
-DISTNAME= perl2html-0.7.2
+PORTNAME= perl2html
+PORTVERSION= 0.7.2
CATEGORIES= textproc www
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/www/converters
diff --git a/textproc/py-mxTextTools/Makefile b/textproc/py-mxTextTools/Makefile
index cf763594280d..aabb493d163c 100644
--- a/textproc/py-mxTextTools/Makefile
+++ b/textproc/py-mxTextTools/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: py-mxTextTools
-# Version required: 1.1.1
# Date created: 12 May 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= mxTextTools-1.1.1
-PKGNAME= py-mxTextTools-1.1.1
+PORTNAME= py-mxTextTools
+PORTVERSION= 1.1.1
CATEGORIES= textproc python
MASTER_SITES= http://starship.skyport.net/~lemburg/
+DISTNAME= mxTextTools-1.1.1
MAINTAINER= tg@FreeBSD.org
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index caa5276d1d72..fe66a842add8 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -1,19 +1,19 @@
# Ports collection Makefile for: PyXML
-# Version required: 0.5.1
# Date created: 04/17/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= xml-0.5.1
-PKGNAME= py-xml-0.5.1
+PORTNAME= py-xml
+PORTVERSION= 0.5.1
CATEGORIES= textproc python
MASTER_SITES= http://www.python.org/sigs/xml-sig/files/ \
ftp://ftp.cdrom.com/pub/python/www.python.org/sigs/xml-sig/files/ \
ftp://ftp.kddlabs.co.jp/pub/lang/python/www.python.org/sigs/xml-sig/files/ \
ftp://unix.hensa.ac.uk/mirrors/ftp.python.org/pub/www.python.org/sigs/xml-sig/files/ \
http://www.nectar.cc/distfiles/
+DISTNAME= xml-0.5.1
EXTRACT_SUFX= .tgz
MAINTAINER= nectar@FreeBSD.org
diff --git a/textproc/rand/Makefile b/textproc/rand/Makefile
index f1bc497c50d5..f3e50a0616e2 100644
--- a/textproc/rand/Makefile
+++ b/textproc/rand/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rand
-# Version required: 1.7
# Date created: Mon Jul 26 1999
# Whom: domi@saargate.de
#
# $FreeBSD$
#
-DISTNAME= rand-1.7
+PORTNAME= rand
+PORTVERSION= 1.7
CATEGORIES= textproc
MASTER_SITES= http://math.smsu.edu/~br0ke/files/
diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile
index 695cabdb1d4a..25fb06076b69 100644
--- a/textproc/rman/Makefile
+++ b/textproc/rman/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rman
-# Version required: 3.0.8
# Date created: 27 Dec 1994
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= rman-3.0.8
+PORTNAME= rman
+PORTVERSION= 3.0.8
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/
EXTRACT_SUFX= .tar.Z
diff --git a/textproc/sarep/Makefile b/textproc/sarep/Makefile
index 0eb25b49864c..34bbc1d3360c 100644
--- a/textproc/sarep/Makefile
+++ b/textproc/sarep/Makefile
@@ -1,13 +1,12 @@
# Ports collection makefile for: sarep
-# http://tarp.worldserve.net/software/
-# Version required: 1.*
# Date created: Feb 18, 1999
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= sarep-1.1
+PORTNAME= sarep
+PORTVERSION= 1.1
CATEGORIES= textproc
MASTER_SITES= http://tarp.worldserve.net/software/
EXTRACT_SUFX=
diff --git a/textproc/se-ispell/Makefile b/textproc/se-ispell/Makefile
index 35d4567dbd2f..1770b53724de 100644
--- a/textproc/se-ispell/Makefile
+++ b/textproc/se-ispell/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: se-ispell
-# Version required: 1.2.1
# Date created: 4 November 1999
# Whom: Kent Boortz <kent@erix.ericsson.se>
#
# $FreeBSD$
#
-DISTNAME= iswedish-1.2.1
-PKGNAME= se-ispell-1.2.1
+PORTNAME= se-ispell
+PORTVERSION= 1.2.1
CATEGORIES= textproc
MASTER_SITES= http://www.sslug.dk/locale/ispell/iswedish/
+DISTNAME= iswedish-1.2.1
MAINTAINER= kent@erix.ericsson.se
diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile
index 9f7b75a1c536..bf1019d1cf18 100644
--- a/textproc/sgmlformat/Makefile
+++ b/textproc/sgmlformat/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sgmlformat
-# Version required: 1.7
# Date created: July 16, 1997
# Whom: jfieber
#
# $FreeBSD$
#
-DISTNAME= sgmlformat-1.7
+PORTNAME= sgmlformat
+PORTVERSION= 1.7
CATEGORIES= textproc print
MASTER_SITES= http://fallout.campusview.indiana.edu/ports/distfiles/
diff --git a/textproc/sgrep/Makefile b/textproc/sgrep/Makefile
index 064c20c8ed76..f1e62c797a2c 100644
--- a/textproc/sgrep/Makefile
+++ b/textproc/sgrep/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sgrep
-# Version required: 0.99
# Date created: Apr 29 1998
# Whom: <koshy@india.hp.com>
#
# $FreeBSD$
#
-DISTNAME= sgrep-0.99
+PORTNAME= sgrep
+PORTVERSION= 0.99
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/
diff --git a/textproc/sgrep2/Makefile b/textproc/sgrep2/Makefile
index 064c20c8ed76..f1e62c797a2c 100644
--- a/textproc/sgrep2/Makefile
+++ b/textproc/sgrep2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sgrep
-# Version required: 0.99
# Date created: Apr 29 1998
# Whom: <koshy@india.hp.com>
#
# $FreeBSD$
#
-DISTNAME= sgrep-0.99
+PORTNAME= sgrep
+PORTVERSION= 0.99
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/
diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile
index 3f029bd7efc6..cb3fd92e1619 100644
--- a/textproc/sp/Makefile
+++ b/textproc/sp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sp
-# Version required: 1.3
# Date created: April 26, 1997
# Whom: jfieber
#
# $FreeBSD$
#
-DISTNAME= sp-1.3.4
+PORTNAME= sp
+PORTVERSION= 1.3.4
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.jclark.com/pub/sp/
diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile
index a2f470178dac..85ea2cab1d64 100644
--- a/textproc/texi2html/Makefile
+++ b/textproc/texi2html/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: texi2html
-# Version required: 1.52
# Date created: 5 Nov 1997
# Whom: Ian Vaudrey <i.vaudrey@bigfoot.com>
#
# $FreeBSD$
#
-DISTNAME= texi2html
-PKGNAME= texi2html-1.52
+PORTNAME= texi2html
+PORTVERSION= 1.52
CATEGORIES= textproc
MASTER_SITES= http://wwwcn.cern.ch/dci/texi2html/
+DISTNAMe= ${PORTNAME}
EXTRACT_SUFX= .shar.Z
MAINTAINER= i.vaudrey@bigfoot.com
diff --git a/textproc/textutils/Makefile b/textproc/textutils/Makefile
index e10749264200..68f4d402c6fd 100644
--- a/textproc/textutils/Makefile
+++ b/textproc/textutils/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: textutils
-# Version required: 2.0
# Date created: 14 May 1998
# Whom: Adrian Wontroba <aw1@stade.co.uk>
#
# $FreeBSD$
#
-DISTNAME= textutils-2.0
+PORTNAME= textutils
+PORTVERSION= 2.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= textutils
diff --git a/textproc/tkdiff/Makefile b/textproc/tkdiff/Makefile
index 90814e64a3a3..1f1d9b3bf094 100644
--- a/textproc/tkdiff/Makefile
+++ b/textproc/tkdiff/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tkdiff
-# Version required: 3.04
# Date created: 4 Oct. 1999
# Whom: Kevin Lo <kevlo@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= tkdiff-3.04
+PORTNAME= tkdiff
+PORTVERSION= 3.04
CATEGORIES= textproc tk82
MASTER_SITES= http://people.FreeBSD.org/~kevlo/
diff --git a/textproc/tth/Makefile b/textproc/tth/Makefile
index 87704fd57132..8c31ec1b879b 100644
--- a/textproc/tth/Makefile
+++ b/textproc/tth/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: tth
-# Version required: 2.22
# Date created: 19 Feb 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= tth_C
-PKGNAME= tth-2.22
+PORTNAME= tth
+PORTVERSION= 2.22
CATEGORIES= textproc
MASTER_SITES= http://people.FreeBSD.org/~tg/ \
http://hutchinson.belmont.ma.us/tth/tth-noncom/
+DISTNAME= tth_C
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/txt2html/Makefile b/textproc/txt2html/Makefile
index 6a89e172adad..c3ad69c8bf38 100644
--- a/textproc/txt2html/Makefile
+++ b/textproc/txt2html/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: txt2html
-# Version required: 1.27
# Date created: 29 Jun 1998
# Whom: Don Croyle <croyle@gelemna.ft-wayne.in.us>
#
# $FreeBSD$
#
-DISTNAME= txt2html-1.27
+PORTNAME= txt2html
+PORTVERSION= 1.27
CATEGORIES= textproc
MASTER_SITES= http://www.aigeek.com/txt2html/
diff --git a/textproc/unroff/Makefile b/textproc/unroff/Makefile
index f95441e83069..f28083a62c9f 100644
--- a/textproc/unroff/Makefile
+++ b/textproc/unroff/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: unroff
-# Version required: 1.0
# Date created: 18 Feb 1996
# Whom: Thomas Gellekum <tg@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= unroff-1.0
-PKGNAME= unroff-1.0.2
+PORTNAME= unroff
+PORTVERSION= 1.0.2
CATEGORIES= textproc
MASTER_SITES= ${UNROFF_SITE}/dist/ \
${UNROFF_SITE}/contrib/
+DISTNAME= ${PORTNAME}-1.0
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${PATCH1} ${PATCH2}
MAINTAINER= wosch@freebsd.org
diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile
index e36c30195fd5..9b925cccd2d9 100644
--- a/textproc/urlview/Makefile
+++ b/textproc/urlview/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: urlview
-# Version required: 0.0
# Date created: 21 April 1998
# Whom: Josh Gilliam <josh@quick.net>
#
# $FreeBSD$
#
-DISTNAME= urlview-0.7
+PORTNAME= urlview
+PORTVERSION= 0.7
CATEGORIES= textproc www
MASTER_SITES= ftp://ftp.cs.hmc.edu/pub/me/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/mutt/ \
diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile
index 6298b0da407e..68167bffd1ba 100644
--- a/textproc/wdiff/Makefile
+++ b/textproc/wdiff/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wdiff
-# Version required: 0.5
# Date created: Sep 15, 1997
# Whom: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= wdiff-0.5
+PORTNAME= wdiff
+PORTVERSION= 0.5
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= wdiff
diff --git a/textproc/word2x/Makefile b/textproc/word2x/Makefile
index 2d99642e298e..acb2d22e9051 100644
--- a/textproc/word2x/Makefile
+++ b/textproc/word2x/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: word2x
-# Version required: 0.005
# Date created: 10 June 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
+#
-DISTNAME= word2x-0.005
+PORTNAME= word2x
+PORTVERSION= 0.005
CATEGORIES= textproc
MASTER_SITES= http://word2x.alcom.co.uk/download/
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index 91b97338cd0e..62f91af60032 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mswordview
-# Version required: 0.5.14
# Date created: Fri Nov 6 09:06:33 PST 1998
# Whom: sumikawa@kame.net
#
# $FreeBSD$
#
-DISTNAME= mswordview-0.5.14-bw6
-PKGNAME= mswordview-0.5.14.6
+PORTNAME= mswordview
+PORTVERSION= 0.5.14.6
CATEGORIES= textproc
MASTER_SITES= http://www.csn.ul.ie/~caolan/publink/mswordview/
+DISTNAME= ${PORTNAME}-0.5.14-bw6
MAINTAINER= sumikawa@kame.net
diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index 348110dba609..17d7a9d37dfd 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -1,21 +1,20 @@
# New ports collection makefile for: xlHtml
-# Version required: 0.2.6
# Date created: 27 March 2000
# Whom: Maxim Sobolev <sobomax@altavista.net>
#
# $FreeBSD$
#
-DISTNAME= xlHtml-${VERSION}
-PKGNAME= xlhtml-${VERSION}
+PORTNAME= xlhtml
+PORTVERSION= 0.2.6
CATEGORIES= textproc
MASTER_SITES= http://www.gate.net/~ddata/xlHtml/
+DISTNAME= xlHtml-${PORTVERSION}
MAINTAINER= sobomax@altavista.net
LIB_DEPENDS= cole.2:${PORTSDIR}/textproc/cole
-VERSION= 0.2.6
USE_LIBTOOL= yes
do-install:
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index d6436b16e1f2..92a6c911981f 100644
--- a/textproc/xls2xml/Makefile
+++ b/textproc/xls2xml/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xls2xml
-# Version required: 1.0.0
# Date created: 4 November 1999
# Whom: Maxim Sobolev <sobomax@altavista.net>
#
# $FreeBSD$
#
-DISTNAME= xls2xml-1.0.0
+PORTNAME= xls2xml
+PORTVERSION= 1.0.0
CATEGORIES= textproc
MASTER_SITES= http://arturo.directmail.org/filters/archive/ \
http://homepages.go.com/~sobomax/filtersweb/
diff --git a/textproc/xml4j/Makefile b/textproc/xml4j/Makefile
index f17fe346bc7d..cbe88e48cd1e 100644
--- a/textproc/xml4j/Makefile
+++ b/textproc/xml4j/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: XML for Java
-# Version required: 3.0.0-EA3
# Date created: 21 Feb 2000
# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= xml4J_3_0_0EA3
-PKGNAME= xml4j-3.0.0e3
+PORTNAME= xml4j
+PORTVERSION= 3.0.0.e3
CATEGORIES= textproc
MASTER_SITES= http://www.alphaworks.ibm.com/tech/xml4j/
+DISTNAME= xml4J_3_0_0EA3
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile
index a42685ff25f6..485e12e5210a 100644
--- a/textproc/xp/Makefile
+++ b/textproc/xp/Makefile
@@ -1,22 +1,21 @@
# New ports collection makefile for: xp
-# Version required: 0.5
# Date created: 21 September 1999
# Whom: mike
#
# $FreeBSD$
#
-DISTNAME= xp
-PKGNAME= xp-0.5
+PORTNAME= xp
+PORTVERSION= 0.5
CATEGORIES= textproc java
MASTER_SITES= ftp://ftp.jclark.com/pub/xml/
+DISTNAME= ${PORTNAME}
MAINTAINER= mike@vee.net
RUN_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk
-XP_VERSION= 0.5
-PLIST_SUB+= XP_VERSION=${XP_VERSION}
+PLIST_SUB+= XP_VERSION=${PORTVERSION}
NO_WORKSUBDIR= yes
NO_BUILD= yes
diff --git a/textproc/xt/Makefile b/textproc/xt/Makefile
index eb2b7d5c9c6a..faeb45f7e7f3 100644
--- a/textproc/xt/Makefile
+++ b/textproc/xt/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: XT
-# Version required: 19991105
# Date created: 23 June 1999
# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= xt
-PKGNAME= xt-19991105
+PORTNAME= xt
+PORTVERSION= 19991105
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.jclark.com/pub/xml/
+DISTNAME= ${PORTNAME}
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile
index 91f0b0379a3f..4d4424aa47d3 100644
--- a/textproc/yodl/Makefile
+++ b/textproc/yodl/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: yodl
-# Version required: 1.22
# Date created: 22 Oct 1997
# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= yodl-1.22
+PORTNAME= yodl
+PORTVERSION= 1.22
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.icce.rug.nl/pub/unix/