aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/9term/Makefile6
-rw-r--r--x11/XFree86-4-clients/Makefile5
-rw-r--r--x11/XFree86-4-libraries/Makefile5
-rw-r--r--x11/XFree86-4/Makefile5
-rw-r--r--x11/XFree86-aoutlibs/Makefile6
-rw-r--r--x11/XFree86-contrib/Makefile6
-rw-r--r--x11/XFree86/Makefile5
-rw-r--r--x11/aterm/Makefile4
-rw-r--r--x11/bgrot/Makefile4
-rw-r--r--x11/blast/Makefile6
-rw-r--r--x11/bricons/Makefile6
-rw-r--r--x11/dgs/Makefile4
-rw-r--r--x11/dxpc/Makefile4
-rw-r--r--x11/ebuttons/Makefile6
-rw-r--r--x11/efancylauncher/Makefile5
-rw-r--r--x11/emu/Makefile5
-rw-r--r--x11/eterm/Makefile6
-rw-r--r--x11/eweather/Makefile5
-rw-r--r--x11/fbsd-icons/Makefile6
-rw-r--r--x11/gmessage/Makefile4
-rw-r--r--x11/gnome-libs/Makefile6
-rw-r--r--x11/gnome/Makefile4
-rw-r--r--x11/gnome2/Makefile4
-rw-r--r--x11/gnomecore/Makefile6
-rw-r--r--x11/gnomelibs/Makefile6
-rw-r--r--x11/gyroscope/Makefile4
-rw-r--r--x11/imwheel/Makefile6
-rw-r--r--x11/kb2mb2/Makefile4
-rw-r--r--x11/kde11/Makefile4
-rw-r--r--x11/kde2/Makefile4
-rw-r--r--x11/kde3/Makefile4
-rw-r--r--x11/kde4-baseapps/Makefile4
-rw-r--r--x11/kde4-runtime/Makefile4
-rw-r--r--x11/kde4-workspace/Makefile4
-rw-r--r--x11/kde4/Makefile4
-rw-r--r--x11/kdebase11/Makefile4
-rw-r--r--x11/kdebase2/Makefile4
-rw-r--r--x11/kdebase3/Makefile4
-rw-r--r--x11/kdebase4-runtime/Makefile4
-rw-r--r--x11/kdebase4-workspace/Makefile4
-rw-r--r--x11/kdebase4/Makefile4
-rw-r--r--x11/kdelibs11/Makefile6
-rw-r--r--x11/kdelibs2/Makefile6
-rw-r--r--x11/kdelibs3/Makefile6
-rw-r--r--x11/kdelibs4/Makefile6
-rw-r--r--x11/kvidtune/Makefile4
-rw-r--r--x11/kworldwatch/Makefile4
-rw-r--r--x11/libdnd/Makefile6
-rw-r--r--x11/libgnome/Makefile6
-rw-r--r--x11/libhelp/Makefile4
-rw-r--r--x11/libsx/Makefile6
-rw-r--r--x11/login.app/Makefile6
-rw-r--r--x11/lupe/Makefile6
-rw-r--r--x11/offix-clipboard/Makefile6
-rw-r--r--x11/offix-execute/Makefile12
-rw-r--r--x11/props/Makefile4
-rw-r--r--x11/qrash/Makefile6
-rw-r--r--x11/rxvt-devel/Makefile4
-rw-r--r--x11/rxvt-unicode/Makefile4
-rw-r--r--x11/rxvt/Makefile4
-rw-r--r--x11/sxpc/Makefile4
-rw-r--r--x11/tkgoodstuff/Makefile6
-rw-r--r--x11/tycoon/Makefile4
-rw-r--r--x11/wdm/Makefile5
-rw-r--r--x11/wmbutton/Makefile4
-rw-r--r--x11/wmmatrix/Makefile7
-rw-r--r--x11/wterm/Makefile4
-rw-r--r--x11/x3270/Makefile4
-rw-r--r--x11/xaniroc/Makefile6
-rw-r--r--x11/xantfarm/Makefile6
-rw-r--r--x11/xautolock/Makefile6
-rw-r--r--x11/xballoon/Makefile4
-rw-r--r--x11/xbanner/Makefile6
-rw-r--r--x11/xcb/Makefile4
-rw-r--r--x11/xco/Makefile6
-rw-r--r--x11/xcoloredit/Makefile6
-rw-r--r--x11/xcolors/Makefile6
-rw-r--r--x11/xcolorsel/Makefile6
-rw-r--r--x11/xcut/Makefile4
-rw-r--r--x11/xdtm/Makefile4
-rw-r--r--x11/xfedor/Makefile6
-rw-r--r--x11/xfishtank/Makefile16
-rw-r--r--x11/xgrab/Makefile6
-rw-r--r--x11/xkbctrl/Makefile5
-rw-r--r--x11/xkeycaps/Makefile4
-rw-r--r--x11/xkeywrap/Makefile4
-rw-r--r--x11/xloadimage/Makefile6
-rw-r--r--x11/xlockmore/Makefile4
-rw-r--r--x11/xlogout/Makefile4
-rw-r--r--x11/xlupe/Makefile4
-rw-r--r--x11/xmangekyou/Makefile4
-rw-r--r--x11/xmascot/Makefile6
-rw-r--r--x11/xmold/Makefile6
-rw-r--r--x11/xmove/Makefile6
-rw-r--r--x11/xmsg/Makefile4
-rw-r--r--x11/xmx/Makefile5
-rw-r--r--x11/xprompt/Makefile4
-rw-r--r--x11/xscreensaver/Makefile4
-rw-r--r--x11/xskyroot/Makefile4
-rw-r--r--x11/xsnow/Makefile4
-rw-r--r--x11/xstarroll/Makefile4
-rw-r--r--x11/xtacy/Makefile6
-rw-r--r--x11/xtattr/Makefile4
-rw-r--r--x11/xtermset/Makefile4
-rw-r--r--x11/xtestpicture/Makefile4
-rw-r--r--x11/xtoolwait/Makefile4
-rw-r--r--x11/xwit/Makefile4
-rw-r--r--x11/xzoom/Makefile4
108 files changed, 271 insertions, 272 deletions
diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index 93d22917e26f..a632de962f34 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: 9term
-# Version required: 1.6.3
# Date created: Sun Aug 13 12:36:14 CDT 1995
# Whom: erich@rrnet.com
#
# $FreeBSD$
#
-DISTNAME= 9term.1.6.3
-PKGNAME= 9term-1.6.3
+PORTNAME= 9term
+PORTVERSION= 1.6.3
CATEGORIES= x11 plan9
MASTER_SITES= ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
+DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= erich@FreeBSD.org
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 713c16e4922b..af1b18e47e86 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: XFree86
-# Version required: 4.0
# Date created: 5 January 1995
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= xc
-PKGNAME= XFree86-4.0
+PORTNAME= XFree86
+PORTVERSION= 4.0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 713c16e4922b..af1b18e47e86 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: XFree86
-# Version required: 4.0
# Date created: 5 January 1995
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= xc
-PKGNAME= XFree86-4.0
+PORTNAME= XFree86
+PORTVERSION= 4.0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 713c16e4922b..af1b18e47e86 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: XFree86
-# Version required: 4.0
# Date created: 5 January 1995
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= xc
-PKGNAME= XFree86-4.0
+PORTNAME= XFree86
+PORTVERSION= 4.0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
diff --git a/x11/XFree86-aoutlibs/Makefile b/x11/XFree86-aoutlibs/Makefile
index 170e645b5cb4..98f69e91d914 100644
--- a/x11/XFree86-aoutlibs/Makefile
+++ b/x11/XFree86-aoutlibs/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: XFree86 aout libs
-# Version required: 3.3.6
# Date created: 28 Feburary 2000
# Whom: Jeremy Lea <reg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Xbin
-PKGNAME= XFree86-aoutlibs-3.3.3
+PORTNAME= XFree86-aoutlibs
+PORTVERSION= 3.3.3
CATEGORIES= x11
MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.3/binaries/FreeBSD-2.2.x/
+DISTNAME= Xbin
EXTRACT_SUFX= .tgz
MAINTAINER= reg@FreeBSD.org
diff --git a/x11/XFree86-contrib/Makefile b/x11/XFree86-contrib/Makefile
index e5909c9597a5..6bf7f4ec0cd2 100644
--- a/x11/XFree86-contrib/Makefile
+++ b/x11/XFree86-contrib/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: XFree86-contrib
-# Version required: 3.3.6
# Date created: 7 November 1996
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= X336contrib
-PKGNAME= XFree86-contrib-3.3.6
+PORTNAME= XFree86-contrib
+PORTVERSION= 3.3.6
CATEGORIES= x11
MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
ftp://ftp.freesoftware.com/pub/XFree86/3.3.6/source/ \
ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
+DISTNAME= X336contrib
EXTRACT_SUFX= .tgz
MAINTAINER= jmz@FreeBSD.org
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index 153263d281a0..d2ba866e0e27 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: XFree86
-# Version required: 3.3.6
# Date created: 5 January 1995
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= xc
-PKGNAME= XFree86-3.3.6
+PORTNAME= XFree86
+PORTVERSION= 3.3.6
CATEGORIES= x11
MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
ftp://ftp.freesoftware.com/pub/XFree86/3.3.6/source/ \
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 08628dc445b3..975cf2126296 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: aterm
-# Version required: 0.3.6
# Date created: 17 January 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= aterm-0.3.6
+PORTNAME= aterm
+PORTVERSION= 0.3.6
CATEGORIES= x11
MASTER_SITES= http://members.xoom.com/sashav/aterm/ \
http://www.tigr.net/afterstep/as-apps/download/aterm/
diff --git a/x11/bgrot/Makefile b/x11/bgrot/Makefile
index c487034f14da..acd29a4ce7b7 100644
--- a/x11/bgrot/Makefile
+++ b/x11/bgrot/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bgrot
-# Version required: 1.10
# Date created: 12 January 1999
# Whom: Matthew Fuller <fullermd@futuresouth.com>
#
# $FreeBSD$
#
-DISTNAME= bgrot-1.20
+PORTNAME= bgrot
+PORTVERSION= 1.20
CATEGORIES= x11
MASTER_SITES= http://www.futuresouth.com/~fullermd/bgrot/ \
http://www.over-yonder.net/~fullermd/bgrot/
diff --git a/x11/blast/Makefile b/x11/blast/Makefile
index 2846e3514937..d77c0ca54d6d 100644
--- a/x11/blast/Makefile
+++ b/x11/blast/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: blast-1.0
-# Version required: 1.0
# Date created: 9 Jul 1996
# Whom: searle
#
# $FreeBSD$
#
-DISTNAME= blast-1.0-ss-10.20
-PKGNAME= blast-1.0
+PORTNAME= blast
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= ftp://hpux.csc.liv.ac.uk/hpux/X11/Demos/blast-1.0/ \
ftp://ftp.univie.ac.at/systems/hpux/hpux/X11/Demos/blast-1.0/ \
ftp://hpftp.cict.fr/hpux/X11/Demos/blast-1.0/
+DISTNAME= ${PKGNAME}-ss-10.20
MAINTAINER= jseger@FreeBSD.org
diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index 874347acab8a..e0ab0f59206f 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: bricons
-# Version required: 3.0 with colour icons
# Date created: 31 Jul 1996
# Whom: shanee@augusta.de
#
# $FreeBSD$
#
-DISTNAME= bricons
-PKGNAME= bricons-3.0
+PORTNAME= bricons
+PORTVERSION= 3.0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= -athena-3.0.tar.gz
MAINTAINER= shanee@augusta.de
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index 2e4e3f40dfda..1d0b8399c0d8 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: dgs
-# Version required: 0.5.9
# Date created: 22 April 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= dgs-0.5.9
+PORTNAME= dgs
+PORTVERSION= 0.5.9
CATEGORIES= x11
#MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITES= ftp://alpha.gnu.org/gnu/gnustep/
diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile
index 2d2dbb8a33a6..ec7a7fb6961b 100644
--- a/x11/dxpc/Makefile
+++ b/x11/dxpc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: dxpc
-# Version required: 3.8.0
# Date created: 2 May 1998
# Whom: Bruce A. Mah <bmah@ca.sandia.gov>
#
# $FreeBSD$
#
-DISTNAME= dxpc-3.8.0
+PORTNAME= dxpc
+PORTVERSION= 3.8.0
CATEGORIES= x11
MASTER_SITES= http://www.vigor.nu/dxpc/3.8.0/
diff --git a/x11/ebuttons/Makefile b/x11/ebuttons/Makefile
index 8ccdf8915c95..3c16942326e7 100644
--- a/x11/ebuttons/Makefile
+++ b/x11/ebuttons/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: E-Buttons 0.2
-# Version required: 0.2
# Date created: 30 March 2000
# Whom: jhb
#
# $FreeBSD$
+#
-DISTNAME= E-buttons-0.2
-PKGNAME= E-Buttons-0.2
+PORTNAME= E-buttons
+PORTVERSION= 0.2
CATEGORIES= x11
MASTER_SITES= http://www.moodfarm.demon.co.uk/download/
EXTRACT_SUFX= .tgz
diff --git a/x11/efancylauncher/Makefile b/x11/efancylauncher/Makefile
index a39b91f9a45e..711e5d80eda3 100644
--- a/x11/efancylauncher/Makefile
+++ b/x11/efancylauncher/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: E-FancyLauncher
-# Version required: 0.7
# Date created: 30 March 2000
# Whom: jhb
#
# $FreeBSD$
+#
-DISTNAME= E-FancyLauncher-0.7
+PORTNAME= E-FancyLauncher
+PORTVERSION= 0.7
CATEGORIES= x11
MASTER_SITES= http://www.docs.uu.se/~adavid/Epplets/
EXTRACT_SUFX= .tgz
diff --git a/x11/emu/Makefile b/x11/emu/Makefile
index ed62b93629a9..806c73ad40d7 100644
--- a/x11/emu/Makefile
+++ b/x11/emu/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: emu
-# Version required: 1.31
# Date created: 13 September 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= emu-1.31
-PKGNAME= emu-1.3.1
+PORTNAME= emu
+PORTVERSION= 1.31
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 994900a0661a..3e50896f12fb 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: eterm
-# Version required: 0.8.10
# Date created: 24 November 1997
# Whom: Murray Stokely <murray@cdrom.com>
#
# $FreeBSD$
#
-DISTNAME= Eterm-0.8.10
-PKGNAME= eterm-0.8.10
+PORTNAME= eterm
+PORTVERSION= 0.8.10
CATEGORIES= x11
MASTER_SITES= ftp://ftp.eterm.org/pub/Eterm/ \
http://eterm.is.nontoxic.org/download/ \
ftp://ftp.livewire.com.au/pub/linuxberg/files/x11/system/ \
ftp://ftp.c-com.net/pub/.30/LinuxBerg/files/x11/system/ \
ftp://ftp.sunsite.auc.dk/disk6/linuxberg.com/files/x11/system/
+DISTNAME= Eterm-${PORTVERSION}
MAINTAINER= murray@cdrom.com
diff --git a/x11/eweather/Makefile b/x11/eweather/Makefile
index 904854efcebf..001faf074e0e 100644
--- a/x11/eweather/Makefile
+++ b/x11/eweather/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: E-Weather 0.2
-# Version required: 0.2
# Date created: 30 March 2000
# Whom: jhb
#
# $FreeBSD$
+#
-DISTNAME= E-Weather-0.2
+PORTNAME= E-Weather
+PORTVERSION= 0.2
CATEGORIES= x11
MASTER_SITES= http://pfnet.org/~cy/
diff --git a/x11/fbsd-icons/Makefile b/x11/fbsd-icons/Makefile
index 3fe47ef10cca..5b4aabb8ec71 100644
--- a/x11/fbsd-icons/Makefile
+++ b/x11/fbsd-icons/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: fbsd-icons
-# Version required: 1.0
# Date created: Sat Jun 14 09:43:24 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= fbsd-icons
-PKGNAME= fbsd-icons-1.0
+PORTNAME= fbsd-icons
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
+DISTNAME= ${PORTNAME}
MAINTAINER= andreas@FreeBSD.org
diff --git a/x11/gmessage/Makefile b/x11/gmessage/Makefile
index fcccdbd91779..43de554b7d7a 100644
--- a/x11/gmessage/Makefile
+++ b/x11/gmessage/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gmessage
-# Version required: 0.2
# Date created: Sun Jul 18 1999
# Whom: domi@saargate.de
#
# $FreeBSD$
#
-DISTNAME= gmessage-0.2
+PORTNAME= gmessage
+PORTVERSION= 0.2
CATEGORIES= x11
MASTER_SITES= http://www.math.uni-goettingen.de/dadler/gmessage/
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 4e6efb5bfd1d..fd29dfba3b5c 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomelibs
-# Version required: 1.0.58
# Date created: 17 June 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gnome-libs-1.0.58
-PKGNAME= gnomelibs-1.0.58
+PORTNAME= gnomelibs
+PORTVERSION= 1.0.58
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-libs
+DISTNAME= gnome-libs-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/x11/gnome/Makefile b/x11/gnome/Makefile
index 5dfb2877cf62..de29c746336f 100644
--- a/x11/gnome/Makefile
+++ b/x11/gnome/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnome
-# Version required: 1.0.53
# Date created: 17 Aug 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gnome-1.0.53
+PORTNAME= gnome
+PORTVERSION= 1.0.53
CATEGORIES= x11 gnome
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 5dfb2877cf62..de29c746336f 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnome
-# Version required: 1.0.53
# Date created: 17 Aug 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gnome-1.0.53
+PORTNAME= gnome
+PORTVERSION= 1.0.53
CATEGORIES= x11 gnome
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index a6f7dc54d3d2..03f582e630b7 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomecore
-# Version required: 1.0.55
# Date created: 17 March 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gnome-core-1.0.55
-PKGNAME= gnomecore-1.0.55
+PORTNAME= gnomecore
+PORTVERSION= 1.0.55
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-core
+DISTNAME= gnome-core-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index 4e6efb5bfd1d..fd29dfba3b5c 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomelibs
-# Version required: 1.0.58
# Date created: 17 June 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gnome-libs-1.0.58
-PKGNAME= gnomelibs-1.0.58
+PORTNAME= gnomelibs
+PORTVERSION= 1.0.58
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-libs
+DISTNAME= gnome-libs-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/x11/gyroscope/Makefile b/x11/gyroscope/Makefile
index af2a42cfc372..a61179e5e256 100644
--- a/x11/gyroscope/Makefile
+++ b/x11/gyroscope/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gyroscope
-# Version required: 1.0
# Date created: 31 July 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gyroscope-1.0
+PORTNAME= gyroscope
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= http://www.millar.u-net.com/
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile
index 021236795621..2d584d80e560 100644
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: imwheel-0.9.7
-# Version required: 0.9.7
# Date created: 18 Feb 2000
# Whom: jhb
#
# $FreeBSD$
#
-DISTNAME= imwheel-0.9.7.nogpm
-PKGNAME= imwheel-0.9.7
+PORTNAME= imwheel
+PORTVERSION= 0.9.7
CATEGORIES= x11
MASTER_SITES= http://jcatki.dhs.org/imwheel/files/
+DISTNAME= ${PKGNAME}.nogpm
MAINTAINER= jhb@FreeBSD.org
diff --git a/x11/kb2mb2/Makefile b/x11/kb2mb2/Makefile
index 65ae96cf1c7a..9e958f61e61c 100644
--- a/x11/kb2mb2/Makefile
+++ b/x11/kb2mb2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kb2mb2
-# Version required: 1.0
# Date created: 24 December 1997
# Whom: Tatsumi Hosokawa
#
# $FreeBSD$
#
-DISTNAME= kb2mb2-1.0
+PORTNAME= kb2mb2
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
diff --git a/x11/kde11/Makefile b/x11/kde11/Makefile
index ca349c616fde..0a67cbc749ca 100644
--- a/x11/kde11/Makefile
+++ b/x11/kde11/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kde
-# Version required: around November 1997
# Date created: 4 November 1997
# Whom: Satoshi Asami <asami@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= kde-1.1.2
+PORTNAME= kde
+PORTVERSION= 1.1.2
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile
index ca349c616fde..0a67cbc749ca 100644
--- a/x11/kde2/Makefile
+++ b/x11/kde2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kde
-# Version required: around November 1997
# Date created: 4 November 1997
# Whom: Satoshi Asami <asami@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= kde-1.1.2
+PORTNAME= kde
+PORTVERSION= 1.1.2
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index ca349c616fde..0a67cbc749ca 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kde
-# Version required: around November 1997
# Date created: 4 November 1997
# Whom: Satoshi Asami <asami@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= kde-1.1.2
+PORTNAME= kde
+PORTVERSION= 1.1.2
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index e7098f07ecfd..142cb33134f5 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdebase
-# Version required: 1.1.2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdebase-1.1.2
+PORTNAME= kdebase
+PORTVERSION= 1.1.2
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index e7098f07ecfd..142cb33134f5 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdebase
-# Version required: 1.1.2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdebase-1.1.2
+PORTNAME= kdebase
+PORTVERSION= 1.1.2
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index e7098f07ecfd..142cb33134f5 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdebase
-# Version required: 1.1.2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdebase-1.1.2
+PORTNAME= kdebase
+PORTVERSION= 1.1.2
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index ca349c616fde..0a67cbc749ca 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kde
-# Version required: around November 1997
# Date created: 4 November 1997
# Whom: Satoshi Asami <asami@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= kde-1.1.2
+PORTNAME= kde
+PORTVERSION= 1.1.2
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index e7098f07ecfd..142cb33134f5 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdebase
-# Version required: 1.1.2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdebase-1.1.2
+PORTNAME= kdebase
+PORTVERSION= 1.1.2
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index e7098f07ecfd..142cb33134f5 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdebase
-# Version required: 1.1.2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdebase-1.1.2
+PORTNAME= kdebase
+PORTVERSION= 1.1.2
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index e7098f07ecfd..142cb33134f5 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdebase
-# Version required: 1.1.2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdebase-1.1.2
+PORTNAME= kdebase
+PORTVERSION= 1.1.2
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index e7098f07ecfd..142cb33134f5 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdebase
-# Version required: 1.1.2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdebase-1.1.2
+PORTNAME= kdebase
+PORTVERSION= 1.1.2
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index e7098f07ecfd..142cb33134f5 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdebase
-# Version required: 1.1.2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdebase-1.1.2
+PORTNAME= kdebase
+PORTVERSION= 1.1.2
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index e7098f07ecfd..142cb33134f5 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdebase
-# Version required: 1.1.2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdebase-1.1.2
+PORTNAME= kdebase
+PORTVERSION= 1.1.2
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index a0708bed053c..89b5b877ff7e 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: kdelibs
-# Version required: 1.1.2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdelibs-1.1.2
-PKGNAME= kdelibs-1.1.2.1
+PORTNAME= kdelibs
+PORTVERSION= 1.1.2.1
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
+DISTNAME= kdelibs-1.1.2
MAINTAINER= will@FreeBSD.org
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index a0708bed053c..89b5b877ff7e 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: kdelibs
-# Version required: 1.1.2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdelibs-1.1.2
-PKGNAME= kdelibs-1.1.2.1
+PORTNAME= kdelibs
+PORTVERSION= 1.1.2.1
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
+DISTNAME= kdelibs-1.1.2
MAINTAINER= will@FreeBSD.org
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index a0708bed053c..89b5b877ff7e 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: kdelibs
-# Version required: 1.1.2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdelibs-1.1.2
-PKGNAME= kdelibs-1.1.2.1
+PORTNAME= kdelibs
+PORTVERSION= 1.1.2.1
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
+DISTNAME= kdelibs-1.1.2
MAINTAINER= will@FreeBSD.org
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index a0708bed053c..89b5b877ff7e 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: kdelibs
-# Version required: 1.1.2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdelibs-1.1.2
-PKGNAME= kdelibs-1.1.2.1
+PORTNAME= kdelibs
+PORTVERSION= 1.1.2.1
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
+DISTNAME= kdelibs-1.1.2
MAINTAINER= will@FreeBSD.org
diff --git a/x11/kvidtune/Makefile b/x11/kvidtune/Makefile
index b312bb7035e8..04d193394ff9 100644
--- a/x11/kvidtune/Makefile
+++ b/x11/kvidtune/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kvidtune
-# Version required: 0.4.1
# Date created: 15 November 1998
# Whom: Josh Gilliam <josh@quick.net>
#
# $FreeBSD$
#
-DISTNAME= kvidtune-0.4.1
+PORTNAME= kvidtune
+PORTVERSION= 0.4.1
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= unstable/apps/admin
diff --git a/x11/kworldwatch/Makefile b/x11/kworldwatch/Makefile
index 672a06896906..a30932fe708c 100644
--- a/x11/kworldwatch/Makefile
+++ b/x11/kworldwatch/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kworldwatch
-# Version required: 0.6
# Date created: 12 July 1998
# Whom: Marc G. Fournier <scrappy@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kworldwatch-0.6
+PORTNAME= kworldwatch
+PORTVERSION= 0.6
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/latest/apps/utils
diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile
index 2e0688062871..6fdc71c345c4 100644
--- a/x11/libdnd/Makefile
+++ b/x11/libdnd/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: libDnd
-# Version required: 1.1
# Date created: 8 August 1997
# Whom: lukin@okbmei.msk.su
#
# $FreeBSD$
#
-DISTNAME= dnd.1.1
-PKGNAME= libdnd-1.1
+PORTNAME= libdnd
+PORTVERSION= 1.1
CATEGORIES= x11
MASTER_SITES= http://leb.net/OffiX/
+DISTNAME= dnd.${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= lukin@okbmei.msk.su
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 4e6efb5bfd1d..fd29dfba3b5c 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomelibs
-# Version required: 1.0.58
# Date created: 17 June 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gnome-libs-1.0.58
-PKGNAME= gnomelibs-1.0.58
+PORTNAME= gnomelibs
+PORTVERSION= 1.0.58
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-libs
+DISTNAME= gnome-libs-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/x11/libhelp/Makefile b/x11/libhelp/Makefile
index 3aebb052dee2..59dbca262944 100644
--- a/x11/libhelp/Makefile
+++ b/x11/libhelp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libhelp
-# Version required: 1.8.1
# Date created: 11 December 96
# Whom: Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
#
# $FreeBSD$
#
-DISTNAME= libhelp-1.8.1
+PORTNAME= libhelp
+PORTVERSION= 1.8.1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.informatik.uni-stuttgart.de/pub/libhelp/
diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile
index dcee45e169b5..ef0ac14fbc39 100644
--- a/x11/libsx/Makefile
+++ b/x11/libsx/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: libsx
-# Version required: 1.1
# Date created: 5 December 1996
# Whom: Pedro Giffuni
#
# $FreeBSD$
#
-DISTNAME= libsx
-PKGNAME= libsx-1.1
+PORTNAME= libsx
+PORTVERSION= 1.1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= libraries
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= giffunip@asme.org
diff --git a/x11/login.app/Makefile b/x11/login.app/Makefile
index 2eae42bc063c..7100dc558294 100644
--- a/x11/login.app/Makefile
+++ b/x11/login.app/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: login.app
-# Version required: 2.0.0-Alpha-4
# Date created: 17 January 1999
# Whom: Maxim Sobolev <sobomax@altavista.net>
#
# $FreeBSD$
#
-DISTNAME= Login.app-2.0.0-Alpha-4
-PKGNAME= login.app-2.0.0.a4
+PORTNAME= login.app
+PORTVERSION= 2.0.0.a4
CATEGORIES= x11 windowmaker
MASTER_SITES= http://www.fukt.hk-r.se/~per/login/
+DISTNAME= Login.app-2.0.0-Alpha-4
MAINTAINER= sobomax@altavista.net
diff --git a/x11/lupe/Makefile b/x11/lupe/Makefile
index f6d45efc5f1d..e4c40c0cc5b2 100644
--- a/x11/lupe/Makefile
+++ b/x11/lupe/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: lupe
-# Version required: 0.08
# Date created: 4 February 1998
# Whom: FURUSAWA,Kazuhisa <kazu@jp.freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= lupe008
-PKGNAME= lupe-0.08
+PORTNAME= lupe
+PORTVERSION= 0.08
CATEGORIES= x11
MASTER_SITES= http://www.oersted.co.jp/~yav/soft/
+DISTNAME= lupe008
MAINTAINER= kazu@jp.freebsd.org
diff --git a/x11/offix-clipboard/Makefile b/x11/offix-clipboard/Makefile
index 4b6bae0daa89..62431b4a3187 100644
--- a/x11/offix-clipboard/Makefile
+++ b/x11/offix-clipboard/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= Clipboard-2.4
-PKGNAME= offix-clipboard-2.4
+PORTNAME= offix-clipboard
+PORTVERSION= 2.4
CATEGORIES= x11 offix
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= desktop_managers/OffiX
+DISTNAME= Clipboard-${PORTVERSION}
MAINTAINER= ruslan@shevchenko.kiev.ua
diff --git a/x11/offix-execute/Makefile b/x11/offix-execute/Makefile
index f95fb9ce6da4..ed94e0dc718a 100644
--- a/x11/offix-execute/Makefile
+++ b/x11/offix-execute/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>
+# ports collection makefile for: Execute
+# Date created: 28 Jun 1997
+# Whom: Ruslan Shevchenko <ruslan@shevchenko.kiev.ua>
#
# $FreeBSD$
#
-DISTNAME= Execute-2.4
-PKGNAME= offix-execute-2.4
+PORTNAME= offix-execute
+PORTVERSION= 2.4
CATEGORIES= x11 offix
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= desktop_managers/OffiX
+DISTNAME= Execute-${PORTVERSION}
MAINTAINER= ruslan@shevchenko.kiev.ua
diff --git a/x11/props/Makefile b/x11/props/Makefile
index 2709de3e44e1..ef47f30f9af5 100644
--- a/x11/props/Makefile
+++ b/x11/props/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: props
-# Version required: 1.0
# Date created: 3 January 1998
# Whom: jraynard
#
# $FreeBSD$
#
-DISTNAME= props-1.0
+PORTNAME= props
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= http://people.FreeBSD.org/~fenner/distfiles/
diff --git a/x11/qrash/Makefile b/x11/qrash/Makefile
index 70a28298fe9d..f6c5683ea29e 100644
--- a/x11/qrash/Makefile
+++ b/x11/qrash/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: qrash
-# Version required: 1.0
# Date created: Oct 27, 1999
# Whom: Trevor Johnson <trevor@jpj.net>
#
# $FreeBSD$
#
-DISTNAME= qrash
-PKGNAME= qrash-1.0
+PORTNAME= qrash
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= http://qmg.org/files/demos/qmg/ \
ftp://qmg.org/pub/demos/qmg/ \
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/demos
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= trevor@jpj.net
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 2be1eb4b4aff..1eaf3537cb3c 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -1,5 +1,4 @@
# New ports collection Makefile for: rxvt
-# Version required: 2.7.3
# Date created: 5th December 1994
# Whom: gpalmer@FreeBSD.org
#
@@ -9,7 +8,8 @@
# (and maybe ports/chinese/rxvt) when you upgrade rxvt. These ports all use
# the same distfile.
-DISTNAME= rxvt-2.7.3
+PORTNAME= rxvt
+PORTVERSION= 2.7.3
CATEGORIES= x11
MASTER_SITES= ftp://ftp.rxvt.org/pub/rxvt/ \
ftp://mason.primenet.com.au/pub/rxvt/ \
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 2be1eb4b4aff..1eaf3537cb3c 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,5 +1,4 @@
# New ports collection Makefile for: rxvt
-# Version required: 2.7.3
# Date created: 5th December 1994
# Whom: gpalmer@FreeBSD.org
#
@@ -9,7 +8,8 @@
# (and maybe ports/chinese/rxvt) when you upgrade rxvt. These ports all use
# the same distfile.
-DISTNAME= rxvt-2.7.3
+PORTNAME= rxvt
+PORTVERSION= 2.7.3
CATEGORIES= x11
MASTER_SITES= ftp://ftp.rxvt.org/pub/rxvt/ \
ftp://mason.primenet.com.au/pub/rxvt/ \
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 2be1eb4b4aff..1eaf3537cb3c 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,5 +1,4 @@
# New ports collection Makefile for: rxvt
-# Version required: 2.7.3
# Date created: 5th December 1994
# Whom: gpalmer@FreeBSD.org
#
@@ -9,7 +8,8 @@
# (and maybe ports/chinese/rxvt) when you upgrade rxvt. These ports all use
# the same distfile.
-DISTNAME= rxvt-2.7.3
+PORTNAME= rxvt
+PORTVERSION= 2.7.3
CATEGORIES= x11
MASTER_SITES= ftp://ftp.rxvt.org/pub/rxvt/ \
ftp://mason.primenet.com.au/pub/rxvt/ \
diff --git a/x11/sxpc/Makefile b/x11/sxpc/Makefile
index 366edbd615bf..21f3c54a2abb 100644
--- a/x11/sxpc/Makefile
+++ b/x11/sxpc/Makefile
@@ -1,12 +1,12 @@
# New ports collection Makefile for: sxpc
-# Version required: 1.4
# Date created: 22nd March 1995
# Whom: jkh@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= sxpc-1.4
+PORTNAME= sxpc
+PORTVERSION= 1.4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
diff --git a/x11/tkgoodstuff/Makefile b/x11/tkgoodstuff/Makefile
index 2d2495b76cf0..4f9a5a9576cd 100644
--- a/x11/tkgoodstuff/Makefile
+++ b/x11/tkgoodstuff/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: tkgoodstuff
-# Version required: 8.0-final
# Date created: 7 Oct 1996
# Whom: pst
#
# $FreeBSD$
#
-DISTNAME= tkgoodstuff8.0-final
-PKGNAME= tkgoodstuff-8.0
+PORTNAME= tkgoodstuff
+PORTVERSION= 8.0
CATEGORIES= x11 tk80
MASTER_SITES= http://www-personal.umich.edu/~markcrim/tkgoodstuff/dists/
+DISTNAME= ${PORTNAME}${PORTVERSION}-final
MAINTAINER= pst@FreeBSD.org
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index b1a36cb71b2f..afc0329ad4a0 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tycoon
-# Version required: 1.07o
# Date created: 19 September 1997
# Whom: steve@farrell.org
#
# $FreeBSD$
#
-DISTNAME= tycoon-1.07o
+PORTNAME= tycoon
+PORTVERSION= 1.07o
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/desktop
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 73ccfb056562..d1fbb84238bd 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: wdm
-# Version required: 1.20
# Date created: August 31, 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
+#
-DISTNAME= wdm-1.20
+PORTNAME= wdm
+PORTVERSION= 1.20
CATEGORIES= x11 windowmaker
MASTER_SITES= http://cortex.unice.fr/~jerome/WindowMaker/wdm/ \
http://www.de.freebsd.org/de/gif/bsd/
diff --git a/x11/wmbutton/Makefile b/x11/wmbutton/Makefile
index 61272eae348d..eab8552a5d0d 100644
--- a/x11/wmbutton/Makefile
+++ b/x11/wmbutton/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmbutton
-# Version required: 0.4
# Date created: 10 Apr 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= wmbutton-0.4
+PORTNAME= wmbutton
+PORTVERSION= 0.4
CATEGORIES= x11 windowmaker
MASTER_SITES= http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/ \
http://people.FreeBSD.org/~jim/distfiles/
diff --git a/x11/wmmatrix/Makefile b/x11/wmmatrix/Makefile
index 51362618b6aa..0459aa4357c2 100644
--- a/x11/wmmatrix/Makefile
+++ b/x11/wmmatrix/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: wmMatrix
-# Version required: 0.2
# Date created: 13 October 1999
# Whom: Brian Handy <handy@physics.montana.edu>
#
# $FreeBSD$
+#
-DISTNAME= wmMatrix-0.2
-PKGNAME= wmmatrix-0.2
+PORTNAME= wmmatrix
+PORTVERSION= 0.2
CATEGORIES= x11 windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
+DISTNAME= wmMatrix-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 40ad808352a6..ea96e4b46320 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wterm
-# Version required: 6.2.6
# Date created: 25 February 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= wterm-6.2.6
+PORTNAME= wterm
+PORTVERSION= 6.2.6
CATEGORIES= x11
MASTER_SITES= http://wm.current.nu/files/
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 8862395c96c5..4e1448236343 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: x3270
-# Version required: 3.1.1.6
# Date created: 31 January 1995
# Whom: janek
#
# $FreeBSD$
#
-DISTNAME= x3270-3.1.1.6
+PORTNAME= x3270
+PORTVERSION= 3.1.1.6
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
diff --git a/x11/xaniroc/Makefile b/x11/xaniroc/Makefile
index b71a80a8ab1d..b155a8bbba7d 100644
--- a/x11/xaniroc/Makefile
+++ b/x11/xaniroc/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xaniroc
-# Version required: 0.3
# Date created: 20 Sep 1997
# Whom: Stefan Zehl <sec@42.org>
#
# $FreeBSD$
#
-DISTNAME= xaniroc
-PKGNAME= xaniroc-1.02
+PORTNAME= xaniroc
+PORTVERSION= 1.02
CATEGORIES= x11
MASTER_SITES= ftp://ftp.freebird.org/unixware/freebird/x11/utils/ \
ftp://netlab1.usu.edu/pub/mirror/freebird/x11/utils/
+DISTNAMe= ${PORTNAME}
EXTRACT_SUFX= .src.tar.Z
MAINTAINER= sec@42.org
diff --git a/x11/xantfarm/Makefile b/x11/xantfarm/Makefile
index 2cbdea0ac3e6..6bc4e9a13b75 100644
--- a/x11/xantfarm/Makefile
+++ b/x11/xantfarm/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xantfarm
-# Version required: 1.16
# Date created: 13 February 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xantfarm_23oct91
-PKGNAME= xantfarm-1.16
+PORTNAME= xantfarm
+PORTVERSION= 1.16
CATEGORIES= x11
MASTER_SITES= http://www.acme.com/software/xantfarm/
+DISTNAME= ${PORTNAME}_23oct91
MAINTAINER= nakai@FreeBSD.org
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index 4e9cc018141a..b836c278965f 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xautolock
-# Version required: 1pl14
# Date created: 20 Jul 1996
# Whom: Eric Blood <eblood@cs.unr.edu>
#
# $FreeBSD$
#
-DISTNAME= xautolock-pl15
-PKGNAME= xautolock-1.15
+PORTNAME= xautolock
+PORTVERSION= 1.15
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
+DISTNAME= ${PORTNAME}-pl15
EXTRACT_SUFX= .tgz
MAINTAINER= eblood@cs.unr.edu
diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile
index 311bed0e6194..37b841fc3f47 100644
--- a/x11/xballoon/Makefile
+++ b/x11/xballoon/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: XBalloon
-# Version required: 1.0
# Date created: 3 March 1999
# Whom: Sakai Hiroaki <sakai@miya.ee.kagu.sut.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xballoon-1.0
+PORTNAME= xballoon
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= http://wwwmiya.ee.kagu.sut.ac.jp/~sakai/
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index ae9e802281ca..2ee5b46d1033 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: xbanner
-# Version required: 1.31
# Date created: 13 Jan 1999
# Whom: giffunip@asme.org
#
# $FreeBSD$
#
-DISTNAME= XBanner1.31
-PKGNAME= xbanner-1.31
+PORTNAME= xbanner
+PORTVERSION= 1.31
CATEGORIES= x11
MASTER_SITES= ftp://ftp.digital.com/pub/linux/XBanner/ \
ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/ \
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/xutils
+DISTNAME= XBanner${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/xcb/Makefile b/x11/xcb/Makefile
index ad98517c414a..c565a5af9659 100644
--- a/x11/xcb/Makefile
+++ b/x11/xcb/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xcb
-# Version required: 2.3
# Date created: 1 August 1995
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= xcb-2.3
+PORTNAME= xcb
+PORTVERSION= 2.3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
diff --git a/x11/xco/Makefile b/x11/xco/Makefile
index 118c330f11d0..2c9d3ebd617b 100644
--- a/x11/xco/Makefile
+++ b/x11/xco/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xco
-# Version required: 1.3
# Date created: 6 Jun 1997
# Whom: Satoshi TAOKA
#
# $FreeBSD$
#
-DISTNAME= xco
-PKGNAME= xco-1.3
+PORTNAME= xco
+PORTVERSION= 1.3
CATEGORIES= x11
MASTER_SITES= ftp://ftp.cs.purdue.edu/pub/bingle/
+DISTNAME= ${PORTNAME}
MAINTAINER= taoka@FreeBSD.org
diff --git a/x11/xcoloredit/Makefile b/x11/xcoloredit/Makefile
index fb751bd770c8..0e862e977a6a 100644
--- a/x11/xcoloredit/Makefile
+++ b/x11/xcoloredit/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xcoloredit
-# Version required: 1.3
# Date created: 6 Jun 1997
# Whom: Satoshi TAOKA
#
# $FreeBSD$
#
-DISTNAME= xcoloredit
-PKGNAME= xcoloredit-1.2
+PORTNAME= xcoloredit
+PORTVERSION= 1.2
CATEGORIES= x11
MASTER_SITES= ftp://ftp.eos.hokudai.ac.jp/pub/X11/R5contrib/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= taoka@FreeBSD.org
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index 66eec25ab356..bd925e2e982d 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xcolors
-# Version required: R6 contrib
# Date created: 10 May 1995
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= xcolors
-PKGNAME= xcolors-1.3
+PORTNAME= xcolors
+PORTVERSION= 1.3
CATEGORIES= x11
MASTER_SITES= http://www.lovett.com/~ade/FreeBSD/
+DISTNAME= ${PORTNAME}
MAINTAINER= ade@FreeBSD.org
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 3a8ac17d8026..d935a1850d84 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xcolorsel
-# Version required: 1.1a
# Date Created: 11 November 1998
# Whom: Wayne Cuddy <wayne@crb-web.com>
#
# $FreeBSD$
#
-DISTNAME= xcolorsel-1.1a-src
-PKGNAME= xcolorsel-1.1a
+PORTNAME= xcolorsel
+PORTVERSION= 1.1a
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
+DISTNAME= ${PKGNAME}-src
MAINTAINER= wayne@crb-web.com
diff --git a/x11/xcut/Makefile b/x11/xcut/Makefile
index 1d70902e4686..bdc2ba129357 100644
--- a/x11/xcut/Makefile
+++ b/x11/xcut/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xcut
-# Version required: 0.2
# Date created: 23 September 1999
# Whom: Cy Schubert <Cy.Schubert@uumail.gov.bc.ca>
#
# $FreeBSD$
#
-DISTNAME= xcut-0.2
+PORTNAME= xcut
+PORTVERSION= 0.2
CATEGORIES= x11
MASTER_SITES= http://acsys.anu.edu.au/~tpot/xcut/
diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile
index 848a3b201c65..c07845c8baeb 100644
--- a/x11/xdtm/Makefile
+++ b/x11/xdtm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xdtm
-# Version required: 2.5.8
# Date created: 26th April 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= xdtm-2.5.8
+PORTNAME= xdtm
+PORTVERSION= 2.5.8
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
diff --git a/x11/xfedor/Makefile b/x11/xfedor/Makefile
index a7690d9b75a2..048cd8e0db3e 100644
--- a/x11/xfedor/Makefile
+++ b/x11/xfedor/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: xfedor
-# Version required: 1994 year version with Imakefile
# Date created: 3 Sep 1996
# Whom: ache
#
@@ -9,10 +8,11 @@
# $FreeBSD$
#
-DISTNAME= xfedor
-PKGNAME= xfedor-1.0
+PORTNAME= xfedor
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/x11/util/
+DISTNAME= ${PORTNAME}
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile
index 52396ba8e54e..cfa60ecdd4d0 100644
--- a/x11/xfishtank/Makefile
+++ b/x11/xfishtank/Makefile
@@ -1,20 +1,20 @@
# New ports collection makefile for: xfishtank
-# Version required: 2.2
# Date created: 24th April 1997
# Whom: jacs
#
# $FreeBSD$
#
-DISTNAME= xfishtank-2.2
-CATEGORIES= x11
-MASTER_SITES= ftp://ftp.uni-koeln.de/windows/xcontrib/
+PORTNAME= xfishtank
+PORTVERSION= 2.2
+CATEGORIES= x11
+MASTER_SITES= ftp://ftp.uni-koeln.de/windows/xcontrib/
-MAINTAINER= jacs@gnome.co.uk
+MAINTAINER= jacs@gnome.co.uk
-USE_IMAKE= yes
-WRKSRC= ${WRKDIR}/xfishtank2.0
-NO_INSTALL_MANPAGES=yes
+USE_IMAKE= yes
+WRKSRC= ${WRKDIR}/xfishtank2.0
+NO_INSTALL_MANPAGES= yes
post-patch:
cd ${WRKDIR}/xfishtank2.0; make clean
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index 407487082b62..88cd905339f4 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xgrab
-# Version required: 2.41
# Date created: 27 February 1995
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= xgrabsc.2_41
-PKGNAME= xgrab-2.41
+PORTNAME= xgrab
+PORTVERSION= 2.41
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
+DISTNAME= ${PORTNAME}sc.2_41
EXTRACT_SUFX= .tar.Z
MAINTAINER= jmz@FreeBSD.org
diff --git a/x11/xkbctrl/Makefile b/x11/xkbctrl/Makefile
index ef1584cd018f..9e27b778f2ca 100644
--- a/x11/xkbctrl/Makefile
+++ b/x11/xkbctrl/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: xkbctrl
-# Version required: 1.0
# Date created: 9 January 2000
# Whom: Yoshiro MIHIRA <sanpei@sanpei.org>
#
# $FreeBSD$
#
-DISTNAME= xkbctrl
-PKGNAME= xkbctrl-1.0
+PORTNAME= xkbctrl
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= ftp://core.ring.gr.jp/pub/X/opengroup/unsupported/test/Xkb/programs/ \
ftp://ring.nacsis.ac.jp/pub/X/opengroup/unsupported/test/Xkb/programs/
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index 923404d29f1c..db03013ffa37 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xkeycaps
-# Version required: 2.31
# Date created: 12 February 1995
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= xkeycaps-2.45
+PORTNAME= xkeycaps
+PORTVERSION= 2.45
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xkeycaps/
EXTRACT_SUFX= .tar.Z
diff --git a/x11/xkeywrap/Makefile b/x11/xkeywrap/Makefile
index 731986a1f212..503b8b3a7561 100644
--- a/x11/xkeywrap/Makefile
+++ b/x11/xkeywrap/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: XKeyWrap
-# Version required: 1.0
# Date created: 7 January 2000
# Whom: Sakai Hiroaki <sakai@seki.ee.kagu.sut.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xkeywrap-1.0
+PORTNAME= xkeywrap
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= http://www.seki.ee.kagu.sut.ac.jp/~sakai/
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 1b6aabbecda7..73d340862e5e 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xloadimage
-# Version required: 4.1
# Date created: 9 January 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= xloadimage.4.1
-PKGNAME= xloadimage-4.1
+PORTNAME= xloadimage
+PORTVERSION= 4.1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= jmz@FreeBSD.org
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index e85c992364fb..4eb97668f1ee 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xlockmore
-# Version required: 4.16
# Date created: 9 November 1994
# Whom: smace
#
# $FreeBSD$
#
-DISTNAME= xlockmore-4.16
+PORTNAME= xlockmore
+PORTVERSION= 4.16
CATEGORIES= x11
MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
${MASTER_SITE_XCONTRIB}
diff --git a/x11/xlogout/Makefile b/x11/xlogout/Makefile
index 1669180b655d..03d9df80b3ab 100644
--- a/x11/xlogout/Makefile
+++ b/x11/xlogout/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xlogout
-# Version required: 1.1
# Date created: 1998-11-06
# Whom: Christian Weisgerber <naddy@mips.rhein-neckar.de>
#
# $FreeBSD$
#
-DISTNAME= xlogout-1.1
+PORTNAME= xlogout
+PORTVERSION= 1.1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.tu-darmstadt.de/pub/X11/other/
EXTRACT_SUFX= .tar.Z
diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile
index 39f8ab368b4f..7be3f45f1607 100644
--- a/x11/xlupe/Makefile
+++ b/x11/xlupe/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xlupe
-# Version required: 1.0
# Date created: 17 Apr 1999
# Whom: runge@rostock.zgdv.de
#
# $FreeBSD$
#
-DISTNAME= xlupe-1.0
+PORTNAME= xlupe
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= http://www.rostock.zgdv.de/~runge/xlupe/
diff --git a/x11/xmangekyou/Makefile b/x11/xmangekyou/Makefile
index 659834207e5b..70f81df9d30a 100644
--- a/x11/xmangekyou/Makefile
+++ b/x11/xmangekyou/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: XMangekyou
-# Version required: 2.0
# Date created: 30 October 1998
# Whom: Sakai Hiroaki <sakai@miya.ee.kagu.sut.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xmangekyou-2.0
+PORTNAME= xmangekyou
+PORTVERSION= 2.0
CATEGORIES= x11
MASTER_SITES= http://wwwmiya.ee.kagu.sut.ac.jp/~sakai/
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index 856a753c1f67..d1b0aeb314de 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xmascot
-# Version required: 2.6a
# Date created: 20 November 1996
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xmascot2.6a
-PKGNAME= xmascot-2.6a
+PORTNAME= xmascot
+PORTVERSION= 2.6a
CATEGORIES= x11
MASTER_SITES= ftp://cclub.tutcc.tut.ac.jp/pub/xmascot/ \
http://cclub-flying.dsl.gr.jp/products/xmascot/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/x11/xmold/Makefile b/x11/xmold/Makefile
index fb6b71a50467..de19bd79f73a 100644
--- a/x11/xmold/Makefile
+++ b/x11/xmold/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xmold
-# Version required: 1.0
# Date created: 11 October 1996
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xmold
-PKGNAME= xmold-1.0
+PORTNAME= xmold
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= ftp://cclub.tutcc.tut.ac.jp/pub/xwin/
+DISTNAME= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index 66967d961eae..f84d7ed87a2d 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xmove
-# Version required: 2.0
# Date created: 16 Jan 1997
# Whom: Stefan Zehl <sec@42.org>
#
# $FreeBSD$
#
-DISTNAME= xmove.2.0beta2
-PKGNAME= xmove-2.0b2
+PORTNAME= xmove
+PORTVERSION= 2.0b2
CATEGORIES= x11
MASTER_SITES= ftp://ftp.cs.columbia.edu/pub/xmove/
+DISTNAME= ${PORTNAME}.2.0beta2
MAINTAINER= sec@42.org
diff --git a/x11/xmsg/Makefile b/x11/xmsg/Makefile
index ac64a77860c8..084efa41b221 100644
--- a/x11/xmsg/Makefile
+++ b/x11/xmsg/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmsg
-# Version required: 1.0
# Date created: 21 September 1999
# Whom: jsellens
#
# $FreeBSD$
#
-DISTNAME= xmsg-1.0
+PORTNAME= xmsg
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= http://www.generalconcepts.com/resources/software/
diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile
index c430fd934830..871325943abf 100644
--- a/x11/xmx/Makefile
+++ b/x11/xmx/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: xmx 1.1
-# Version required: 1.1
# Date created: February 23, 1999
# Whom: Oliver Breuninger <ob@seicom.NET>
#
# $FreeBSD$
+#
-DISTNAME= xmx-1.1
+PORTNAME= xmx
+PORTVERSION= 1.1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.cs.brown.edu/pub/xmx/
EXTRACT_SUFX= .tar.Z
diff --git a/x11/xprompt/Makefile b/x11/xprompt/Makefile
index 8818cb9c1229..935015cf0368 100644
--- a/x11/xprompt/Makefile
+++ b/x11/xprompt/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xprompt
-# Version required: 1.4
# Date created: 23 March 1997
# Whom: Matthew Hunt <mph@pobox.com>
#
# $FreeBSD$
#
-DISTNAME= xprompt-1.4
+PORTNAME= xprompt
+PORTVERSION= 1.4
CATEGORIES= x11
MASTER_SITES= http://people.FreeBSD.org/~mph/distfiles/
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index fb27760650f5..208402c2ae9b 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xscreensaver
-# Version required: 3.21
# Date created: 10 July 1995
# Whom: dom@myrddin.demon.co.uk
#
# $FreeBSD$
#
-DISTNAME= xscreensaver-3.21
+PORTNAME= xscreensaver
+PORTVERSION= 3.21
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/
diff --git a/x11/xskyroot/Makefile b/x11/xskyroot/Makefile
index dc4cc7297309..7109d5175e53 100644
--- a/x11/xskyroot/Makefile
+++ b/x11/xskyroot/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xskyroot
-# Version required: 2.54
# Date created: 20 April 1997
# Whom: nkazushi@highway.or.jp
#
# $FreeBSD$
#
-DISTNAME= xskyroot-920428
+PORTNAME= xskyroot
+PORTVERSION= 920428
CATEGORIES= x11
MASTER_SITES= ftp://ftp.fit.ac.jp/pub/X/contrib/
EXTRACT_SUFX= .tar.Z
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index 855a743a95ac..802b155b333d 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xsnow
-# Version required: 1.40
# Date created: 12 November 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= xsnow-1.40
+PORTNAME= xsnow
+PORTVERSION= 1.40
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
diff --git a/x11/xstarroll/Makefile b/x11/xstarroll/Makefile
index 0b336cded321..863a9e4ccfd0 100644
--- a/x11/xstarroll/Makefile
+++ b/x11/xstarroll/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: XStarRoll
-# Version required: 1.04
# Date created: 14 January 1999
# Whom: Sakai Hiroaki <sakai@miya.ee.kagu.sut.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xstarroll-1.04
+PORTNAME= xstarroll
+PORTVERSION= 1.04
CATEGORIES= x11
MASTER_SITES= http://wwwmiya.ee.kagu.sut.ac.jp/~sakai/
diff --git a/x11/xtacy/Makefile b/x11/xtacy/Makefile
index 7ce321c40a1c..6e904df38f70 100644
--- a/x11/xtacy/Makefile
+++ b/x11/xtacy/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xtacy
-# Version required: 1.14
# Date created: 25 July 1996
# Whom: matt@bdd.net
#
# $FreeBSD$
#
-DISTNAME= xtacy114
-PKGNAME= xtacy-1.14
+PORTNAME= xtacy
+PORTVERSION= 1.14
CATEGORIES= x11
MASTER_SITES= http://www.ultranet.com/~jjohnson/ \
${MASTER_SITE_SUNSITE}
+DISTNAMe= ${PORTNAME}114
MAINTAINER= matt@bdd.net
diff --git a/x11/xtattr/Makefile b/x11/xtattr/Makefile
index c4902e0b7111..62a86b0b3d45 100644
--- a/x11/xtattr/Makefile
+++ b/x11/xtattr/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xtattr
-# Version required: 1.0
# Date created: 6 August 1997
# Whom: jeff@cetlink.net
#
# $FreeBSD$
#
-DISTNAME= xtattr-1.0
+PORTNAME= xtattr
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/x11/xtermset/Makefile b/x11/xtermset/Makefile
index b26bddfa3bb8..3a4f27a7ba3d 100644
--- a/x11/xtermset/Makefile
+++ b/x11/xtermset/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xtermset
-# Version required: 0.4
# Date created: 21 August 1999
# Whom: Dominik Rothert <dr@domix.de>
#
# $FreeBSD$
#
-DISTNAME= xtermset-0.4
+PORTNAME= xtermset
+PORTVERSION= 0.4
CATEGORIES= x11
MASTER_SITES= http://xtermset.netpedia.net/src/
diff --git a/x11/xtestpicture/Makefile b/x11/xtestpicture/Makefile
index 077ed2aaa782..c8b6594015fa 100644
--- a/x11/xtestpicture/Makefile
+++ b/x11/xtestpicture/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xtestpicture
-# Version required: 1.2
# Date created: 11 March 1997
# Whom: joerg
#
# $FreeBSD$
#
-DISTNAME= xtestpicture-1.2
+PORTNAME= xtestpicture
+PORTVERSION= 1.2
CATEGORIES= x11
MASTER_SITES= ftp://ftp.interface-business.de/pub/outgoing/
diff --git a/x11/xtoolwait/Makefile b/x11/xtoolwait/Makefile
index 1d776428cb06..da79b927441a 100644
--- a/x11/xtoolwait/Makefile
+++ b/x11/xtoolwait/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xtoolwait
-# Version required: 1.3
# Date created: 31 May 1997
# Whom: jonny
#
# $FreeBSD$
#
-DISTNAME= xtoolwait-1.3
+PORTNAME= xtoolwait
+PORTVERSION= 1.3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile
index eb88c2a15fee..19840fde6974 100644
--- a/x11/xwit/Makefile
+++ b/x11/xwit/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xwit
-# Version required: 1.0
# Date created: 15 June 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= xwit-1.0
+PORTNAME= xwit
+PORTVERSION= 1.0
CATEGORIES= x11
MASTER_SITES= http://people.FreeBSD.org/~tg/
diff --git a/x11/xzoom/Makefile b/x11/xzoom/Makefile
index fc360cec6a90..28f2af118aed 100644
--- a/x11/xzoom/Makefile
+++ b/x11/xzoom/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xzoom
-# Version required: 0.3
# Date created: 30 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xzoom-0.3
+PORTNAME= xzoom
+PORTVERSION= 0.3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= libs/X