aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--x11-fm/asfiles/Makefile6
-rw-r--r--x11-fm/binder/Makefile6
-rw-r--r--x11-fm/dfm/Makefile4
-rw-r--r--x11-fm/endeavour/Makefile6
-rw-r--r--x11-fm/ezfm/Makefile6
-rw-r--r--x11-fm/filerunner/Makefile6
-rw-r--r--x11-fm/fsv/Makefile4
-rw-r--r--x11-fm/gnomemc/Makefile6
-rw-r--r--x11-fm/jafm/Makefile4
-rw-r--r--x11-fm/mfm/Makefile4
-rw-r--r--x11-fm/mtoolsfm/Makefile4
-rw-r--r--x11-fm/offix-files/Makefile6
-rw-r--r--x11-fm/tkdesk/Makefile4
-rw-r--r--x11-fm/workplace/Makefile7
-rw-r--r--x11-fm/x-files/Makefile6
-rw-r--r--x11-fm/xcruise/Makefile4
-rw-r--r--x11-fm/xfm/Makefile4
-rw-r--r--x11-fm/xnc/Makefile6
-rw-r--r--x11-fonts/Xg/Makefile6
-rw-r--r--x11-fonts/bitmap-fonts/Makefile7
-rw-r--r--x11-fonts/etlfonts/Makefile6
-rw-r--r--x11-fonts/freefonts/Makefile4
-rw-r--r--x11-fonts/getbdf/Makefile6
-rw-r--r--x11-fonts/intlfonts/Makefile4
-rw-r--r--x11-fonts/nexfontsel/Makefile6
-rw-r--r--x11-fonts/p5-type1inst/Makefile6
-rw-r--r--x11-fonts/sharefonts/Makefile4
-rw-r--r--x11-fonts/tkfont/Makefile6
-rw-r--r--x11-fonts/ttmkfdir/Makefile7
-rw-r--r--x11-fonts/xfed/Makefile6
-rw-r--r--x11-fonts/xmbdfed/Makefile6
31 files changed, 83 insertions, 84 deletions
diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile
index 33ae2251204a..b3c4bc2fc1e8 100644
--- a/x11-fm/asfiles/Makefile
+++ b/x11-fm/asfiles/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: ASFiles
-# Version required: 1.0
# Date created: 17 August 1997
# Whom: lukin@okbmei.msk.su
#
# $FreeBSD$
#
-DISTNAME= ASFiles-1.0
-PKGNAME= asfiles-1.0
+PORTNAME= asfiles
+PORTVERSION= 1.0
CATEGORIES= x11-fm windowmaker
MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/X/afterstep/apps/ASFiles/ \
ftp://ftp.uni-trier.de/pub/unix/X11/window-manager/AfterStep/apps/ASFiles/
+DISTNAME= ASFiles-${PORTVERSION}
MAINTAINER= lukin@okbmei.msk.su
diff --git a/x11-fm/binder/Makefile b/x11-fm/binder/Makefile
index ffd6337e7590..9aa7f11414eb 100644
--- a/x11-fm/binder/Makefile
+++ b/x11-fm/binder/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: JDE's Binder
-# Version required: 1.3
# Date created: 25 March 1999
# Whom: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= Binder-1.3
-PKGNAME= ${LANGPREFIX}binder-1.3
+PORTNAME= ${LANGPREFIX}binder
+PORTVERSION= 1.3
CATEGORIES= ${CATEGORY_LIST}
MASTER_SITES= http://www.aaa-int.or.jp/~jfactory/JDE/dist/
+DISTNAME= Binder-${PORTVERSION}
MAINTAINER= kiri@pis.toba-cmt.ac.jp
diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile
index a21028eb86df..eca010194325 100644
--- a/x11-fm/dfm/Makefile
+++ b/x11-fm/dfm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: dfm
-# Version required: 0.9.10
# Date created: 25 May 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= dfm-0.99.1
+PORTNAME= dfm
+PORTVERSION= 0.99.1
CATEGORIES= x11-fm
MASTER_SITES= http://www-c.informatik.uni-hannover.de/~kaiser/dfm/
diff --git a/x11-fm/endeavour/Makefile b/x11-fm/endeavour/Makefile
index 9f40f87eeb6a..1a293dc498e5 100644
--- a/x11-fm/endeavour/Makefile
+++ b/x11-fm/endeavour/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: endeavour
-# Version required: 1.07
# Date created: 7 Oct 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= endeavour1.07
-PKGNAME= endeavour-1.07
+PORTNAME= endeavour
+PORTVERSION= 1.07
CATEGORIES= x11-fm
MASTER_SITES= ftp://fox.mit.edu/pub/xsw/
+DISTNAME= ${PORTNAME}${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= cpiazza@FreeBSD.org
diff --git a/x11-fm/ezfm/Makefile b/x11-fm/ezfm/Makefile
index 91c0878c4476..06111e56a429 100644
--- a/x11-fm/ezfm/Makefile
+++ b/x11-fm/ezfm/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ezfm
-# Version required: 0.4
# Date created: 27 July 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= EZFM-0.4-src
-PKGNAME= ezfm-0.4
+PORTNAME= ezfm
+PORTVERSION= 0.4
CATEGORIES= x11-fm
MASTER_SITES= ftp://ftp.ma.utexas.edu/pub/mzou/
+DISTNAME= EZFM-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index 77b3cfbaa881..88dab5713fa5 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: filerunner
-# Version required: 2.5
# Date created: 3 August 1996
# Whom: lukin
#
# $FreeBSD$
#
-DISTNAME= FileRunner-2.5
-PKGNAME= filerunner-2.5
+PORTNAME= filerunner
+PORTVERSION= 2.5
CATEGORIES= x11-fm tk82
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/desktop
+DISTNAME= FileRunner-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
diff --git a/x11-fm/fsv/Makefile b/x11-fm/fsv/Makefile
index 55ab8e99878f..de55a67e7fa2 100644
--- a/x11-fm/fsv/Makefile
+++ b/x11-fm/fsv/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: fsv
-# Version required: 0.9
# Date created: 06 February 2000
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= fsv-0.9
+PORTNAME= fsv
+PORTVERSION= 0.9
CATEGORIES= x11-fm
MASTER_SITES= http://fox.mit.edu/skunk/soft/src/
diff --git a/x11-fm/gnomemc/Makefile b/x11-fm/gnomemc/Makefile
index 4bafdba41191..4cb4c13dd5b7 100644
--- a/x11-fm/gnomemc/Makefile
+++ b/x11-fm/gnomemc/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomemc
-# Version required: 4.5.44
# Date created: 26 January 1999
# Whom: Jeremy Lea <reg@shale.csir.co.za>
#
# $FreeBSD$
#
-DISTNAME= mc-4.5.44
-PKGNAME= gnomemc-4.5.44
+PORTNAME= gnomemc
+PORTVERSION= 4.5.44
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/mc
+DISTNAME= mc-${PORTNAME}
MAINTAINER= reg@FreeBSD.org
diff --git a/x11-fm/jafm/Makefile b/x11-fm/jafm/Makefile
index 25169395eafa..c14c8c51f004 100644
--- a/x11-fm/jafm/Makefile
+++ b/x11-fm/jafm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: jafm
-# Version required: 0.5
# Date created: 31 August 1998
# Whom: brett@peloton.physics.montana.edu
#
# $FreeBSD$
#
-DISTNAME= jafm-0.5
+PORTNAME= jafm
+PORTVERSION= 0.5
CATEGORIES= x11-fm
MASTER_SITES= http://www-personal.usyd.edu.au/~rlittlew/jafm/ \
${MASTER_SITE_SUNSITE}
diff --git a/x11-fm/mfm/Makefile b/x11-fm/mfm/Makefile
index 495645b88c59..32951c539240 100644
--- a/x11-fm/mfm/Makefile
+++ b/x11-fm/mfm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mfm
-# Version required: 1.3
# Date created: 12 Jan 2000
# Whom: Michael Vasilenko <acid@stu.cn.ua>
#
# $FreeBSD$
#
-DISTNAME= mfm-1.3
+PORTNAME= mfm
+PORTVERSION= 1.3
CATEGORIES= x11-fm
MASTER_SITES= http://www.core-coutainville.org/mfm/archive/SOURCES/
diff --git a/x11-fm/mtoolsfm/Makefile b/x11-fm/mtoolsfm/Makefile
index 495645b88c59..32951c539240 100644
--- a/x11-fm/mtoolsfm/Makefile
+++ b/x11-fm/mtoolsfm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mfm
-# Version required: 1.3
# Date created: 12 Jan 2000
# Whom: Michael Vasilenko <acid@stu.cn.ua>
#
# $FreeBSD$
#
-DISTNAME= mfm-1.3
+PORTNAME= mfm
+PORTVERSION= 1.3
CATEGORIES= x11-fm
MASTER_SITES= http://www.core-coutainville.org/mfm/archive/SOURCES/
diff --git a/x11-fm/offix-files/Makefile b/x11-fm/offix-files/Makefile
index f7f1eca9a1ab..d02a91b5207e 100644
--- a/x11-fm/offix-files/Makefile
+++ b/x11-fm/offix-files/Makefile
@@ -1,16 +1,16 @@
# ports collection makefile for: Files
-# Version required: 2.4
# Date created: 28 Jun 1997
# Whom: Ruslan Shevchenko <ruslan@shevchenko.kiev.ua>
#
# $FreeBSD$
#
-DISTNAME= Files-2.4
-PKGNAME= offix-files-2.4
+PORTNAME= offix-files
+PORTVERSION= 2.4
CATEGORIES= x11-fm offix
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= desktop_managers/OffiX
+DISTNAME= Files-${PORTVERSION}
MAINTAINER= ruslan@shevchenko.kiev.ua
diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile
index d3f499069ed7..03ecba63c030 100644
--- a/x11-fm/tkdesk/Makefile
+++ b/x11-fm/tkdesk/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tkdesk
-# Version required: 1.0
# Date created: 30 Jul 1996
# Whom: shanee@rabbit.augusta.de
#
# $FreeBSD$
#
-DISTNAME= tkdesk-1.1
+PORTNAME= tkdesk
+PORTVERSION= 1.1
CATEGORIES= x11-fm tk42
MASTER_SITES= http://people.mainz.netsurf.de/~bolik/tkdesk/
diff --git a/x11-fm/workplace/Makefile b/x11-fm/workplace/Makefile
index 1847defa8c4f..65e14cd5edb8 100644
--- a/x11-fm/workplace/Makefile
+++ b/x11-fm/workplace/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: workplace
-# Version required: 1.0a3
# Date created: 7 March 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= workplace-1.0.a3
-PKGNAME= workplace-1.0a3
+PORTNAME= workplace
+PORTVERSION= 1.0.a3
CATEGORIES= x11-fm
MASTER_SITES= http://www2.osk.3web.ne.jp/~hideki70/src/
@@ -18,7 +17,7 @@ LIB_DEPENDS= gtk10.1:${PORTSDIR}/x11-toolkits/gtk10
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/gtk10" \
- LIBS="-L${LOCALBASE}/lib"
+ LIBS="-L${LOCALBASE}/lib"
pre-configure:
@ ${RM} ${WRKSRC}/config.cache
diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile
index adc7a18b7be9..6aa8372cd036 100644
--- a/x11-fm/x-files/Makefile
+++ b/x11-fm/x-files/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: x-files
-# Version required: 1.43
# Date created: 14 April 1998
# Whom: Donald J. Maddox <dmaddox@conterra.com>
#
# $FreeBSD$
#
-DISTNAME= X-Files-2.00b1
-PKGNAME= x-files-2.00b1
+PORTNAME= x-files
+PORTVERSION= 2.00b1
CATEGORIES= x11-fm tk82
MASTER_SITES= http://www.hut.fi/~mkivinie/X-Files/data/
+DISTNAME= X-files-${PORTVERSION}
MAINTAINER= dmaddox@conterra.com
diff --git a/x11-fm/xcruise/Makefile b/x11-fm/xcruise/Makefile
index 39de235f2b63..6ea0b82573fe 100644
--- a/x11-fm/xcruise/Makefile
+++ b/x11-fm/xcruise/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: xcruise
-# Version required: 0.24
# Date created: 22 December 1999
# Whom: minoura@netbsd.org
#
@@ -7,7 +6,8 @@
# $FreeBSD$
#
-DISTNAME= xcruise-0.24
+PORTNAME= xcruise
+PORTVERSION= 0.24
CATEGORIES= x11-fm
MASTER_SITES= http://tanaka-www.cs.titech.ac.jp/%7Eeuske/prog/
diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile
index dbf7c3e56f3b..c53bfb9527f6 100644
--- a/x11-fm/xfm/Makefile
+++ b/x11-fm/xfm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xfm
-# Version required: 1.3.2
# Date created: 28 December 1994
# Whom: jc@irbs.com John Capo
#
# $FreeBSD$
#
-DISTNAME= xfm-1.3.2
+PORTNAME= xfm
+PORTVERSION= 1.3.2
CATEGORIES= x11-fm
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index 458e76d647d0..ecb5a12459f8 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: xnc
-# Version required: 4.2.1
# Date created: 5 February 1999
# Whom: Dima Sivachenko <dima@chg.ru>
#
# $FreeBSD$
#
-DISTNAME= xnc-4.2.1.src
-PKGNAME= xnc-4.2.1
+PORTNAME= xnc
+PORTVERSION= 4.2.1
CATEGORIES= x11-fm
MASTER_SITES= http://www.xnc.dubna.su/src/ \
ftp://ftp.chg.ru/pub/Linux/sunsite/X11/desktop/ \
ftp://sunsite.unx.edu/pub/Linux/X11/desktop/
+DISTNAME= ${PKGNAME}.src
MAINTAINER= dima@Chg.RU
diff --git a/x11-fonts/Xg/Makefile b/x11-fonts/Xg/Makefile
index 2b8843605e63..6bd74c95167b 100644
--- a/x11-fonts/Xg/Makefile
+++ b/x11-fonts/Xg/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: libXg
-# Version required: ????? arbitrarily picked 1.0 for version
# Date created: Sun Aug 13 12:36:14 CDT 1995
# Whom: erich@rrnet.com
#
# $FreeBSD$
#
-DISTNAME= libXg.utf.fonts
-PKGNAME= libXgFonts-1.0
+PORTNAME= libXgFonts
+PORTVERSION= 1.0
CATEGORIES= x11-fonts plan9
MASTER_SITES= ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
+DISTNAME= libXg.utf.fonts
MAINTAINER= erich@FreeBSD.org
diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile
index 1be12522908f..7de81aaac6df 100644
--- a/x11-fonts/bitmap-fonts/Makefile
+++ b/x11-fonts/bitmap-fonts/Makefile
@@ -1,22 +1,21 @@
# New ports collection makefile for: bitmap-font
-# Version required: 8.2
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= bitmap-mule-${BITMAP_VER}
-PKGNAME= bitmap-font-${BITMAP_VER}
+PORTNAME= bitmap-font
+PORTVERSION= 8.2
CATEGORIES= x11-fonts elisp
MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/
+DISTNAME= bitmap-mule-${PORTVERSION}
MAINTAINER= shige@FreeBSD.org
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86
# distfile version
-BITMAP_VER= 8.2
BITMAP_FONT= etl6x12-bitmap etl7x14-bitmap etl8x16-bitmap etl12x24-bitmap
FONTSDIR= lib/X11/fonts/local
PKGINSTALL= ${WRKDIR}/INSTALL
diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile
index 8fca37e68885..af75018c61d2 100644
--- a/x11-fonts/etlfonts/Makefile
+++ b/x11-fonts/etlfonts/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: etlfonts-noncjk
-# Version required: 1.0
# Date created: 3 Nov 1996
# Whom: Mita Yoshio <mita@jp.FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= non-cjk
-PKGNAME= etlfonts-noncjk-1.0
+PORTNAME= etlfonts-noncjk
+PORTVERSION= 1.0
CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/fonts/
+DISTNAME= non-cjk
EXTRACT_SUFX= .tar
MAINTAINER= mita@jp.FreeBSD.org
diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile
index c8d991703fff..3a03690f7b80 100644
--- a/x11-fonts/freefonts/Makefile
+++ b/x11-fonts/freefonts/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: freefonts
-# Version required: 0.10
# Date created: Thu Aug 1 21:32:14 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= freefonts-0.10
+PORTNAME= freefonts
+PORTVERSION= 0.10
CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/fonts/
diff --git a/x11-fonts/getbdf/Makefile b/x11-fonts/getbdf/Makefile
index 028c641a3d9b..57ca62695ddc 100644
--- a/x11-fonts/getbdf/Makefile
+++ b/x11-fonts/getbdf/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: getbdf
-# Version required: ?
# Date created: 30 August 1996
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= getbdf
-PKGNAME= getbdf-1.0
+PORTNAME= getbdf
+PORTVERSION= 1.0
CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.ipa.fhg.de/pub/X/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ache@FreeBSD.org
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile
index ec2554753535..4c010c32d86b 100644
--- a/x11-fonts/intlfonts/Makefile
+++ b/x11-fonts/intlfonts/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: intlfonts
-# Version required: 1.2
# Date created: 99/10/26
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= intlfonts-1.2
+PORTNAME= intlfonts
+PORTVERSION= 1.2
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= intlfonts
diff --git a/x11-fonts/nexfontsel/Makefile b/x11-fonts/nexfontsel/Makefile
index a3046225ec67..25346eb1309e 100644
--- a/x11-fonts/nexfontsel/Makefile
+++ b/x11-fonts/nexfontsel/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: nexfontsel
-# Version required: 2.0
# Date created: 99/09/29
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= NeXFontSel-2.0
-PKGNAME= nexfontsel-2.0
+PORTNAME= nexfontsel
+PORTVERSION= 2.0
CATEGORIES= x11-fonts
MASTER_SITES= http://www.netlab.is.tsukuba.ac.jp/~yokota/archive/
+DISTNAME= NeXFontSel-${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile
index 2e2fb38b0227..092bd93264e3 100644
--- a/x11-fonts/p5-type1inst/Makefile
+++ b/x11-fonts/p5-type1inst/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-type1inst
-# Version required: 0.6.1
# Date created: 7 Jan 1998
# Whom: giffunip@asme.org
#
# $FreeBSD$
#
-DISTNAME= type1inst-0.6.1
-PKGNAME= p5-type1inst-0.6.1
+PORTNAME= p5-type1inst
+PORTVERSION= 0.6.1
CATEGORIES= x11-fonts perl5
MASTER_SITES= $(MASTER_SITE_SUNSITE)
MASTER_SITE_SUBDIR=X11/xutils
+DISTNAME= type1inst-${PORTVERSION}
MAINTAINER= giffunip@asme.org
diff --git a/x11-fonts/sharefonts/Makefile b/x11-fonts/sharefonts/Makefile
index 79917edb8915..c6dcb9430e61 100644
--- a/x11-fonts/sharefonts/Makefile
+++ b/x11-fonts/sharefonts/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sharefonts
-# Version required: 0.10
# Date created: Thu Mar 26 04:50:00 PST 1998
# Whom: dburr@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= sharefonts-0.10
+PORTNAME= sharefonts
+PORTVERSION= 0.10
CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/fonts/
diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile
index 0a8ee0408444..b468ef9e9ec1 100644
--- a/x11-fonts/tkfont/Makefile
+++ b/x11-fonts/tkfont/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: tkfont-1.1
-# Version required: 1.1
# Date created: 11 May 1998
# Whom: Brett Taylor
#
# $FreeBSD$
#
-DISTNAME= tkfont-1.1
+PORTNAME= tkfont
+PORTVERSION= 1.1
CATEGORIES= x11-fonts tk82
-MASTER_SITES= ftp://ftp.cdrom.com/pub/linux/tsx-11/sources/usr.bin.X11/ \
+MASTER_SITES= ftp://ftp.freesoftware.com/pub/linux/tsx-11/sources/usr.bin.X11/ \
http://people.FreeBSD.org/~billf/
MAINTAINER= brett@peloton.runet.edu
diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile
index c2453ed3a3c6..a0460db0e199 100644
--- a/x11-fonts/ttmkfdir/Makefile
+++ b/x11-fonts/ttmkfdir/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: ttmkfdir
-# Version required: 0.0
# Date created: September 08, 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
+#
-DISTNAME= ttmkfdir
-PKGNAME= ttmkfdir-0.0
+PORTNAME= ttmkfdir
+PORTVERSION= 0.0
CATEGORIES= x11
MASTER_SITES= http://www.darmstadt.gmd.de/~pommnitz/TrueType/
+DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-fonts/xfed/Makefile b/x11-fonts/xfed/Makefile
index 53001b7f1e55..41f43054ee72 100644
--- a/x11-fonts/xfed/Makefile
+++ b/x11-fonts/xfed/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xfed
-# Version required: something old
# Date created: 7 December 1994
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= xfed
-PKGNAME= xfed-1.0
+PORTNAME= xfed
+PORTVERSION= 1.0
CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.demon.co.uk/pub/graphics/systems/X11.old/pub/R6untarred/contrib/programs/
+DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile
index 97d1fc8bd91c..f5e0466e0644 100644
--- a/x11-fonts/xmbdfed/Makefile
+++ b/x11-fonts/xmbdfed/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xmbdfed
-# Version required: 4.3.3
# Date created: June 20, 1997
# Whom: jfieber
#
# $FreeBSD$
#
-DISTNAME= xmbdfed-4.3
-PKGNAME= xmbdfed-4.3.3
+PORTNAME= xmbdfed
+PORTVERSION= 4.3.3
CATEGORIES= x11-fonts
MASTER_SITES= ftp://crl.nmsu.edu/CLR/multiling/General/
+DISTNAME= ${PORTNAME}-4.3
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= ${DISTNAME}.patch1 ${DISTNAME}.patch2 ${DISTNAME}.patch3