aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--print/a2ps-a4/Makefile1
-rw-r--r--print/a2ps-letter/Makefile7
-rw-r--r--print/a2ps-letterdj/Makefile1
-rw-r--r--print/a2ps43-a4/Makefile1
-rw-r--r--print/a2ps43-letter/Makefile6
-rw-r--r--print/acroread-commfont/Makefile7
-rw-r--r--print/acroread/Makefile10
-rw-r--r--print/acroread4/Makefile8
-rw-r--r--print/acroread5-commfont/Makefile7
-rw-r--r--print/acroread5/Makefile8
-rw-r--r--print/afm/Makefile6
-rw-r--r--print/amspsfnt/Makefile6
-rw-r--r--print/apsfilter/Makefile5
-rw-r--r--print/apsfilter6/Makefile5
-rw-r--r--print/asprint/Makefile6
-rw-r--r--print/auctex/Makefile4
-rw-r--r--print/bibcard/Makefile6
-rw-r--r--print/bibview/Makefile6
-rw-r--r--print/c2ps-a4/Makefile1
-rw-r--r--print/c2ps-letter/Makefile6
-rw-r--r--print/cdlabelgen/Makefile4
-rw-r--r--print/cmpsfont/Makefile6
-rw-r--r--print/detex/Makefile4
-rw-r--r--print/dvi2tty/Makefile6
-rw-r--r--print/dvi2xx/Makefile7
-rw-r--r--print/dvipdfm/Makefile5
-rw-r--r--print/dvips/Makefile6
-rw-r--r--print/dvips2ascii/Makefile4
-rw-r--r--print/dviselect/Makefile6
-rw-r--r--print/enscript-a4/Makefile1
-rw-r--r--print/enscript-letter/Makefile6
-rw-r--r--print/enscript-letterdj/Makefile1
-rw-r--r--print/enscriptfonts/Makefile6
-rw-r--r--print/freetype/Makefile4
-rw-r--r--print/freetype2/Makefile4
-rw-r--r--print/ggv/Makefile4
-rw-r--r--print/ggv2/Makefile4
-rw-r--r--print/ghostscript-afpl/Makefile15
-rw-r--r--print/ghostscript-gnu/Makefile4
-rw-r--r--print/ghostscript-gpl/Makefile15
-rw-r--r--print/ghostscript5/Makefile4
-rw-r--r--print/ghostscript55/Makefile4
-rw-r--r--print/ghostscript6/Makefile15
-rw-r--r--print/ghostscript7/Makefile4
-rw-r--r--print/ghostscript8/Makefile15
-rw-r--r--print/ghostview/Makefile4
-rw-r--r--print/gnome-print/Makefile6
-rw-r--r--print/gnomeprint/Makefile6
-rw-r--r--print/gp/Makefile8
-rw-r--r--print/gsfonts/Makefile4
-rw-r--r--print/gv/Makefile4
-rw-r--r--print/hp2xx/Makefile6
-rw-r--r--print/html2latex/Makefile7
-rw-r--r--print/html2ps-a4/Makefile1
-rw-r--r--print/html2ps-letter/Makefile6
-rw-r--r--print/hyperlatex/Makefile4
-rw-r--r--print/ifhp/Makefile4
-rw-r--r--print/jadetex/Makefile7
-rw-r--r--print/klyx/Makefile4
-rw-r--r--print/latex/Makefile12
-rw-r--r--print/latex2rtf/Makefile5
-rw-r--r--print/libgnomeprint/Makefile6
-rw-r--r--print/lout/Makefile4
-rw-r--r--print/lprps-a4/Makefile1
-rw-r--r--print/lprps-letter/Makefile6
-rw-r--r--print/lyx-devel/Makefile6
-rw-r--r--print/lyx/Makefile6
-rw-r--r--print/lyx14/Makefile6
-rw-r--r--print/lyx15/Makefile6
-rw-r--r--print/lyx16/Makefile6
-rw-r--r--print/magicfilter/Makefile4
-rw-r--r--print/makeindex/Makefile4
-rw-r--r--print/mgv/Makefile4
-rw-r--r--print/mp-a4/Makefile1
-rw-r--r--print/mp-letter/Makefile6
-rw-r--r--print/mpage/Makefile5
-rw-r--r--print/musixtex/Makefile4
-rw-r--r--print/nenscript/Makefile4
-rw-r--r--print/offix-printer/Makefile6
-rw-r--r--print/pbm2ppa/Makefile8
-rw-r--r--print/pclprint/Makefile4
-rw-r--r--print/pdflib/Makefile4
-rw-r--r--print/pdflib3/Makefile4
-rw-r--r--print/pdflib4/Makefile4
-rw-r--r--print/pdq/Makefile4
-rw-r--r--print/perlftlib/Makefile4
-rw-r--r--print/pkfonts118/Makefile1
-rw-r--r--print/pkfonts240/Makefile1
-rw-r--r--print/pkfonts300/Makefile5
-rw-r--r--print/pkfonts360/Makefile1
-rw-r--r--print/pkfonts400/Makefile1
-rw-r--r--print/pkfonts600/Makefile1
-rw-r--r--print/pnm2ppa/Makefile8
-rw-r--r--print/poster/Makefile6
-rw-r--r--print/pstotext/Makefile6
-rw-r--r--print/psutils-a4/Makefile1
-rw-r--r--print/psutils-letter/Makefile6
-rw-r--r--print/rlpr/Makefile5
-rw-r--r--print/rtf2latex/Makefile6
-rw-r--r--print/t1utils/Makefile4
-rw-r--r--print/teTeX-base/Makefile4
-rw-r--r--print/teTeX/Makefile4
-rw-r--r--print/tex/Makefile5
-rw-r--r--print/texinfo/Makefile5
-rw-r--r--print/tgif2tex/Makefile6
-rw-r--r--print/tr2latex/Makefile6
-rw-r--r--print/transfig/Makefile6
-rw-r--r--print/trueprint/Makefile4
-rw-r--r--print/virtualpaper/Makefile4
-rw-r--r--print/xdvi/Makefile6
-rw-r--r--print/xdvik/Makefile4
-rw-r--r--print/xmbibtex/Makefile4
-rw-r--r--print/xtem/Makefile7
-rw-r--r--print/yatex-mule/Makefile4
-rw-r--r--print/yatex-xemacs-mule/Makefile4
-rw-r--r--print/yatex-xemacs/Makefile4
-rw-r--r--print/yatex/Makefile6
117 files changed, 284 insertions, 317 deletions
diff --git a/print/a2ps-a4/Makefile b/print/a2ps-a4/Makefile
index 5410bce1652..7f74149542e 100644
--- a/print/a2ps-a4/Makefile
+++ b/print/a2ps-a4/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: a2ps (a4)
-# Version required: 4.10.3
# Date created: 15 July 1998
# Whom: Chuck Robey (chuckr@freebsd.org)
#
diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index ba5a072e259..bba41e12633 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -1,17 +1,16 @@
# New ports collection makefile for: a2ps (letter)
-# Version required: 4.10.3
# Date created: 15 July 1998
# Whom: Chuck Robey (chuckr@freebsd.org)
#
# $FreeBSD$
#
-DISTNAME= a2ps-4.12
-PKGNAME= a2ps-${PAPERSIZE}-4.12
+PORTNAME= a2ps-${PAPERSIZE}
+PORTVERSION= 4.12
CATEGORIES= print
MASTER_SITES= http://people.FreeBSD.org/~chuckr/ \
ftp://ftp.enst.fr/pub/unix/a2ps/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} sheets.map
+DISTFILES= a2ps-${PORTVERSION}${EXTRACT_SUFX} sheets.map
MAINTAINER= chuckr@FreeBSD.org
diff --git a/print/a2ps-letterdj/Makefile b/print/a2ps-letterdj/Makefile
index 3ece50455ac..80c8aab4a4c 100644
--- a/print/a2ps-letterdj/Makefile
+++ b/print/a2ps-letterdj/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: a2ps (letterdj)
-# Version required: 4.10.3
# Date created: 15 July 1998
# Whom: Chuck Robey (chuckr@freebsd.org)
#
diff --git a/print/a2ps43-a4/Makefile b/print/a2ps43-a4/Makefile
index 1d916c69e8e..b783a87f4b6 100644
--- a/print/a2ps43-a4/Makefile
+++ b/print/a2ps43-a4/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: a2ps (a4)
-# Version required: 4.3
# Date created: 6 November 1994
# Whom: jmz & David O'Brien (obrien@cs.ucdavis.edu)
#
diff --git a/print/a2ps43-letter/Makefile b/print/a2ps43-letter/Makefile
index a2318507119..4a495cc93cd 100644
--- a/print/a2ps43-letter/Makefile
+++ b/print/a2ps43-letter/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# New ports collection makefile for: a2ps
-# Version required: 0.0
# Date created: 6 November 1994
# Whom: jmz & David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= a2ps.V4.3
-PKGNAME= a2ps-${PAPERSIZE}-4.3
+PORTNAME= a2ps-${PAPERSIZE}
+PORTVERSION= 4.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.imag.fr/archive/postscript/format.translators/
+DISTNAME= a2ps.V4.3
MAINTAINER= obrien@FreeBSD.org
diff --git a/print/acroread-commfont/Makefile b/print/acroread-commfont/Makefile
index 1f9c1a78976..bd9abcb3d08 100644
--- a/print/acroread-commfont/Makefile
+++ b/print/acroread-commfont/Makefile
@@ -1,15 +1,14 @@
# New ports collection makefile for: acroread-commfont
-# Version required: 1999.7.20
-# Date created: 99/06/16
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME?= commfont # dummy
-PKGNAME= ${PKG_PRE}acroread-${DISTNAME}-1999.7.20
+PORTNAME= ${PKG_PRE}acroread-${DISTNAME}
+PORTVERSION= 1999.7.20
CATEGORIES?= japanese print linux
MASTER_SITES= ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
+DISTNAME?= commfont # dummy
MAINTAINER= taoka@FreeBSD.org
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index 0c659a24cb1..18e0274e4f5 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: acroread
-# Version required: 3.02
# Date created: 16 November 1996
# Whom: Thomas Gellekum <tg@freebsd.org>
#
@@ -7,15 +6,16 @@
#
.include <bsd.port.pre.mk>
+PORTNAME= acroread
+PORTVERSION= 3.02
+CATEGORIES= print linux
+MASTER_SITES= ftp://ftp.adobe.com/pub/adobe/acrobatreader/unix/3.x/ \
+ ftp://sunsite.cnlab-switch.ch/mirror/acrobatreader/unix/3.x/
.if ${ARCH} == "i386"
DISTNAME= ar302lin
.elif ${ARCH} == "alpha"
DISTNAME= ar302osf
.endif
-PKGNAME= acroread-3.02
-CATEGORIES= print linux
-MASTER_SITES= ftp://ftp.adobe.com/pub/adobe/acrobatreader/unix/3.x/ \
- ftp://sunsite.cnlab-switch.ch/mirror/acrobatreader/unix/3.x/
EXTRACT_SUFX= .tar.Z
MAINTAINER= tg@FreeBSD.org
diff --git a/print/acroread4/Makefile b/print/acroread4/Makefile
index 4cff4b62a0e..34d9e197ec1 100644
--- a/print/acroread4/Makefile
+++ b/print/acroread4/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: acroread
-# Version required: 4.0
# Date created: 16 November 1996
# Whom: Thomas Gellekum <tg@freebsd.org>
#
@@ -7,14 +6,15 @@
#
.include <bsd.port.pre.mk>
+PORTNAME= acroread
+PORTVERSION= 4.05
+CATEGORIES= print linux
+MASTER_SITES= ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
.if ${ARCH} == "i386"
DISTNAME= linux-ar-405
.elif ${ARCH} == "alpha"
DISTNAME= fdec-rs-405
.endif
-PKGNAME= acroread-4.05
-CATEGORIES= print linux
-MASTER_SITES= ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
MAINTAINER= dima@FreeBSD.org
diff --git a/print/acroread5-commfont/Makefile b/print/acroread5-commfont/Makefile
index 1f9c1a78976..bd9abcb3d08 100644
--- a/print/acroread5-commfont/Makefile
+++ b/print/acroread5-commfont/Makefile
@@ -1,15 +1,14 @@
# New ports collection makefile for: acroread-commfont
-# Version required: 1999.7.20
-# Date created: 99/06/16
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME?= commfont # dummy
-PKGNAME= ${PKG_PRE}acroread-${DISTNAME}-1999.7.20
+PORTNAME= ${PKG_PRE}acroread-${DISTNAME}
+PORTVERSION= 1999.7.20
CATEGORIES?= japanese print linux
MASTER_SITES= ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
+DISTNAME?= commfont # dummy
MAINTAINER= taoka@FreeBSD.org
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index 4cff4b62a0e..34d9e197ec1 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: acroread
-# Version required: 4.0
# Date created: 16 November 1996
# Whom: Thomas Gellekum <tg@freebsd.org>
#
@@ -7,14 +6,15 @@
#
.include <bsd.port.pre.mk>
+PORTNAME= acroread
+PORTVERSION= 4.05
+CATEGORIES= print linux
+MASTER_SITES= ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
.if ${ARCH} == "i386"
DISTNAME= linux-ar-405
.elif ${ARCH} == "alpha"
DISTNAME= fdec-rs-405
.endif
-PKGNAME= acroread-4.05
-CATEGORIES= print linux
-MASTER_SITES= ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
MAINTAINER= dima@FreeBSD.org
diff --git a/print/afm/Makefile b/print/afm/Makefile
index 59478682362..02cf9ea9ecf 100644
--- a/print/afm/Makefile
+++ b/print/afm/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: afm
-# Version required: ?
# Date created: 23 November 1994
# Whom: ljo
#
# $FreeBSD$
#
-DISTNAME= afm
-PKGNAME= afm-1.0
+PORTNAME= afm
+PORTVERSION= 1.0
CATEGORIES= print
MASTER_SITES= ftp://sgi.com/sgi/fax/source/
+DISTNAME= afm
EXTRACT_SUFX= -tar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/print/amspsfnt/Makefile b/print/amspsfnt/Makefile
index b2e5a1fa5ff..459a5cec1ea 100644
--- a/print/amspsfnt/Makefile
+++ b/print/amspsfnt/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: amspsfnt
-# Version required: 1.0
# Date created: 11 September 1998
# Whom: giffunip
#
# $FreeBSD$
#
-DISTNAME= amsps
-PKGNAME= amspsfnt-1.0
+PORTNAME= amspsfnt
+PORTVERSION= 1.0
CATEGORIES= print
MASTER_SITES= ftp://ftp.ams.org/pub/tex/psfonts/ams/
+DISTNAME= amsps
EXTRACT_SUFX= -unix.tar.gz
MAINTAINER= ports@FreeBSD.org
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 4b5ec40093c..90ded0c2d1f 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: apsfilter
-# Version required: 4.9.3
# Date created: Tue Nov 14 18:29:48 MET 1995
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= apsfilter-${VERSION}
+PORTNAME= apsfilter
+PORTVERSION= 5.3.3
CATEGORIES= print
MASTER_SITES= http://people.FreeBSD.org/~andreas/apsfilter/download/
@@ -25,7 +25,6 @@ RUN_DEPENDS+= psnup:${PORTSDIR}/print/psutils-letter
RUN_DEPENDS+= smbclient:${PORTSDIR}/net/samba
.endif
-VERSION= 5.3.3
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/apsfilter
diff --git a/print/apsfilter6/Makefile b/print/apsfilter6/Makefile
index 4b5ec40093c..90ded0c2d1f 100644
--- a/print/apsfilter6/Makefile
+++ b/print/apsfilter6/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: apsfilter
-# Version required: 4.9.3
# Date created: Tue Nov 14 18:29:48 MET 1995
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= apsfilter-${VERSION}
+PORTNAME= apsfilter
+PORTVERSION= 5.3.3
CATEGORIES= print
MASTER_SITES= http://people.FreeBSD.org/~andreas/apsfilter/download/
@@ -25,7 +25,6 @@ RUN_DEPENDS+= psnup:${PORTSDIR}/print/psutils-letter
RUN_DEPENDS+= smbclient:${PORTSDIR}/net/samba
.endif
-VERSION= 5.3.3
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/apsfilter
diff --git a/print/asprint/Makefile b/print/asprint/Makefile
index bfb10b10b15..1fbd5d2db93 100644
--- a/print/asprint/Makefile
+++ b/print/asprint/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: asmail
-# Version required: 1.0
# Date created: 16 August 1997
# Whom: brett@peloton.physics.montana.edu
#
# $FreeBSD$
#
-DISTNAME= asprint
-PKGNAME= asprint-1.0
+PORTNAME= asprint
+PORTVERSION= 1.0
CATEGORIES= print
MASTER_SITES= ftp://ftp.afterstep.org/apps/asprint/
+DISTNAME= asprint
MAINTAINER= brett@peloton.runet.edu
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index b80515c2f37..c5b157a7876 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: auctex
-# Version required: 9.9p
# Date created: 21 November 1999
# Whom: Martin Kammerhofer
#
# $FreeBSD$
#
-DISTNAME= auctex-9.9p
+PORTNAME= auctex
+PORTVERSION= 9.9p
CATEGORIES= print elisp
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= support/auctex
diff --git a/print/bibcard/Makefile b/print/bibcard/Makefile
index b94eee2dfb7..32ea9e721ed 100644
--- a/print/bibcard/Makefile
+++ b/print/bibcard/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# Ports collection makefile for: bibcard
-# Version required: 0.0
# Date created: Mon Feb 03, 1997
# Whom: David O'Brien (obrien@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= bibcard.6.4
-PKGNAME= bibcard-0.6.4
+PORTNAME= bibcard
+PORTVERSION= 0.6.4
CATEGORIES= print databases
MASTER_SITES= ftp://crl.nmsu.edu/pub/misc/
+DISTNAME= bibcard.6.4
EXTRACT_SUFX= .tar.Z
MAINTAINER= obrien@NUXI.com
diff --git a/print/bibview/Makefile b/print/bibview/Makefile
index ba66f61d79e..ee2cae31a3e 100644
--- a/print/bibview/Makefile
+++ b/print/bibview/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bibview
-# Version required: 2.2
# Date created: 21 July 1997
# Whom: dbader@eece.unm.edu
#
# $FreeBSD$
#
-DISTNAME= bibview-2.2
+PORTNAME= bibview
+PORTVERSION= 2.2
CATEGORIES= databases print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= biblio/bibtex/utils/bibview-2.0
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= biblio/bibtex/utils/bibview-2.0
MAINTAINER= dbader@eece.unm.edu
USE_IMAKE= yes
-WRKSRC= ${WRKDIR}/bibview-2.2
+WRKSRC= ${WRKDIR}/bibview-${PORTVERSION}
MAN1= bibview.1
.include <bsd.port.mk>
diff --git a/print/c2ps-a4/Makefile b/print/c2ps-a4/Makefile
index 1eb19fe4813..6d36211a9d5 100644
--- a/print/c2ps-a4/Makefile
+++ b/print/c2ps-a4/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: c2ps (a4)
-# Version required: 4.0
# Date created: 19 March 1997
# Whom: Matthew Hunt <mph@pobox.com>
#
diff --git a/print/c2ps-letter/Makefile b/print/c2ps-letter/Makefile
index 9dcbf55f55e..d5edc66a25b 100644
--- a/print/c2ps-letter/Makefile
+++ b/print/c2ps-letter/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: c2ps (letter)
-# Version required: 4.0
# Date created: 19 March 1997
# Whom: Matthew Hunt <mph@pobox.com>
#
# $FreeBSD$
#
-DISTNAME= c2ps-4.0
-PKGNAME= c2ps-${PAPERSIZE}-4.0
+PORTNAME= c2ps-${PAPERSIZE}
+PORTVERSION= 4.0
CATEGORIES= print
MASTER_SITES= http://www.cs.technion.ac.il/users/c2ps/
+DISTNAME= c2ps-${PORTVERSION}
MAINTAINER= mph@freebsd.org
diff --git a/print/cdlabelgen/Makefile b/print/cdlabelgen/Makefile
index 8d9572ccbee..a7a866cfce3 100644
--- a/print/cdlabelgen/Makefile
+++ b/print/cdlabelgen/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cdlabelgen
-# Version required: 1.5.0
# Date created: Tue Jun 23 00:19:55 MET DST 1999
# Whom: Juergen Lock <nox@jelal.kn-bremen.de>
#
# $FreeBSD$
#
-DISTNAME= cdlabelgen-1.5.0
+PORTNAME= cdlabelgen
+PORTVERSION= 1.5.0
CATEGORIES= print
MASTER_SITES= http://www.red-bean.com/~bwf/software/cdlabelgen/
diff --git a/print/cmpsfont/Makefile b/print/cmpsfont/Makefile
index e1580e35f81..68b5dab2616 100644
--- a/print/cmpsfont/Makefile
+++ b/print/cmpsfont/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: cmps
-# Version required: 1.0
# Date created: 11 September 1998
# Whom: giffunip
#
# $FreeBSD$
#
-DISTNAME= cmps
-PKGNAME= cmpsfont-1.0
+PORTNAME= cmpsfont
+PORTVERSION= 1.0
CATEGORIES= print
MASTER_SITES= ftp://ftp.ams.org/pub/tex/psfonts/cm/
+DISTNAME= cmps
EXTRACT_SUFX= -unix.tar.gz
MAINTAINER= ports@FreeBSD.org
diff --git a/print/detex/Makefile b/print/detex/Makefile
index fc78891d778..60328920758 100644
--- a/print/detex/Makefile
+++ b/print/detex/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: detex
-# Version required: 0.0
# Date created: Mon Feb 17, 1997
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= detex-2.6
+PORTNAME= detex
+PORTVERSION= 2.6
CATEGORIES= print
MASTER_SITES= ftp://ftp.cs.purdue.edu/pub/trinkle/
EXTRACT_SUFX= .tar
diff --git a/print/dvi2tty/Makefile b/print/dvi2tty/Makefile
index cfc0c67e037..aec783fc755 100644
--- a/print/dvi2tty/Makefile
+++ b/print/dvi2tty/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: dvi2tty
-# Version required: 1.0
# Date created: 17th February 1997
# Whom: Joel Sutton <jsutton@bbcon.com.au>
#
# $FreeBSD$
#
-DISTNAME= dvi2tty
-PKGNAME= dvi2tty-1.0
+PORTNAME= dvi2tty
+PORTVERSION= 1.0
CATEGORIES= print
MASTER_SITES= ftp://ctan.unsw.edu.au/ctan/tex-archive/dviware/
+DISTNAME= dvi2tty
MAINTAINER= jsutton@bbcon.com.au
diff --git a/print/dvi2xx/Makefile b/print/dvi2xx/Makefile
index 7878fc30d74..f79794ebc20 100644
--- a/print/dvi2xx/Makefile
+++ b/print/dvi2xx/Makefile
@@ -1,17 +1,16 @@
# New ports collection makefile for: dvi2xx
-# Version required: 0.51alpha9
# Date created: 14 October 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= dvi2xx
-PKGNAME= dvi2xx-0.51a9
-DISTFILES= dvi2xx.tar.gz
+PORTNAME= dvi2xx
+PORTVERSION= 0.51.a9
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= dviware
+DISTNAME= dvi2xx
MAINTAINER= jmz@FreeBSD.org
diff --git a/print/dvipdfm/Makefile b/print/dvipdfm/Makefile
index 3ea7e99b4bf..e739b03f5d9 100644
--- a/print/dvipdfm/Makefile
+++ b/print/dvipdfm/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: dvipdfm
-# Version required: 0.12.7
# Date created: 16 January 2000
# Whom: Stephen Montgomery-Smith <stephen@math.missouri.edu>
#
# $FreeBSD$
#
-DISTNAME= dvipdfm-0.12.7b
-PKGNAME= dvipdfm-0.12.7
+PORTNAME= dvipdfm
+PORTVERSION= 0.12.7b
CATEGORIES= print
MASTER_SITES= http://odo.kettering.edu/dvipdfm/
diff --git a/print/dvips/Makefile b/print/dvips/Makefile
index d5f2626c343..7e25abda63c 100644
--- a/print/dvips/Makefile
+++ b/print/dvips/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: dvips
-# Version required: 5.76
# Date created: 30 September 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= dvips576
-PKGNAME= dvips-5.76
+PORTNAME= dvips
+PORTVERSION= 5.76
CATEGORIES= print
MASTER_SITES= ftp://ftp.tex.ac.uk/tex-archive/dviware/dvips/
+DISTNAME= dvips576
MAINTAINER= jmz@FreeBSD.org
diff --git a/print/dvips2ascii/Makefile b/print/dvips2ascii/Makefile
index 025fd0120ea..1aba46e9c3c 100644
--- a/print/dvips2ascii/Makefile
+++ b/print/dvips2ascii/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: dvips2ascii
-# Version required: 1.0
# Date created: 7 Aug 1997
# Whom: eserte@cs.tu-berlin.de
#
# $FreeBSD$
#
-DISTNAME= dvips2ascii-1.3
+PORTNAME= dvips2ascii
+PORTVERSION= 1.3
CATEGORIES= print
MASTER_SITES= http://www.de.freebsd.org/~eserte/distfiles/
diff --git a/print/dviselect/Makefile b/print/dviselect/Makefile
index 77763709683..2bbd92fa5c3 100644
--- a/print/dviselect/Makefile
+++ b/print/dviselect/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: dviselect
-# Version required: ?
# Date created: 12 October 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= dviselect
-PKGNAME= dviselect-1.3
+PORTNAME= dviselect
+PORTVERSION= 1.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.ee.duke.edu/archives/
+DISTNAME= ${PORTNAME}
MAINTAINER= jmz@FreeBSD.org
diff --git a/print/enscript-a4/Makefile b/print/enscript-a4/Makefile
index 1b9cca9af61..572b19fa124 100644
--- a/print/enscript-a4/Makefile
+++ b/print/enscript-a4/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: enscript (a4)
-# Version required: 1.6.1
# Date created: 24 Jul, 1997
# Whom: kline
#
diff --git a/print/enscript-letter/Makefile b/print/enscript-letter/Makefile
index 37a7bf0057c..1dfbeed3c1a 100644
--- a/print/enscript-letter/Makefile
+++ b/print/enscript-letter/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: enscript (letter)
-# Version required: 1.6.1
# Date created: 24 Jul, 1997
# Whom: kline
#
# $FreeBSD$
#
-DISTNAME= enscript-1.6.1
-PKGNAME= enscript-${PAPERSIZE}-1.6.1
+PORTNAME= enscript-${PAPERSIZE}
+PORTVERSION= 1.6.1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= enscript
+DISTNAME= enscript-${PORTVERSION}
MAINTAINER= kline@thought.org
diff --git a/print/enscript-letterdj/Makefile b/print/enscript-letterdj/Makefile
index 9f5766e22a0..43151c8394f 100644
--- a/print/enscript-letterdj/Makefile
+++ b/print/enscript-letterdj/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: enscript (letterdj)
-# Version required: 1.6.1
# Date created: 24 Jul, 1997
# Whom: kline
#
diff --git a/print/enscriptfonts/Makefile b/print/enscriptfonts/Makefile
index 4c21a5131b5..03fdbdfac80 100644
--- a/print/enscriptfonts/Makefile
+++ b/print/enscriptfonts/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: enscriptfonts
-# Version required: 0.75
# Date created: 15 June, 1998
# Whom: kline
#
# $FreeBSD$
#
-DISTNAME= enscript_fonts-0.75
-PKGNAME= enscriptfonts-0.75
+PORTNAME= enscriptfonts
+PORTVERSION= 0.75
CATEGORIES= print
MASTER_SITES= ftp://magnesium.net/pub/FreeBSD/xenscript/
+DISTNAME= enscript_fonts-0.75
EXTRACT_SUFX= .tgz
MAINTAINER= kline@thought.org
diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index 483de34c29f..596161cbdbd 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: freetype
-# Version required: 1.3
# Date created: January 24, 1998
# Whom: jseger@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= freetype-1.3
+PORTNAME= freetype
+PORTVERSION= 1.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.tux.org/pub/devel/freetype/ \
ftp://ftp.lerc.nasa.gov/ImageMagick/delegates/ \
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 483de34c29f..596161cbdbd 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: freetype
-# Version required: 1.3
# Date created: January 24, 1998
# Whom: jseger@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= freetype-1.3
+PORTNAME= freetype
+PORTVERSION= 1.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.tux.org/pub/devel/freetype/ \
ftp://ftp.lerc.nasa.gov/ImageMagick/delegates/ \
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 46bafd631e0..596c133a715 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ggv
-# Version required: 0.82
# Date created: 21 August 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= ggv-0.82
+PORTNAME= ggv
+PORTVERSION= 0.82
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/ggv
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 46bafd631e0..596c133a715 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ggv
-# Version required: 0.82
# Date created: 21 August 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= ggv-0.82
+PORTNAME= ggv
+PORTVERSION= 0.82
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/ggv
diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 548a8fb33b1..ad0aaabf369 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ghostscript
-# Version required: 6.01
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= ghostscript-${GS_VERSION}
+PORTNAME= ghostscript
+PORTVERSION= 6.01
CATEGORIES= print
MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs601/ \
ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
@@ -22,11 +22,10 @@ Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract
LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
-GS_VERSION= 6.01
-PLIST_SUB= GS_VERSION=${GS_VERSION}
+PLIST_SUB= GS_VERSION=${PORTVERSION}
USE_XLIB= yes
EXTRACT_ONLY= ${GS_SOURCES}
-WRKSRC= ${WRKDIR}/gs${GS_VERSION}
+WRKSRC= ${WRKDIR}/gs${PORTVERSION}
USE_GMAKE= yes
MAKEFILE= src/unix-gcc.mak
CFLAGS+= -I${PREFIX}/include
@@ -37,7 +36,7 @@ MAN1= gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf12.1 \
ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1
-GS_SOURCES= ghostscript-${GS_VERSION}.tar.gz
+GS_SOURCES= ghostscript-${PORTVERSION}.tar.gz
# Note: the following two are real files that have symlinks with
# later version numbers pointing to them. To avoid unnecessarily
# downloading distfiles, do not change these when upgrading the port
@@ -101,11 +100,11 @@ post-install:
@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
.for i in ${CONTRIB_UPP}
@${INSTALL_DATA} ${FILESDIR}/$i \
- ${PREFIX}/share/ghostscript/${GS_VERSION}/lib
+ ${PREFIX}/share/ghostscript/${PORTVERSION}/lib
.endfor
.if defined(PDFENCRYPT)
@${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps \
- ${PREFIX}/share/ghostscript/${GS_VERSION}/lib
+ ${PREFIX}/share/ghostscript/${PORTVERSION}/lib
.endif
.include <bsd.port.mk>
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 67a952d4105..23c89a3af3f 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ghostscript
-# Version required: 5.50
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= ghostscript-5.50
+PORTNAME= ghostscript
+PORTVERSION= 5.50
CATEGORIES= print
MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/ \
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 548a8fb33b1..ad0aaabf369 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ghostscript
-# Version required: 6.01
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= ghostscript-${GS_VERSION}
+PORTNAME= ghostscript
+PORTVERSION= 6.01
CATEGORIES= print
MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs601/ \
ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
@@ -22,11 +22,10 @@ Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract
LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
-GS_VERSION= 6.01
-PLIST_SUB= GS_VERSION=${GS_VERSION}
+PLIST_SUB= GS_VERSION=${PORTVERSION}
USE_XLIB= yes
EXTRACT_ONLY= ${GS_SOURCES}
-WRKSRC= ${WRKDIR}/gs${GS_VERSION}
+WRKSRC= ${WRKDIR}/gs${PORTVERSION}
USE_GMAKE= yes
MAKEFILE= src/unix-gcc.mak
CFLAGS+= -I${PREFIX}/include
@@ -37,7 +36,7 @@ MAN1= gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf12.1 \
ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1
-GS_SOURCES= ghostscript-${GS_VERSION}.tar.gz
+GS_SOURCES= ghostscript-${PORTVERSION}.tar.gz
# Note: the following two are real files that have symlinks with
# later version numbers pointing to them. To avoid unnecessarily
# downloading distfiles, do not change these when upgrading the port
@@ -101,11 +100,11 @@ post-install:
@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
.for i in ${CONTRIB_UPP}
@${INSTALL_DATA} ${FILESDIR}/$i \
- ${PREFIX}/share/ghostscript/${GS_VERSION}/lib
+ ${PREFIX}/share/ghostscript/${PORTVERSION}/lib
.endfor
.if defined(PDFENCRYPT)
@${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps \
- ${PREFIX}/share/ghostscript/${GS_VERSION}/lib
+ ${PREFIX}/share/ghostscript/${PORTVERSION}/lib
.endif
.include <bsd.port.mk>
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index 49c3ad4793d..9d9871d99cc 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ghostscript
-# Version required: 5.10
# Date created: 11 December 1998
# Whom: giffunip
#
# $FreeBSD$
#
-DISTNAME= ghostscript-5.10
+PORTNAME= ghostscript
+PORTVERSION= 5.10
CATEGORIES= print
MASTER_SITES= ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/ \
${MASTER_SITE_GNU} \
diff --git a/print/ghostscript55/Makefile b/print/ghostscript55/Makefile
index 67a952d4105..23c89a3af3f 100644
--- a/print/ghostscript55/Makefile
+++ b/print/ghostscript55/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ghostscript
-# Version required: 5.50
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= ghostscript-5.50
+PORTNAME= ghostscript
+PORTVERSION= 5.50
CATEGORIES= print
MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/ \
diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index 548a8fb33b1..ad0aaabf369 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ghostscript
-# Version required: 6.01
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= ghostscript-${GS_VERSION}
+PORTNAME= ghostscript
+PORTVERSION= 6.01
CATEGORIES= print
MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs601/ \
ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
@@ -22,11 +22,10 @@ Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract
LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
-GS_VERSION= 6.01
-PLIST_SUB= GS_VERSION=${GS_VERSION}
+PLIST_SUB= GS_VERSION=${PORTVERSION}
USE_XLIB= yes
EXTRACT_ONLY= ${GS_SOURCES}
-WRKSRC= ${WRKDIR}/gs${GS_VERSION}
+WRKSRC= ${WRKDIR}/gs${PORTVERSION}
USE_GMAKE= yes
MAKEFILE= src/unix-gcc.mak
CFLAGS+= -I${PREFIX}/include
@@ -37,7 +36,7 @@ MAN1= gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf12.1 \
ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1
-GS_SOURCES= ghostscript-${GS_VERSION}.tar.gz
+GS_SOURCES= ghostscript-${PORTVERSION}.tar.gz
# Note: the following two are real files that have symlinks with
# later version numbers pointing to them. To avoid unnecessarily
# downloading distfiles, do not change these when upgrading the port
@@ -101,11 +100,11 @@ post-install:
@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
.for i in ${CONTRIB_UPP}
@${INSTALL_DATA} ${FILESDIR}/$i \
- ${PREFIX}/share/ghostscript/${GS_VERSION}/lib
+ ${PREFIX}/share/ghostscript/${PORTVERSION}/lib
.endfor
.if defined(PDFENCRYPT)
@${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps \
- ${PREFIX}/share/ghostscript/${GS_VERSION}/lib
+ ${PREFIX}/share/ghostscript/${PORTVERSION}/lib
.endif
.include <bsd.port.mk>
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 67a952d4105..23c89a3af3f 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ghostscript
-# Version required: 5.50
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= ghostscript-5.50
+PORTNAME= ghostscript
+PORTVERSION= 5.50
CATEGORIES= print
MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/ \
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 548a8fb33b1..ad0aaabf369 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ghostscript
-# Version required: 6.01
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= ghostscript-${GS_VERSION}
+PORTNAME= ghostscript
+PORTVERSION= 6.01
CATEGORIES= print
MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs601/ \
ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
@@ -22,11 +22,10 @@ Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract
LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
-GS_VERSION= 6.01
-PLIST_SUB= GS_VERSION=${GS_VERSION}
+PLIST_SUB= GS_VERSION=${PORTVERSION}
USE_XLIB= yes
EXTRACT_ONLY= ${GS_SOURCES}
-WRKSRC= ${WRKDIR}/gs${GS_VERSION}
+WRKSRC= ${WRKDIR}/gs${PORTVERSION}
USE_GMAKE= yes
MAKEFILE= src/unix-gcc.mak
CFLAGS+= -I${PREFIX}/include
@@ -37,7 +36,7 @@ MAN1= gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf12.1 \
ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1
-GS_SOURCES= ghostscript-${GS_VERSION}.tar.gz
+GS_SOURCES= ghostscript-${PORTVERSION}.tar.gz
# Note: the following two are real files that have symlinks with
# later version numbers pointing to them. To avoid unnecessarily
# downloading distfiles, do not change these when upgrading the port
@@ -101,11 +100,11 @@ post-install:
@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
.for i in ${CONTRIB_UPP}
@${INSTALL_DATA} ${FILESDIR}/$i \
- ${PREFIX}/share/ghostscript/${GS_VERSION}/lib
+ ${PREFIX}/share/ghostscript/${PORTVERSION}/lib
.endfor
.if defined(PDFENCRYPT)
@${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps \
- ${PREFIX}/share/ghostscript/${GS_VERSION}/lib
+ ${PREFIX}/share/ghostscript/${PORTVERSION}/lib
.endif
.include <bsd.port.mk>
diff --git a/print/ghostview/Makefile b/print/ghostview/Makefile
index 54f29854018..007b93bb98c 100644
--- a/print/ghostview/Makefile
+++ b/print/ghostview/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ghostview
-# Version required: 1.5
# Date created: 21 October 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= ghostview-1.5
+PORTNAME= ghostview
+PORTVERSION= 1.5
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ghostview
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 45dd17b2b0d..e485183f1d7 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomeprint
-# Version required: 0.16
# Date created: 15 Jan 1999
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gnome-print-0.16
-PKGNAME= gnomeprint-0.16
+PORTNAME= gnomeprint
+PORTVERSION= 0.16
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-print
+DISTNAME= gnome-print-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile
index 45dd17b2b0d..e485183f1d7 100644
--- a/print/gnomeprint/Makefile
+++ b/print/gnomeprint/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomeprint
-# Version required: 0.16
# Date created: 15 Jan 1999
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gnome-print-0.16
-PKGNAME= gnomeprint-0.16
+PORTNAME= gnomeprint
+PORTVERSION= 0.16
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-print
+DISTNAME= gnome-print-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/print/gp/Makefile b/print/gp/Makefile
index ae51af682c4..12f4c550a13 100644
--- a/print/gp/Makefile
+++ b/print/gp/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: GP
-# Version required: 2.5p1
# Date created: 15 April 1997
# Whom: Kiriyama Kazuhiko<kiri@kiri.toba-cmt.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= GP-2.5p2
-PKGNAME?= gp-2.5p2
+PORTNAME?= gp
+PORTVERSION?= 2.5.p2
CATEGORIES= print tk42
MASTER_SITES= http://www.itbrain.co.jp/~ueda/GP/
+DISTNAME= GP-2.5p2
MAINTAINER= kiri@kiri.toba-cmt.ac.jp
@@ -30,7 +30,7 @@ RUN_DEPENDS+= ${PREFIX}/bin/wish4.2:${PORTSDIR}/x11-toolkits/tk42
LANGEXT= en
DOCDIRNAME= Doc
DOCEXT=
-PAPERSIZE= letter
+pAPERSIZE= letter
.elif (${LANGUAGE} == "Japanese")
ALL_TARGET= ja filters
LIB_DEPENDS= tcl76jp.1:${PORTSDIR}/japanese/tcl76
diff --git a/print/gsfonts/Makefile b/print/gsfonts/Makefile
index d1161efc4f7..285e5f9c200 100644
--- a/print/gsfonts/Makefile
+++ b/print/gsfonts/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gsfonts
-# Version required: 5.10
# Date created: 11 September 1997
# Whom: giffunip
#
# $FreeBSD$
#
-DISTNAME= gsfonts-5.10
+PORTNAME= gsfonts
+PORTVERSION= 5.10
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.cs.wisc.edu/ghost/gnu/gs510/
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 9e06fd85542..4de0e2e4b44 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: gv
-# Version required: 0.0
# Date created: 16 Apr 1996
# Whom: tg@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= gv-3.5.8
+PORTNAME= gv
+PORTVERSION= 3.5.8
CATEGORIES= print
MASTER_SITES= ftp://ftpthep.physik.uni-mainz.de/pub/gv/unix/ \
${MASTER_SITE_TEX_CTAN}
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index 6e4e7bdf27d..1fd8554c201 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: hp2xx
-# Version required: 3.20
# Date created: 17 Jan 1999
# Whom: Lars Koeller
#
# $FreeBSD$
#
-DISTNAME= hp2xx-3.20-png
-PKGNAME= hp2xx-3.20
+PORTNAME= hp2xx
+PORTVERSION= 3.20
CATEGORIES= print x11
MASTER_SITES= ftp://ftp.rz.uni-duesseldorf.de/pub/graphics/ \
ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/
+DISTNAME= hp2xx-3.20-png
MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE
diff --git a/print/html2latex/Makefile b/print/html2latex/Makefile
index 9ebe1dc954e..73a69a9ee99 100644
--- a/print/html2latex/Makefile
+++ b/print/html2latex/Makefile
@@ -1,17 +1,16 @@
# New ports collection makefile for: html2latex
-# Version required: 0.9c
# Date created: 29-March-1996
# Whom: joerg
#
# $FreeBSD$
#
-DISTNAME= html2latex-0.9c
-PKGNAME= html2latex-0.9
+PORTNAME= html2latex
+PORTVERSION= 0.9c
CATEGORIES= print
# I can't seem to find the original dist site
MASTER_SITES= ftp://ftp.interface-business.de/pub/outgoing/
-DISTFILES= html2latex-0.9c.tar.Z
+EXTRACT_SUFX= .tar.Z
MAINTAINER= joerg@FreeBSD.org
diff --git a/print/html2ps-a4/Makefile b/print/html2ps-a4/Makefile
index f28982327cd..f2ef6bfb679 100644
--- a/print/html2ps-a4/Makefile
+++ b/print/html2ps-a4/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: html2ps-a4
-# Version required: 1.0b1
# Date created: Sat Nov 22 12:54:50 CET 1997
# Whom: andreas
#
diff --git a/print/html2ps-letter/Makefile b/print/html2ps-letter/Makefile
index c121f2e160c..1c26d3441e3 100644
--- a/print/html2ps-letter/Makefile
+++ b/print/html2ps-letter/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: html2ps-letter
-# Version required: 1.0b1
# Date created: Sat Nov 22 12:54:50 CET 1997
# Whom: andreas
#
# $FreeBSD$
#
-DISTNAME= html2ps-1.0b1
-PKGNAME= html2ps-${PAPERSIZE}-1.0
+PORTNAME= html2ps-${PAPERSIZE}
+PORTVERSION= 1.0
CATEGORIES= print www perl5
MASTER_SITES= http://www.tdb.uu.se/~jan/
+DISTNAME= html2ps-1.0b1
MAINTAINER= andreas@FreeBSD.org
diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile
index 65d73cb4fc3..89b8c06682d 100644
--- a/print/hyperlatex/Makefile
+++ b/print/hyperlatex/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Hyperlatex
-# Version required: 2.3.1
# Date created: 2 August 1994
# Whom: Robert Withrow <witr@rwwa.com>
#
# $FreeBSD$
#
-DISTNAME= Hyperlatex-2.3.1
+PORTNAME= Hyperlatex
+PORTVERSION= 2.3.1
CATEGORIES= print
MASTER_SITES= ftp://ftp.cs.uni-magdeburg.de/pub/ipe/
diff --git a/print/ifhp/Makefile b/print/ifhp/Makefile
index 75337f8e5e2..1dc98675bd3 100644
--- a/print/ifhp/Makefile
+++ b/print/ifhp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ifhp
-# Version required: 3.3.10
# Date created: 27 August 1999
# Whom: papowell@astart.com
#
# $FreeBSD$
#
-DISTNAME= ifhp-3.3.10
+PORTNAME= ifhp
+PORTVERSION= 3.3.10
CATEGORIES= print
MASTER_SITES= ftp://ftp.astart.com/pub/LPRng/FILTERS/
EXTRACT_SUFX= .tgz
diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index 2e02b8cd529..4640b888d94 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: jadetex
-# Version required: 2.3
# Date created: 5 December 1998
# Whom: Sean Kelly <kelly@plutotech.com>
#
@@ -12,11 +11,10 @@
# EXTRACT_SUFX, EXTRACT_AFTER_ARGS, and NO_WRKSUBDIR.
#
-DISTNAME= jadetex
-PKGNAME= ${DISTNAME}-${VERSION}
+PORTNAME= jadetex
+PORTVERSION= 2.3
CATEGORIES= print
MASTER_SITES= http://people.FreeBSD.org/~nik/distfiles/jadetex/
-EXTRACT_SUFX=
DISTFILES= Makefile.jadetex jadetex.dtx jadetex.ini jadetex.ins \
pdfjadetex.ini
@@ -25,7 +23,6 @@ MAINTAINER= kelly@plutotech.com
BUILD_DEPENDS= tex:${PORTSDIR}/print/teTeX
RUN_DEPENDS= tex:${PORTSDIR}/print/teTeX
-VERSION= 2.3
DIST_SUBDIR= jadetex
NO_WRKSUBDIR= yes
EXTRACT_CMD= ${CP}
diff --git a/print/klyx/Makefile b/print/klyx/Makefile
index c5317bae57a..8620f7ca343 100644
--- a/print/klyx/Makefile
+++ b/print/klyx/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: klyx
-# Version required: 0.10.0
# Date created: 23 May 1998
# Whom: Hans Petter Bieker <hanspb@persbraten.vgs.no>
#
# $FreeBSD$
#
-DISTNAME= klyx-0.10.0
+PORTNAME= klyx
+PORTVERSION= 0.10.0
CATEGORIES= print kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= unstable/apps/office
diff --git a/print/latex/Makefile b/print/latex/Makefile
index ee8534a05a1..8eebea15fae 100644
--- a/print/latex/Makefile
+++ b/print/latex/Makefile
@@ -1,25 +1,23 @@
# New ports collection makefile for: latex
-# Version required: ?
# Date created: 29 September 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= latex
-PKGNAME= latex2e-${VERSION}
+PORTNAME= latex2e
+PORTVERSION= 99.12
CATEGORIES= print
MASTER_SITES= ftp://ftp.freesoftware.com/pub/tex/package/
-DISTFILES= latex_mf-${VERSION}.tar.gz latex_tfm-${VERSION}.tar.gz \
- latex_base-${VERSION}.tar.gz latex_tools-${VERSION}.tar.gz \
- latex_graphics-${VERSION}.tar.gz latex_psnfss-${VERSION}.tar.gz
+DISTFILES= latex_mf-${PORTVERSION}.tar.gz latex_tfm-${PORTVERSION}.tar.gz \
+ latex_base-${PORTVERSION}.tar.gz latex_tools-${PORTVERSION}.tar.gz \
+ latex_graphics-${PORTVERSION}.tar.gz latex_psnfss-${PORTVERSION}.tar.gz
MAINTAINER= jmz@FreeBSD.org
BUILD_DEPENDS= tex:${PORTSDIR}/print/tex
RUN_DEPENDS= tex:${PORTSDIR}/print/tex
-VERSION= 99.12
NO_WRKSUBDIR= yes
MANUAL_PACKAGE_BUILD= has to be built with tex port
diff --git a/print/latex2rtf/Makefile b/print/latex2rtf/Makefile
index e8a5690c9ec..1f1af67766a 100644
--- a/print/latex2rtf/Makefile
+++ b/print/latex2rtf/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: latex2rtf
-# Version required: 1.8
# Date created: 14 Dec 1999
# Whom: Joerg Wunsch <joerg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= latex2rtf-1.8a
-PKGNAME= latex2rtf-1.8
+PORTNAME= latex2rtf
+PORTVERSION= 1.8a
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= support/latex2rtf
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 45dd17b2b0d..e485183f1d7 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomeprint
-# Version required: 0.16
# Date created: 15 Jan 1999
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gnome-print-0.16
-PKGNAME= gnomeprint-0.16
+PORTNAME= gnomeprint
+PORTVERSION= 0.16
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-print
+DISTNAME= gnome-print-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/print/lout/Makefile b/print/lout/Makefile
index ccf079cd272..9a6fa73ae34 100644
--- a/print/lout/Makefile
+++ b/print/lout/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: lout
-# Version required: 3.17
# Date created: 10/22/96
# Whom: oly@world.std.com
#
# $FreeBSD$
#
-DISTNAME= lout-3.17
+PORTNAME= lout
+PORTVERSION= 3.17
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN} \
ftp://ftp.cs.usyd.edu.au/jeff/lout/
diff --git a/print/lprps-a4/Makefile b/print/lprps-a4/Makefile
index b528d5c855b..a29af8356ef 100644
--- a/print/lprps-a4/Makefile
+++ b/print/lprps-a4/Makefile
@@ -1,6 +1,5 @@
# ex:ts=8
# Ports collection makefile for: lprps (a4)
-# Version required: 0.0
# Date created: Sat Aug 3, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
diff --git a/print/lprps-letter/Makefile b/print/lprps-letter/Makefile
index c177772b81b..b33b7c5c443 100644
--- a/print/lprps-letter/Makefile
+++ b/print/lprps-letter/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# Ports collection makefile for: lprps (letter)
-# Version required: 0.0
# Date created: Sat Aug 3, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= lprps-2.5
-PKGNAME= lprps-${PAPERSIZE}-2.5
+PORTNAME= lprps-${PAPERSIZE}
+PORTVERSION= 2.5
CATEGORIES= print
MASTER_SITES= ftp://ftp.jclark.com/pub/lprps/
+DISTNAME= lprps-2.5
EXTRACT_SUFX= .tar.Z
MAINTAINER= obrien@FreeBSD.org
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index b682814b141..b0d31f520bc 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: lyx
-# Version required: 1.1.4
# Date created: Sa 12 Okt 1996 19:20:51 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= lyx-1.1.4
-PKGNAME= lyx-1.1.4.2
+PORTNAME= lyx
+PORTVERSION= 1.1.4.2
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
+DISTNAME= lyx-1.1.4
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index b682814b141..b0d31f520bc 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: lyx
-# Version required: 1.1.4
# Date created: Sa 12 Okt 1996 19:20:51 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= lyx-1.1.4
-PKGNAME= lyx-1.1.4.2
+PORTNAME= lyx
+PORTVERSION= 1.1.4.2
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
+DISTNAME= lyx-1.1.4
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index b682814b141..b0d31f520bc 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: lyx
-# Version required: 1.1.4
# Date created: Sa 12 Okt 1996 19:20:51 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= lyx-1.1.4
-PKGNAME= lyx-1.1.4.2
+PORTNAME= lyx
+PORTVERSION= 1.1.4.2
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
+DISTNAME= lyx-1.1.4
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index b682814b141..b0d31f520bc 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: lyx
-# Version required: 1.1.4
# Date created: Sa 12 Okt 1996 19:20:51 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= lyx-1.1.4
-PKGNAME= lyx-1.1.4.2
+PORTNAME= lyx
+PORTVERSION= 1.1.4.2
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
+DISTNAME= lyx-1.1.4
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index b682814b141..b0d31f520bc 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: lyx
-# Version required: 1.1.4
# Date created: Sa 12 Okt 1996 19:20:51 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= lyx-1.1.4
-PKGNAME= lyx-1.1.4.2
+PORTNAME= lyx
+PORTVERSION= 1.1.4.2
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
+DISTNAME= lyx-1.1.4
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index 153f5ac735d..18eaf0813ee 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: magicfilter
-# Version required: magicfilter-1.2
# Date created: 24 Mar 1999
# Whom: CHOI Junho <cjh@kr.freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= magicfilter-1.2
+PORTNAME= magicfilter
+PORTVERSION= 1.2
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/printing
diff --git a/print/makeindex/Makefile b/print/makeindex/Makefile
index 68b46e54f5c..a8716ba26b7 100644
--- a/print/makeindex/Makefile
+++ b/print/makeindex/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: makeindex
-# Version required: 3.0.8
# Date created: 12 October 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= makeindex-3.0.8
+PORTNAME= makeindex
+PORTVERSION= 3.0.8
CATEGORIES= print
MASTER_SITES= ftp://ftp.th-darmstadt.de/pub/tex/src/makeindex/BETA/
EXTRACT_SUFX= .tar.Z
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index bd4beeac5cd..d03a79c3fab 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mgv
-# Version required: mgv-3.1.5
# Date created: 4 Mar 1998
# Whom: handy@physics.montana.edu
#
# $FreeBSD$
#
-DISTNAME= mgv-3.1.5
+PORTNAME= mgv
+PORTVERSION= 3.1.5
CATEGORIES= print
MASTER_SITES= http://www.trends.net/~mu/srcs/
diff --git a/print/mp-a4/Makefile b/print/mp-a4/Makefile
index 954b0e8b20e..f3c8060dbc3 100644
--- a/print/mp-a4/Makefile
+++ b/print/mp-a4/Makefile
@@ -1,6 +1,5 @@
# ex:ts=8
# Ports collection makefile for: mp (a4)
-# Version required: 0.0
# Date created: 11 July 1996
# Whom: David O'Brien <obrien@cs.ucdavis.edu>
#
diff --git a/print/mp-letter/Makefile b/print/mp-letter/Makefile
index df02b7c46f1..384a4acb9b2 100644
--- a/print/mp-letter/Makefile
+++ b/print/mp-letter/Makefile
@@ -1,17 +1,17 @@
# ex:ts=8
# Ports collection makefile for: mp (letter)
-# Version required: 0.0
# Date created: 11 July 1996
# Whom: David O'Brien <obrien@cs.ucdavis.edu>
#
# $FreeBSD$
#
-DISTNAME= mp-3.0.1
-PKGNAME= mp-${PAPERSIZE}-3.0.1
+PORTNAME= mp-${PAPERSIZE}
+PORTVERSION= 3.0.1
CATEGORIES= print
MASTER_SITES= ftp://ftp.NUXI.com/pub/misc/ \
ftp://ftp.win.tue.nl/pub/mail/
+DISTNAME= mp-3.0.1
MAINTAINER= obrien@FreeBSD.org
diff --git a/print/mpage/Makefile b/print/mpage/Makefile
index 83e4fa49adc..7f3247a11ec 100644
--- a/print/mpage/Makefile
+++ b/print/mpage/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: mpage
-# Version required: 2.5
# Date created: 19 February 1998
# Whom: Kapil Chowksey
#
# $FreeBSD$
+#
-DISTNAME= mpage-2.5
+PORTNAME= mpage
+PORTVERSION= 2.5
CATEGORIES= print
MASTER_SITES= ftp://ftp.mesa.nl/pub/mpage/
EXTRACT_SUFX= .tgz
diff --git a/print/musixtex/Makefile b/print/musixtex/Makefile
index 2950da37bf3..6bd7eb9f6f8 100644
--- a/print/musixtex/Makefile
+++ b/print/musixtex/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: musixtex
-# Version required: T97
# Date created: 9 july 1995
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= musixtex-T98
+PORTNAME= musixtex
+PORTVERSION= T98
CATEGORIES= print
MASTER_SITES= ftp://ftp.tex.ac.uk/tex-archive/macros/musixtex/taupin/
DISTFILES= musixtex-T98.tar.gz musixexa-T90.tar.gz
diff --git a/print/nenscript/Makefile b/print/nenscript/Makefile
index 3098e9ead79..71847abcb88 100644
--- a/print/nenscript/Makefile
+++ b/print/nenscript/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nenscript
-# Version required: 1.13.3
# Date created: 10 November 1999
# Whom: cjm2
#
# $FreeBSD$
#
-DISTNAME= nenscript-1.13.3
+PORTNAME= nenscript
+PORTVERSION= 1.13.3
CATEGORIES= print
MASTER_SITES= http://www.im.lcs.mit.edu/~magnus/nenscript/
diff --git a/print/offix-printer/Makefile b/print/offix-printer/Makefile
index 8ac6dabe9e9..3ba5a5574a5 100644
--- a/print/offix-printer/Makefile
+++ b/print/offix-printer/Makefile
@@ -1,16 +1,16 @@
# ports collection makefile for: Clipboard
-# Version required: 2.4
# Date created: 28 Jun 1997
# Whom: Ruslan Shevchenko <ruslan@shevchenko.kiev.ua>
#
# $FreeBSD$
#
-DISTNAME= Printer-2.4
-PKGNAME= offix-printer-2.4
+PORTNAME= offix-printer
+PORTVERSION= 2.4
CATEGORIES= print offix
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= desktop_managers/OffiX
+DISTNAME= Printer-2.4
MAINTAINER= ruslan@shevchenko.kiev.ua
diff --git a/print/pbm2ppa/Makefile b/print/pbm2ppa/Makefile
index ee86c6ccd37..81025343d11 100644
--- a/print/pbm2ppa/Makefile
+++ b/print/pbm2ppa/Makefile
@@ -1,22 +1,22 @@
# New ports collection makefile for: pbm2ppa
-# Version required: 0.8.6
# Date created: 18 November 1998
# Whom: smace@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= ppa-0.8.6
-PKGNAME= pbm2ppa-0.8.6
+PORTNAME= pbm2ppa
+PORTVERSION= 0.8.6
CATEGORIES= print
MASTER_SITES= http://www.httptech.com/ppa/files/
+DISTNAME= ppa-0.8.6
MAINTAINER= smace@freebsd.org
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript5 \
enscript:${PORTSDIR}/print/enscript-letter
-WRKSRC= ${WRKDIR}/pbm2ppa-0.8.6
+WRKSRC= ${WRKDIR}/${PKGNAME}
USE_GMAKE= yes
HPMODEL?= 720
diff --git a/print/pclprint/Makefile b/print/pclprint/Makefile
index b5e58c220bb..b88f4099237 100644
--- a/print/pclprint/Makefile
+++ b/print/pclprint/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pclprint
-# Version required: 1.0
# Date created: 27 Aug 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= pclprint-1.0
+PORTNAME= pclprint
+PORTVERSION= 1.0
CATEGORIES= print
MASTER_SITES= ftp://andrsn.stanford.edu/pub/print/ \
http://www.psn.net/~andrews/dist/
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index a2d606572c7..c39a0e42768 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pdflib
-# Version required: 2.0
# Date created: Mon Jan 18 17:03:33 CET 1999
# Whom: Dirk Froemberg <dirk@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= pdflib-2.01
+PORTNAME= pdflib
+PORTVERSION= 2.01
CATEGORIES= print
MASTER_SITES= http://www.pdflib.com/pdflib/download/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
diff --git a/print/pdflib3/Makefile b/print/pdflib3/Makefile
index a2d606572c7..c39a0e42768 100644
--- a/print/pdflib3/Makefile
+++ b/print/pdflib3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pdflib
-# Version required: 2.0
# Date created: Mon Jan 18 17:03:33 CET 1999
# Whom: Dirk Froemberg <dirk@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= pdflib-2.01
+PORTNAME= pdflib
+PORTVERSION= 2.01
CATEGORIES= print
MASTER_SITES= http://www.pdflib.com/pdflib/download/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
diff --git a/print/pdflib4/Makefile b/print/pdflib4/Makefile
index a2d606572c7..c39a0e42768 100644
--- a/print/pdflib4/Makefile
+++ b/print/pdflib4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pdflib
-# Version required: 2.0
# Date created: Mon Jan 18 17:03:33 CET 1999
# Whom: Dirk Froemberg <dirk@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= pdflib-2.01
+PORTNAME= pdflib
+PORTVERSION= 2.01
CATEGORIES= print
MASTER_SITES= http://www.pdflib.com/pdflib/download/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
diff --git a/print/pdq/Makefile b/print/pdq/Makefile
index c4f62c7ace8..d7cec601560 100644
--- a/print/pdq/Makefile
+++ b/print/pdq/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pdq
-# Version required: 2.1.1
# Date created: 15 May 1999
# Whom: Yin-Jieh Chen <yinjieh@csie.nctu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= pdq-2.1.1
+PORTNAME= pdq
+PORTVERSION= 2.1.1
CATEGORIES= print
MASTER_SITES= ftp://feynman.tam.uiuc.edu/pub/pdq/
EXTRACT_SUFX= .tgz
diff --git a/print/perlftlib/Makefile b/print/perlftlib/Makefile
index dcfeea98e94..c65c2ac50ae 100644
--- a/print/perlftlib/Makefile
+++ b/print/perlftlib/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: perlftlib
-# Version required: 1.2
# Date created: 98/12/22
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= perlftlib-1.2
+PORTNAME= perlftlib
+PORTVERSION= 1.2
CATEGORIES= print perl5
MASTER_SITES= ftp://ftp.big.or.jp/pub/usr2/jam/ft/ \
${MASTER_SITE_PORTS_JP} \
diff --git a/print/pkfonts118/Makefile b/print/pkfonts118/Makefile
index cd9a77ed5cc..fe3cba151a6 100644
--- a/print/pkfonts118/Makefile
+++ b/print/pkfonts118/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: English PK fonts at 118dpi
-# Version required: ?
# Date created: 06 Nov 1998
# Whom: Satoshi Asami <asami@FreeBSD.org>
#
diff --git a/print/pkfonts240/Makefile b/print/pkfonts240/Makefile
index 8cf09aeef37..4fc45f03777 100644
--- a/print/pkfonts240/Makefile
+++ b/print/pkfonts240/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: English PK fonts at 240dpi
-# Version required: ?
# Date created: 06 Nov 1998
# Whom: Satoshi Asami <asami@FreeBSD.org>
#
diff --git a/print/pkfonts300/Makefile b/print/pkfonts300/Makefile
index 07fb09702a0..26a3feda04d 100644
--- a/print/pkfonts300/Makefile
+++ b/print/pkfonts300/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: English PK fonts
-# Version required: ?
# Date created: 16 Mar 1996
# Whom: Hideaki Ohmon <ohmon@tom.sfc.keio.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= pkfonts
-PKGNAME= pkfonts${RESOLUTION}-1.0
+PORTNAME= pkfonts${RESOLUTION}
+PORTVERSION= 1.0
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
MASTER_SITE_SUBDIR= pkfonts
diff --git a/print/pkfonts360/Makefile b/print/pkfonts360/Makefile
index 280e0575a9d..f22158024f4 100644
--- a/print/pkfonts360/Makefile
+++ b/print/pkfonts360/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: English PK fonts at 360dpi
-# Version required: ?
# Date created: 06 Nov 1998
# Whom: Satoshi Asami <asami@FreeBSD.org>
#
diff --git a/print/pkfonts400/Makefile b/print/pkfonts400/Makefile
index c54179ec7ba..0852795fb8a 100644
--- a/print/pkfonts400/Makefile
+++ b/print/pkfonts400/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: English PK fonts at 400dpi
-# Version required: ?
# Date created: 06 Nov 1998
# Whom: Satoshi Asami <asami@FreeBSD.org>
#
diff --git a/print/pkfonts600/Makefile b/print/pkfonts600/Makefile
index aa83ce8f8d9..3199428bed2 100644
--- a/print/pkfonts600/Makefile
+++ b/print/pkfonts600/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: English PK fonts at 600dpi
-# Version required: ?
# Date created: 06 Nov 1998
# Whom: Satoshi Asami <asami@FreeBSD.org>
#
diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index ee86c6ccd37..81025343d11 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -1,22 +1,22 @@
# New ports collection makefile for: pbm2ppa
-# Version required: 0.8.6
# Date created: 18 November 1998
# Whom: smace@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= ppa-0.8.6
-PKGNAME= pbm2ppa-0.8.6
+PORTNAME= pbm2ppa
+PORTVERSION= 0.8.6
CATEGORIES= print
MASTER_SITES= http://www.httptech.com/ppa/files/
+DISTNAME= ppa-0.8.6
MAINTAINER= smace@freebsd.org
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript5 \
enscript:${PORTSDIR}/print/enscript-letter
-WRKSRC= ${WRKDIR}/pbm2ppa-0.8.6
+WRKSRC= ${WRKDIR}/${PKGNAME}
USE_GMAKE= yes
HPMODEL?= 720
diff --git a/print/poster/Makefile b/print/poster/Makefile
index ee65b6a01e8..6776d6e09f2 100644
--- a/print/poster/Makefile
+++ b/print/poster/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: poster
-# Version required: 1.0
# Date created: 15 January 2000
# Whom: Yoshiro MIHIRA <sanpei@sanpei.org>
#
# $FreeBSD$
#
-DISTNAME= poster
-PKGNAME= poster-1.0
+PORTNAME= poster
+PORTVERSION= 1.0
CATEGORIES= print
MASTER_SITES= ftp://ftp.ics.ele.tue.nl/pub/users/jos/poster/
+DISTNAME= poster
MAINTAINER= sanpei@sanpei.org
diff --git a/print/pstotext/Makefile b/print/pstotext/Makefile
index 1f1d06a22ea..759349a74c4 100644
--- a/print/pstotext/Makefile
+++ b/print/pstotext/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: pstotext
-# Version required: 2.1
# Date created: December 6, 1999
# Whom: Oliver Breuninger <ob@seicom.NET>
#
# $FreeBSD$
#
-DISTNAME= pstotext
-PKGNAME= pstotext-2.1
+PORTNAME= pstotext
+PORTVERSION= 2.1
CATEGORIES= print
MASTER_SITES= http://www.research.digital.com/SRC/virtualpaper/cgi-bin/nph-download.tcl/pstotext.tar.Z?object=pstotext
+DISTNAME= pstotext
EXTRACT_SUFX= .tar.Z
MAINTAINER= ob@seicom.NET
diff --git a/print/psutils-a4/Makefile b/print/psutils-a4/Makefile
index 570dacd115a..98edf5f26a3 100644
--- a/print/psutils-a4/Makefile
+++ b/print/psutils-a4/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: psutils (a4)
-# Version required: 1.16
# Date created: 21 September 1994
# Whom: jmz & David O'Brien (obrien@cs.ucdavis.edu)
#
diff --git a/print/psutils-letter/Makefile b/print/psutils-letter/Makefile
index 93112fcb0da..02eeeab6db9 100644
--- a/print/psutils-letter/Makefile
+++ b/print/psutils-letter/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: psutils (letter)
-# Version required: 1.16
# Date created: 21 September 1994
# Whom: jmz & David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= psutils-p17
-PKGNAME= psutils-${PAPERSIZE}-1.17
+PORTNAME= psutils-${PAPERSIZE}
+PORTVERSION= 1.17
CATEGORIES= print
MASTER_SITES= ftp://ftp.dcs.ed.ac.uk/pub/ajcd/
+DISTNAME= psutils-p17
MAINTAINER= jmz@FreeBSD.org
diff --git a/print/rlpr/Makefile b/print/rlpr/Makefile
index cc33dddda0e..eac61e0bf9a 100644
--- a/print/rlpr/Makefile
+++ b/print/rlpr/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: rlpr
-# Version required: 2.0
# Date created: 11 April 1999
# Whom: Mikhail Teterin
#
# $FreeBSD$
+#
-DISTNAME= rlpr-2.02
+PORTNAME= rlpr
+PORTVERSION= 2.02
CATEGORIES= print net
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/printing
diff --git a/print/rtf2latex/Makefile b/print/rtf2latex/Makefile
index efd4ffda0d6..63a57099fe5 100644
--- a/print/rtf2latex/Makefile
+++ b/print/rtf2latex/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: rtf2LaTeX
-# Version required: 1.5
# Date created: 25 Jan 1995
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= rtf2LaTeX.1.5
-PKGNAME= rtf2latex-1.5
+PORTNAME= rtf2latex
+PORTVERSION= 1.5
CATEGORIES= print
MASTER_SITES= ftp://ftp.dante.de/pub/tex/support/rtf2latex/
+DISTNAME= rtf2LaTeX.1.5
MAINTAINER= ports@FreeBSD.org
diff --git a/print/t1utils/Makefile b/print/t1utils/Makefile
index 67ead11e671..b1a10419350 100644
--- a/print/t1utils/Makefile
+++ b/print/t1utils/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: t1utils
-# Version required: 1.14
# Date created: 2 September 1999
# Whom: mwm
#
# $FreeBSD$
#
-DISTNAME= t1utils-1.14
+PORTNAME= t1utils
+PORTVERSION= 1.14
CATEGORIES= print
MASTER_SITES= http://www.lcdf.org/~eddietwo/type/
diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index 5acb44e5efd..9075d9413ea 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: teTeX
-# Version required: 1.0.7
# Date created: 5 December 1996
# Whom: Bernd Rosauer <br@netland.inka.de>
#
# $FreeBSD$
#
-DISTNAME= teTeX-1.0.7
+PORTNAME= teTeX
+PORTVERSION= 1.0.7
CATEGORIES= print
MASTER_SITES= ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/1.0/distrib/sources/ \
${MASTER_SITE_TEX_CTAN}
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 5acb44e5efd..9075d9413ea 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: teTeX
-# Version required: 1.0.7
# Date created: 5 December 1996
# Whom: Bernd Rosauer <br@netland.inka.de>
#
# $FreeBSD$
#
-DISTNAME= teTeX-1.0.7
+PORTNAME= teTeX
+PORTVERSION= 1.0.7
CATEGORIES= print
MASTER_SITES= ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/1.0/distrib/sources/ \
${MASTER_SITE_TEX_CTAN}
diff --git a/print/tex/Makefile b/print/tex/Makefile
index 1bec92366eb..df055c86cf3 100644
--- a/print/tex/Makefile
+++ b/print/tex/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: tex
-# Version required: 7.2b
# Date created: 29 September 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= web2c-7.2
-PKGNAME= tex-3.14159
+PORTNAME= tex
+PORTVERSION= 3.14159
CATEGORIES= print
MASTER_SITES= ftp://ftp.freesoftware.com/pub/tex/package/
DISTFILES= web2c-7.2b.tar.gz web-7.2a.tar.gz tex_base.tar.gz cm_tfm.tar.gz \
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index 823a380af9b..59404fb117b 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: texinfo
-# Version required: 2.218
# Date created: 2 October 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= texinfo
-PKGNAME= texinfo-2.218
+PORTNAME= texinfo
+PORTVERSION= 2.218
CATEGORIES= print
#other equivalent sites: ftp.shsu.edu ftp.dante.de
MASTER_SITES= ftp://ftp.tex.ac.uk/tex-archive/macros/eplain/doc/ \
diff --git a/print/tgif2tex/Makefile b/print/tgif2tex/Makefile
index cbb1731ff4f..837423e0ab5 100644
--- a/print/tgif2tex/Makefile
+++ b/print/tgif2tex/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: tgif2tex
-# Version required: 1.46
# Date created: 12 Mar 1998
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= tgif2tex
-PKGNAME?= tgif2tex-1.46
+PORTNAME= tgif2tex
+PORTVERSION= 1.46
CATEGORIES= print
MASTER_SITES= http://camphor.elcom.nitech.ac.jp/~nakano/tgif2tex/
+DISTNAME= ${PORTNAME}
MAINTAINER= taoka@FreeBSD.org
diff --git a/print/tr2latex/Makefile b/print/tr2latex/Makefile
index f23f28c4d18..90dadbd194c 100644
--- a/print/tr2latex/Makefile
+++ b/print/tr2latex/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: tr2latex
-# Version required: 2.2
# Date created: 25 Jan 1995
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= tr2latex
-PKGNAME= tr2latex-2.2
+PORTNAME= tr2latex
+PORTVERSION= 2.2
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= support
+DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 49cff30c8c5..d39c76b9b42 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: transfig
-# Version required: 3.2.3
# Date created: 9 August 1996
# Whom: chuckr@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= transfig.3.2.3
-PKGNAME= transfig-3.2.3
+PORTNAME= transfig
+PORTVERSION= 3.2.3
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
ftp://www-epb.lbl.gov/xfig/
MASTER_SITE_SUBDIR= applications/drawing_tools/transfig
+DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= chuckr@freebsd.org
diff --git a/print/trueprint/Makefile b/print/trueprint/Makefile
index 71e6bba4a32..9b67769d230 100644
--- a/print/trueprint/Makefile
+++ b/print/trueprint/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: trueprint
-# Version required: 5.2
# Date created: 17 February 2000
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= trueprint-5.2
+PORTNAME= trueprint
+PORTVERSION= 5.2
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= trueprint
diff --git a/print/virtualpaper/Makefile b/print/virtualpaper/Makefile
index 9a2c28a6a81..de70e11f759 100644
--- a/print/virtualpaper/Makefile
+++ b/print/virtualpaper/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: virtualpaper
-# Version required: 1.4
# Date created: 13 June 1996
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= virtualpaper-1.4
+PORTNAME= virtualpaper
+PORTVERSION= 1.4
CATEGORIES= print
MASTER_SITES= http://www.research.digital.com:80/SRC/virtualpaper/cgi-bin/nph-download.tcl/sources.tar.Z?object=Virtual+Paper/
DISTFILES= sources.tar.Z
diff --git a/print/xdvi/Makefile b/print/xdvi/Makefile
index 30596a1ff42..22fed011d7b 100644
--- a/print/xdvi/Makefile
+++ b/print/xdvi/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xdvi
-# Version required: patchlevel 20
# Date created: 1 October 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= xdvi-20
-PKGNAME= xdvi-pl20
+PORTNAME= xdvi
+PORTVERSION= pl20
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
+DISTNAME= ${PORTNAME}-20
EXTRACT_SUFX= .tar.Z
MAINTAINER= jmz@FreeBSD.org
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index c24b2ae5e73..99083ecefee 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xdvik
-# Version required: 20
# Date created: 26 Feb 1998
# Whom: Kentaro Inagaki <JBD01226@niftyserve.ne.jp>
#
# $FreeBSD$
#
-DISTNAME= xdvik-20a
+PORTNAME= xdvik
+PORTVERSION= 20a
CATEGORIES= print
MASTER_SITES= ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-20/ \
${MASTER_SITE_LOCAL}
diff --git a/print/xmbibtex/Makefile b/print/xmbibtex/Makefile
index 5fb7d8cc062..9f57280a3a0 100644
--- a/print/xmbibtex/Makefile
+++ b/print/xmbibtex/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmbibtex
-# Version required: 1.5
# Date created: 06 Nov 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= xmbibtex-1.5
+PORTNAME= xmbibtex
+PORTVERSION= 1.5
CATEGORIES= print databases
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/tex
diff --git a/print/xtem/Makefile b/print/xtem/Makefile
index 9ba6ae1412f..31b05edc077 100644
--- a/print/xtem/Makefile
+++ b/print/xtem/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: xtem
-# Version required: 7.00
# Date created: 01 June 1997
# Whom: Peter Cornelius <pc@inr.fzk.de>
#
# $FreeBSD$
+#
-DISTNAME= xtem_texmenu.7.00
-PKGNAME= xtem-7.00
+PORTNAME= xtem
+PORTVERSION= 7.00
CATEGORIES= print
MASTER_SITES= ftp://ftp.iwd.uni-bremen.de/pub/tex/xtem.v7/
+DISTNAME= xtem_texmenu.7.00
MAINTAINER= ports@FreeBSD.org
diff --git a/print/yatex-mule/Makefile b/print/yatex-mule/Makefile
index a97b63f37cf..5b18af8207c 100644
--- a/print/yatex-mule/Makefile
+++ b/print/yatex-mule/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: YaTeX
-# Version required: 1.67
# Date created: 98/11/17
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-PKGNAME= yatex-mule-1.67
+PORTNAME= yatex-mule
+PORTVERSION= 1.67
CATEGORIES= print elisp
MULE= yes
diff --git a/print/yatex-xemacs-mule/Makefile b/print/yatex-xemacs-mule/Makefile
index d0485e31737..f89550ef2ee 100644
--- a/print/yatex-xemacs-mule/Makefile
+++ b/print/yatex-xemacs-mule/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: YaTeX
-# Version required: 1.67
# Date created: 98/11/17
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-PKGNAME= yatex-xemacs-mule-1.67
+PORTNAME= yatex-xemacs-mule
+PORTVERSION= 1.67
XEMACS-MULE= yes
diff --git a/print/yatex-xemacs/Makefile b/print/yatex-xemacs/Makefile
index 19ba88bd107..a0500de7899 100644
--- a/print/yatex-xemacs/Makefile
+++ b/print/yatex-xemacs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: YaTeX
-# Version required: 1.67
# Date created: 98/11/17
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-PKGNAME= yatex-xemacs-1.67
+PORTNAME= yatex-xemacs
+PORTVERSION= 1.67
XEMACS= yes
diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index cd909f78570..72e08107a64 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: YaTeX
-# Version required: 1.67
# Date created: 98/11/17
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= yatex1.67
-PKGNAME?= yatex-1.67
+PORTNAME?= yatex
+PORTVERSION?= 1.67
CATEGORIES?= print elisp
MASTER_SITES= http://www.yatex.org/
+DISTNAME= yatex1.67
MAINTAINER= taoka@FreeBSD.org