aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/FWF/Makefile4
-rw-r--r--x11-toolkits/Motif-dummy/Makefile4
-rw-r--r--x11-toolkits/Xaw3d/Makefile4
-rw-r--r--x11-toolkits/blt/Makefile6
-rw-r--r--x11-toolkits/fltk/Makefile6
-rw-r--r--x11-toolkits/fox-devel/Makefile6
-rw-r--r--x11-toolkits/fox/Makefile6
-rw-r--r--x11-toolkits/fox10/Makefile6
-rw-r--r--x11-toolkits/fox14/Makefile6
-rw-r--r--x11-toolkits/gob/Makefile4
-rw-r--r--x11-toolkits/gtk--/Makefile6
-rw-r--r--x11-toolkits/gtk--2/Makefile6
-rw-r--r--x11-toolkits/gtk-engines/Makefile4
-rw-r--r--x11-toolkits/gtk-engines2/Makefile4
-rw-r--r--x11-toolkits/gtk12/Makefile6
-rw-r--r--x11-toolkits/gtk13/Makefile6
-rw-r--r--x11-toolkits/gtk20/Makefile6
-rw-r--r--x11-toolkits/gtk30/Makefile6
-rw-r--r--x11-toolkits/gtkglarea/Makefile4
-rw-r--r--x11-toolkits/gtkglarea2/Makefile4
-rw-r--r--x11-toolkits/gtkmm12/Makefile6
-rw-r--r--x11-toolkits/gtkmm20/Makefile6
-rw-r--r--x11-toolkits/gtkmm24/Makefile6
-rw-r--r--x11-toolkits/gtkmm30/Makefile6
-rw-r--r--x11-toolkits/gtkstep/Makefile4
-rw-r--r--x11-toolkits/guile-gtk/Makefile4
-rw-r--r--x11-toolkits/itk/Makefile6
-rw-r--r--x11-toolkits/iv/Makefile6
-rw-r--r--x11-toolkits/iwidgets/Makefile6
-rw-r--r--x11-toolkits/lesstif/Makefile4
-rw-r--r--x11-toolkits/neXtaw/Makefile4
-rw-r--r--x11-toolkits/open-motif-devel/Makefile4
-rw-r--r--x11-toolkits/open-motif/Makefile4
-rw-r--r--x11-toolkits/p5-Gtk/Makefile6
-rw-r--r--x11-toolkits/p5-Tcl-Tk/Makefile7
-rw-r--r--x11-toolkits/p5-TclTk/Makefile7
-rw-r--r--x11-toolkits/p5-Tk/Makefile6
-rw-r--r--x11-toolkits/pike-gtk/Makefile6
-rw-r--r--x11-toolkits/plib/Makefile4
-rw-r--r--x11-toolkits/pmw/Makefile6
-rw-r--r--x11-toolkits/py-Pmw/Makefile6
-rw-r--r--x11-toolkits/py-gnome/Makefile6
-rw-r--r--x11-toolkits/py-gnome2/Makefile6
-rw-r--r--x11-toolkits/py-gtk/Makefile6
-rw-r--r--x11-toolkits/py-gtk2/Makefile6
-rw-r--r--x11-toolkits/py-tkinter/Makefile6
-rw-r--r--x11-toolkits/py-wxPython/Makefile6
-rw-r--r--x11-toolkits/py-wxPython24/Makefile6
-rw-r--r--x11-toolkits/py-wxPython26/Makefile6
-rw-r--r--x11-toolkits/py-wxPython28/Makefile6
-rw-r--r--x11-toolkits/qt145/Makefile4
-rw-r--r--x11-toolkits/qt22/Makefile6
-rw-r--r--x11-toolkits/qt23/Makefile6
-rw-r--r--x11-toolkits/qt30/Makefile6
-rw-r--r--x11-toolkits/qt31/Makefile6
-rw-r--r--x11-toolkits/qt32/Makefile6
-rw-r--r--x11-toolkits/qt33/Makefile6
-rw-r--r--x11-toolkits/rep-gtk/Makefile4
-rw-r--r--x11-toolkits/rep-gtk2/Makefile4
-rw-r--r--x11-toolkits/ruby-gtk/Makefile4
-rw-r--r--x11-toolkits/ruby-gtk2/Makefile4
-rw-r--r--x11-toolkits/ruby-tk/Makefile6
-rw-r--r--x11-toolkits/ruby14-tk/Makefile6
-rw-r--r--x11-toolkits/slingshot/Makefile6
-rw-r--r--x11-toolkits/tix/Makefile6
-rw-r--r--x11-toolkits/tk80/Makefile6
-rw-r--r--x11-toolkits/tk82/Makefile6
-rw-r--r--x11-toolkits/tk83/Makefile6
-rw-r--r--x11-toolkits/tk84/Makefile6
-rw-r--r--x11-toolkits/tkstep80/Makefile6
-rw-r--r--x11-toolkits/v/Makefile4
-rw-r--r--x11-toolkits/vdk/Makefile4
-rw-r--r--x11-toolkits/vdkbuilder/Makefile4
-rw-r--r--x11-toolkits/wxgtk-devel/Makefile6
-rw-r--r--x11-toolkits/wxgtk/Makefile6
-rw-r--r--x11-toolkits/wxgtk24/Makefile6
-rw-r--r--x11-toolkits/xbae/Makefile6
-rw-r--r--x11-toolkits/xforms/Makefile4
-rw-r--r--x11-toolkits/xg/Makefile6
-rw-r--r--x11-toolkits/xmhtml/Makefile4
-rw-r--r--x11-toolkits/xview-clients/Makefile6
-rw-r--r--x11-toolkits/xview/Makefile6
82 files changed, 225 insertions, 219 deletions
diff --git a/x11-toolkits/FWF/Makefile b/x11-toolkits/FWF/Makefile
index 9d679ca83200..11dc6076d917 100644
--- a/x11-toolkits/FWF/Makefile
+++ b/x11-toolkits/FWF/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: FWF Widgets
-# Version required: 4.0
# Date created: 14 July 1995
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= fwf-4.0
+PORTNAME= fwf
+PORTVERSION= 4.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://ftp.let.rug.nl/pub/FWF/
diff --git a/x11-toolkits/Motif-dummy/Makefile b/x11-toolkits/Motif-dummy/Makefile
index 22d34df9b350..93dfeb8b2df1 100644
--- a/x11-toolkits/Motif-dummy/Makefile
+++ b/x11-toolkits/Motif-dummy/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: motif
-# Version required: 2.1.10
# Date created: 5 December 1994
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= Motif-2.1.10
+PORTNAME= Motif
+PORTVERSION= 2.1.10
CATEGORIES= x11-toolkits
DISTFILES= # empty
diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index 1facf737fbbb..9d4317366569 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Xaw3d
-# Version required: 1.5
# Date created: 18 November 1994
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= Xaw3d-1.5
+PORTNAME= Xaw3d
+PORTVERSION= 1.5
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= widgets/Xaw3d/R6.3
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 1129974566f2..a08bd0cfdd54 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: blt
-# Version required: 2.4m
# Date created: 22 September 1998
# Whom: Kenjiro Cho <kjc@csl.sony.co.jp>
#
# $FreeBSD$
#
-DISTNAME= BLT2.4m
-PKGNAME= blt-2.4m
+PORTNAME= blt
+PORTVERSION= 2.4m
CATEGORIES= x11-toolkits tk82
MASTER_SITES= ftp://ftp.tcltk.com/pub/blt/ \
ftp://ftp.csl.sony.co.jp/pub/kjc/ttt-libs/
+DISTNAME= BLT${PORTVERSION}
MAINTAINER= kjc@csl.sony.co.jp
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 37a25e5a8de5..c4631366d351 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: fltk
-# Version required: 1.0.7
# Date created: 11 February 1999
# Whom: Dima Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= fltk-1.0.7-source
-PKGNAME= fltk-1.0.7
+PORTNAME= fltk
+PORTVERSION= 1.0.7
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.fltk.org/pub/fltk/${VERSION}/ \
ftp://ftp.chg.ru/pub/X11/fltk/${VERSION}/ \
@@ -15,6 +14,7 @@ MASTER_SITES= ftp://ftp.fltk.org/pub/fltk/${VERSION}/ \
ftp://ftp.northamerica.net/pub/ESP/fltk/${VERSION}/ \
ftp://ftp.funet.fi/mirrors/ftp.easysw.com/pub/fltk/${VERSION}/ \
ftp://ftp.kddlabs.co.jp/pub/lang/fltk/${VERSION}/
+DISTNAME= ${PKGNAME}-source
MAINTAINER= dima@chg.ru
diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile
index 32652635e247..f88032bcc70f 100644
--- a/x11-toolkits/fox-devel/Makefile
+++ b/x11-toolkits/fox-devel/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: fox
-# Version required: 0.1
# Date created: 23 Feb 2000
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= fox
-PKGNAME= fox-0.99.112
+PORTNAME= fox
+PORTVERSION= 0.99.112
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \
ftp://imssun1.epfl.ch/pub/ \
ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
+DISTNAME= ${PORTNAME}
MAINTAINER= will@FreeBSD.org
diff --git a/x11-toolkits/fox/Makefile b/x11-toolkits/fox/Makefile
index 32652635e247..f88032bcc70f 100644
--- a/x11-toolkits/fox/Makefile
+++ b/x11-toolkits/fox/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: fox
-# Version required: 0.1
# Date created: 23 Feb 2000
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= fox
-PKGNAME= fox-0.99.112
+PORTNAME= fox
+PORTVERSION= 0.99.112
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \
ftp://imssun1.epfl.ch/pub/ \
ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
+DISTNAME= ${PORTNAME}
MAINTAINER= will@FreeBSD.org
diff --git a/x11-toolkits/fox10/Makefile b/x11-toolkits/fox10/Makefile
index 32652635e247..f88032bcc70f 100644
--- a/x11-toolkits/fox10/Makefile
+++ b/x11-toolkits/fox10/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: fox
-# Version required: 0.1
# Date created: 23 Feb 2000
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= fox
-PKGNAME= fox-0.99.112
+PORTNAME= fox
+PORTVERSION= 0.99.112
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \
ftp://imssun1.epfl.ch/pub/ \
ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
+DISTNAME= ${PORTNAME}
MAINTAINER= will@FreeBSD.org
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index 32652635e247..f88032bcc70f 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: fox
-# Version required: 0.1
# Date created: 23 Feb 2000
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= fox
-PKGNAME= fox-0.99.112
+PORTNAME= fox
+PORTVERSION= 0.99.112
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \
ftp://imssun1.epfl.ch/pub/ \
ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
+DISTNAME= ${PORTNAME}
MAINTAINER= will@FreeBSD.org
diff --git a/x11-toolkits/gob/Makefile b/x11-toolkits/gob/Makefile
index 2116a5cbccb2..33d66a6c339a 100644
--- a/x11-toolkits/gob/Makefile
+++ b/x11-toolkits/gob/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: GTK+ Object Builder
-# Version required: 0.93.0
# Date created: 25 January 2000
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gob-0.93.0
+PORTNAME= gob
+PORTVERSION= 0.93.0
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.5z.com/pub/gob/
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index 2d472ff36c94..8cfdc97c2302 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gtk--
-# Version required: 1.0.3
# Date created: 11 May 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= Gtk---1.0.3
-PKGNAME= gtk---1.0.3
+PORTNAME= gtk--
+PORTVERSION= 1.0.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/Gtk--
+DISTNAME= Gtk---${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index 2d472ff36c94..8cfdc97c2302 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gtk--
-# Version required: 1.0.3
# Date created: 11 May 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= Gtk---1.0.3
-PKGNAME= gtk---1.0.3
+PORTNAME= gtk--
+PORTVERSION= 1.0.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/Gtk--
+DISTNAME= Gtk---${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/x11-toolkits/gtk-engines/Makefile b/x11-toolkits/gtk-engines/Makefile
index f774ca6b8c2b..4929b10b53db 100644
--- a/x11-toolkits/gtk-engines/Makefile
+++ b/x11-toolkits/gtk-engines/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtk-engines
-# Version required: 0.10
# Date Created: 23 Dec 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gtk-engines-0.10
+PORTNAME= gtk-engines
+PORTVERSION= 0.10
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gtk-engines
diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile
index f774ca6b8c2b..4929b10b53db 100644
--- a/x11-toolkits/gtk-engines2/Makefile
+++ b/x11-toolkits/gtk-engines2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtk-engines
-# Version required: 0.10
# Date Created: 23 Dec 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gtk-engines-0.10
+PORTNAME= gtk-engines
+PORTVERSION= 0.10
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gtk-engines
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index eb111f28da43..1dc28d5448c4 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: gtk12
-# Version required: 1.2.7
# Date Created: 28 Sep 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
#
-DISTNAME= gtk+-1.2.7
-PKGNAME= gtk-1.2.7
+PORTNAME= gtk
+PORTVERSION= 1.2.7
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
http://www.ameth.org/gimp/gtk/v1.2/
+DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index eb111f28da43..1dc28d5448c4 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: gtk12
-# Version required: 1.2.7
# Date Created: 28 Sep 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
#
-DISTNAME= gtk+-1.2.7
-PKGNAME= gtk-1.2.7
+PORTNAME= gtk
+PORTVERSION= 1.2.7
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
http://www.ameth.org/gimp/gtk/v1.2/
+DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index eb111f28da43..1dc28d5448c4 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: gtk12
-# Version required: 1.2.7
# Date Created: 28 Sep 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
#
-DISTNAME= gtk+-1.2.7
-PKGNAME= gtk-1.2.7
+PORTNAME= gtk
+PORTVERSION= 1.2.7
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
http://www.ameth.org/gimp/gtk/v1.2/
+DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index eb111f28da43..1dc28d5448c4 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: gtk12
-# Version required: 1.2.7
# Date Created: 28 Sep 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
#
-DISTNAME= gtk+-1.2.7
-PKGNAME= gtk-1.2.7
+PORTNAME= gtk
+PORTVERSION= 1.2.7
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
http://www.ameth.org/gimp/gtk/v1.2/
+DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index 328bbc67b200..8d50af2d108c 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtkglarea
-# Version required: 1.2.1
# Date created: 1 August 1999
# Whom: Michael Sardo <jaeger16@yahoo.com>
#
# $FreeBSD$
#
-DISTNAME= gtkglarea-1.2.1
+PORTNAME= gtkglarea
+PORTVERSION= 1.2.1
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.student.oulu.fi/~jlof/gtkglarea/download/
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index 328bbc67b200..8d50af2d108c 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtkglarea
-# Version required: 1.2.1
# Date created: 1 August 1999
# Whom: Michael Sardo <jaeger16@yahoo.com>
#
# $FreeBSD$
#
-DISTNAME= gtkglarea-1.2.1
+PORTNAME= gtkglarea
+PORTVERSION= 1.2.1
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.student.oulu.fi/~jlof/gtkglarea/download/
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 2d472ff36c94..8cfdc97c2302 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gtk--
-# Version required: 1.0.3
# Date created: 11 May 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= Gtk---1.0.3
-PKGNAME= gtk---1.0.3
+PORTNAME= gtk--
+PORTVERSION= 1.0.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/Gtk--
+DISTNAME= Gtk---${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 2d472ff36c94..8cfdc97c2302 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gtk--
-# Version required: 1.0.3
# Date created: 11 May 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= Gtk---1.0.3
-PKGNAME= gtk---1.0.3
+PORTNAME= gtk--
+PORTVERSION= 1.0.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/Gtk--
+DISTNAME= Gtk---${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 2d472ff36c94..8cfdc97c2302 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gtk--
-# Version required: 1.0.3
# Date created: 11 May 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= Gtk---1.0.3
-PKGNAME= gtk---1.0.3
+PORTNAME= gtk--
+PORTVERSION= 1.0.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/Gtk--
+DISTNAME= Gtk---${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 2d472ff36c94..8cfdc97c2302 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gtk--
-# Version required: 1.0.3
# Date created: 11 May 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= Gtk---1.0.3
-PKGNAME= gtk---1.0.3
+PORTNAME= gtk--
+PORTVERSION= 1.0.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/Gtk--
+DISTNAME= Gtk---${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/x11-toolkits/gtkstep/Makefile b/x11-toolkits/gtkstep/Makefile
index 2363ba31e558..8a8c69f5a4aa 100644
--- a/x11-toolkits/gtkstep/Makefile
+++ b/x11-toolkits/gtkstep/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtkstep
-# Version required: 2.0
# Date Created: 7 nov 98
# Whom: Gilad Rom
#
# $FreeBSD$
#
-DISTNAME= gtkstep-2.0
+PORTNAME= gtkstep
+PORTVERSION= 2.0
CATEGORIES= x11-toolkits
MASTER_SITES= http://ulli.linuxave.net/gtkstep/
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index 954eb5817666..a7d60d037c2e 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: guile-gtk
-# Version required: 0.17
# Date created: 1 January 2000
# Whom: Matt Braithwaite <mab@red-bean.com>
#
# $FreeBSD$
#
-DISTNAME= guile-gtk-0.17
+PORTNAME= guile-gtk
+PORTVERSION= 0.17
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.ping.de/sites/zagadka/guile-gtk/download/
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index f33fecb428e9..a84db1dcb072 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: itk
-# Version required: 3.0.1
# Date created: Aug 17 1996
# Whom: chuckr
#
# $FreeBSD$
#
-DISTNAME= itcl3.0.1
-PKGNAME= itk-3.0.1
+PORTNAME= itk
+PORTVERSION= 3.0.1
CATEGORIES= x11-toolkits tk82
MASTER_SITES= ftp://ftp.tcltk.com/pub/itcl/
+DISTNAME= itcl${PORTVERSION}
MAINTAINER= dmlb@ragnet.demon.co.uk
diff --git a/x11-toolkits/iv/Makefile b/x11-toolkits/iv/Makefile
index bf6764ae853e..1731cc32dcd7 100644
--- a/x11-toolkits/iv/Makefile
+++ b/x11-toolkits/iv/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: iv
-# Version required: 3.2a
# Date created: 23.sept.1994
# Whom: adam
#
# $FreeBSD$
#
-DISTNAME= 3.2a
-PKGNAME= iv-3.2a
+PORTNAME= iv
+PORTVERSION= 3.2a
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://sgi.com/graphics/interviews/
+DISTNAME= ${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= tanimura@FreeBSD.org
diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index 92a3d74516c7..f9f2f6c484d4 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: itk
-# Version required: 3.0.1
# Date created: Aug 17 1996
# Whom: chuckr
#
# $FreeBSD$
#
-DISTNAME= itcl3.0.1
-PKGNAME= iwidgets-3.0.0
+PORTNAME= iwidgets
+PORTVERSION= 3.0.0
CATEGORIES= x11-toolkits tk82
MASTER_SITES= ftp://ftp.tcltk.com/pub/itcl/
+DISTNAME= itcl3.0.1
MAINTAINER= dmlb@ragnet.demon.co.uk
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 3be1fb3a8f76..d51ddc7693de 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: lesstif
-# Version required: 0.89.9
# Date created: December 10, 1996
# Whom: 1wardd@airmail.net
#
# $FreeBSD$
#
-DISTNAME= lesstif-0.89.9
+PORTNAME= lesstif
+PORTVERSION= 0.89.9
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/ \
ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index c462fb54e81c..05e32eea8570 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: neXtaw
-# Version required: 0.8
# Date created: 16 January 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= neXtaw-0.8
+PORTNAME= neXtaw
+PORTVERSION= 0.8
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.inf.ufrgs.br/~casantos/neXtaw/
diff --git a/x11-toolkits/open-motif-devel/Makefile b/x11-toolkits/open-motif-devel/Makefile
index 22d34df9b350..93dfeb8b2df1 100644
--- a/x11-toolkits/open-motif-devel/Makefile
+++ b/x11-toolkits/open-motif-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: motif
-# Version required: 2.1.10
# Date created: 5 December 1994
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= Motif-2.1.10
+PORTNAME= Motif
+PORTVERSION= 2.1.10
CATEGORIES= x11-toolkits
DISTFILES= # empty
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index 22d34df9b350..93dfeb8b2df1 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: motif
-# Version required: 2.1.10
# Date created: 5 December 1994
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= Motif-2.1.10
+PORTNAME= Motif
+PORTVERSION= 2.1.10
CATEGORIES= x11-toolkits
DISTFILES= # empty
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index 7b891c1edda5..144c41af4773 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: p5-Gtk
-# Version required: 0.7000
# Date created: 28 Oct 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
#
-DISTNAME= Gtk-Perl-0.7000
-PKGNAME= p5-Gtk-0.7000
+PORTNAME= p5-Gtk
+PORTVERSION= 0.7000
CATEGORIES= x11-toolkits lang perl5
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/perl/ \
${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Gtk
+DISTNAME= Gtk-Perl-0.7000
MAINTAINER= vanilla@FreeBSD.org
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index ce0bd6176e8f..e8c1d24ca93b 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: p5-Tcl-Tk
-# Version required: b1
# Date created: June 15th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
+#
-DISTNAME= TclTk-b2
-PKGNAME= p5-Tcl-Tk-b2
+PORTNAME= p5-Tcl-Tk
+PORTVERSION= b2
CATEGORIES= x11-toolkits lang perl5 tk82
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tcl
+DISTNAME= TclTk-b2
MAINTAINER= jfitz@FreeBSD.org
diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index ce0bd6176e8f..e8c1d24ca93b 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: p5-Tcl-Tk
-# Version required: b1
# Date created: June 15th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
+#
-DISTNAME= TclTk-b2
-PKGNAME= p5-Tcl-Tk-b2
+PORTNAME= p5-Tcl-Tk
+PORTVERSION= b2
CATEGORIES= x11-toolkits lang perl5 tk82
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tcl
+DISTNAME= TclTk-b2
MAINTAINER= jfitz@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index cdf2b6a0ec8c..00e894051b42 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Tk
-# Version required: 402.002
# Date created: October 21st 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Tk800.008
-PKGNAME= p5-Tk-800.008
+PORTNAME= p5-Tk
+PORTVERSION= 800.008
CATEGORIES= x11-toolkits tk80 perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tk
+DISTNAME= Tk${PORTVERSION}
MAINTAINER= jfitz@FreeBSD.org
diff --git a/x11-toolkits/pike-gtk/Makefile b/x11-toolkits/pike-gtk/Makefile
index 958d2d78367a..5c9f8ff9d8da 100644
--- a/x11-toolkits/pike-gtk/Makefile
+++ b/x11-toolkits/pike-gtk/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: pike-gtk
-# Version required: 1.1.3
# Date created: June 29, 1999
# Whom: Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= pigtk_1.1.3
-PKGNAME= pike-gtk-1.1.3
+PORTNAME= pike-gtk
+PORTVERSION= 1.1.3
CATEGORIES= x11-toolkits lang
MASTER_SITES= http://pike-community.org/sites/pigtk/download/
+DISTNAME= pigtk_${PORTVERSION}
MAINTAINER= ijliao@csie.nctu.edu.tw
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index 42fb8f03eeb4..ea90a344dd74 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: plib
-# Version required: 1.0.12a
# Date created: 26 June 1999
# Whom: Brian Buchanan <brian@CSUA.Berkeley.EDU>
#
# $FreeBSD$
#
-DISTNAME= plib-1.0.12a
+PORTNAME= plib
+PORTVERSION= 1.0.12a
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Source/ \
http://math.missouri.edu/~stephen/software/flightgear/
diff --git a/x11-toolkits/pmw/Makefile b/x11-toolkits/pmw/Makefile
index 2c3bc10277ec..34c846ff60b6 100644
--- a/x11-toolkits/pmw/Makefile
+++ b/x11-toolkits/pmw/Makefile
@@ -1,14 +1,16 @@
# New ports collection makefile for: pmw
-# Version required: 0.8.3
# Date created: 03 June 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
+#
+PORTNAME= py-pmw
+PORTVERSION= 0.8.3
DISTNAME= Pmw.0.8.3
-PKGNAME= py-pmw-0.8.3
CATEGORIES= x11-toolkits python
MASTER_SITES= ftp://ftp.dscpl.com.au/pub/pmw/
+DISTNAME= Pmw.${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index 2c3bc10277ec..34c846ff60b6 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -1,14 +1,16 @@
# New ports collection makefile for: pmw
-# Version required: 0.8.3
# Date created: 03 June 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
+#
+PORTNAME= py-pmw
+PORTVERSION= 0.8.3
DISTNAME= Pmw.0.8.3
-PKGNAME= py-pmw-0.8.3
CATEGORIES= x11-toolkits python
MASTER_SITES= ftp://ftp.dscpl.com.au/pub/pmw/
+DISTNAME= Pmw.${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 5f5c37fa7f18..0738a4524bbd 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: py-gnome
-# Version required: 1.0.1
# Date created: 3/14/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gnome-python-1.0.50
-PKGNAME= py-gnome-1.0.50
+PORTNAME= py-gnome
+PORTVERSION= 1.0.50
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ftp://ftp.daa.com.au/pub/james/python/ \
ftp://ftp.gimp.org/pub/gtk/python/ \
ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/python/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/python/ \
ftp://stef.u-picardie.fr/mirror/ftp.gimp.org/gtk/python/
+DISTNAME= gnome-python-${PORTVERSION}
MAINTAINER= nectar@FreeBSD.org
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 5f5c37fa7f18..0738a4524bbd 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: py-gnome
-# Version required: 1.0.1
# Date created: 3/14/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gnome-python-1.0.50
-PKGNAME= py-gnome-1.0.50
+PORTNAME= py-gnome
+PORTVERSION= 1.0.50
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ftp://ftp.daa.com.au/pub/james/python/ \
ftp://ftp.gimp.org/pub/gtk/python/ \
ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/python/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/python/ \
ftp://stef.u-picardie.fr/mirror/ftp.gimp.org/gtk/python/
+DISTNAME= gnome-python-${PORTVERSION}
MAINTAINER= nectar@FreeBSD.org
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index cb566609e22d..a718410924d9 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: py-gtk
-# Version required: 0.6.2
# Date created: 09/14/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gnome-python-1.0.50
-PKGNAME= py-gtk-0.6.3
+PORTNAME= py-gtk
+PORTVERSION= 0.6.3
CATEGORIES= x11-toolkits python
MASTER_SITES= ftp://ftp.daa.com.au/pub/james/python/ \
ftp://ftp.gimp.org/pub/gtk/python/ \
ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/python/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/python/ \
ftp://stef.u-picardie.fr/mirror/ftp.gimp.org/gtk/python/
+DISTNAME= gnome-python-1.0.50
MAINTAINER= nectar@FreeBSD.org
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index cb566609e22d..a718410924d9 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: py-gtk
-# Version required: 0.6.2
# Date created: 09/14/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gnome-python-1.0.50
-PKGNAME= py-gtk-0.6.3
+PORTNAME= py-gtk
+PORTVERSION= 0.6.3
CATEGORIES= x11-toolkits python
MASTER_SITES= ftp://ftp.daa.com.au/pub/james/python/ \
ftp://ftp.gimp.org/pub/gtk/python/ \
ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/python/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/python/ \
ftp://stef.u-picardie.fr/mirror/ftp.gimp.org/gtk/python/
+DISTNAME= gnome-python-1.0.50
MAINTAINER= nectar@FreeBSD.org
diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile
index 8d38458dc6a2..f3458be5151a 100644
--- a/x11-toolkits/py-tkinter/Makefile
+++ b/x11-toolkits/py-tkinter/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: py-Tkinter
-# Version required: 1.5.2
# Date created: 12 Jan 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= py152
-PKGNAME= py-tkinter-1.5.2
+PORTNAME= py-tkinter
+PORTVERSION= 1.5.2
CATEGORIES= x11-toolkits python
MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME= py152
EXTRACT_SUFX= .tgz
MAINTAINER= tg@FreeBSD.org
diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index 36ad7517a5d9..5c0fd1784ffc 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: wxPython
-# Version required: 2.1.11
# Date created: September 18, 1999
# Whom: nectar@FreeBSD.ORG
#
# $FreeBSD$
#
-DISTNAME= wxPython-2.1.11
-PKGNAME= py-wxPython-2.1.11
+PORTNAME= py-wxPython
+PORTVERSION= 2.1.11
CATEGORIES= x11-toolkits python
MASTER_SITES= http://alldunn.com/wxPython/dist/ \
http://www.nectar.com/distfiles/
+DISTNAME= wxPython-${PORTVERSION}
MAINTAINER= nectar@FreeBSD.ORG
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index 36ad7517a5d9..5c0fd1784ffc 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: wxPython
-# Version required: 2.1.11
# Date created: September 18, 1999
# Whom: nectar@FreeBSD.ORG
#
# $FreeBSD$
#
-DISTNAME= wxPython-2.1.11
-PKGNAME= py-wxPython-2.1.11
+PORTNAME= py-wxPython
+PORTVERSION= 2.1.11
CATEGORIES= x11-toolkits python
MASTER_SITES= http://alldunn.com/wxPython/dist/ \
http://www.nectar.com/distfiles/
+DISTNAME= wxPython-${PORTVERSION}
MAINTAINER= nectar@FreeBSD.ORG
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index 36ad7517a5d9..5c0fd1784ffc 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: wxPython
-# Version required: 2.1.11
# Date created: September 18, 1999
# Whom: nectar@FreeBSD.ORG
#
# $FreeBSD$
#
-DISTNAME= wxPython-2.1.11
-PKGNAME= py-wxPython-2.1.11
+PORTNAME= py-wxPython
+PORTVERSION= 2.1.11
CATEGORIES= x11-toolkits python
MASTER_SITES= http://alldunn.com/wxPython/dist/ \
http://www.nectar.com/distfiles/
+DISTNAME= wxPython-${PORTVERSION}
MAINTAINER= nectar@FreeBSD.ORG
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 36ad7517a5d9..5c0fd1784ffc 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: wxPython
-# Version required: 2.1.11
# Date created: September 18, 1999
# Whom: nectar@FreeBSD.ORG
#
# $FreeBSD$
#
-DISTNAME= wxPython-2.1.11
-PKGNAME= py-wxPython-2.1.11
+PORTNAME= py-wxPython
+PORTVERSION= 2.1.11
CATEGORIES= x11-toolkits python
MASTER_SITES= http://alldunn.com/wxPython/dist/ \
http://www.nectar.com/distfiles/
+DISTNAME= wxPython-${PORTVERSION}
MAINTAINER= nectar@FreeBSD.ORG
diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index 190523e4a470..3607fdddddc9 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: qt
-# Version required: 1.45
# Date created: 30 Jul 1996
# Whom: searle@longacre.demon.co.uk
#
# $FreeBSD$
#
-DISTNAME= qt-1.45
+PORTNAME= qt
+PORTVERSION= 1.45
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.troll.no/qt/source/
diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index 0657a338f1e7..daf839b9d882 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: qt21
-# Version required: 2.1.0 beta2
# Date created: 17 Jul 1999
# Whom: imura@kml.cs.titech.ac.jp
#
# $FreeBSD$
#
-DISTNAME= qt-x11-2.1.0-beta3
-PKGNAME= qt-2.1.0b3
+PORTNAME= qt
+PORTVERSION= 2.1.0b3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.troll.no/qt/source/
+DISTNAME= qt-x11-2.1.0-beta3
MAINTAINER= imura@FreeBSD.org
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 0657a338f1e7..daf839b9d882 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: qt21
-# Version required: 2.1.0 beta2
# Date created: 17 Jul 1999
# Whom: imura@kml.cs.titech.ac.jp
#
# $FreeBSD$
#
-DISTNAME= qt-x11-2.1.0-beta3
-PKGNAME= qt-2.1.0b3
+PORTNAME= qt
+PORTVERSION= 2.1.0b3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.troll.no/qt/source/
+DISTNAME= qt-x11-2.1.0-beta3
MAINTAINER= imura@FreeBSD.org
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 0657a338f1e7..daf839b9d882 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: qt21
-# Version required: 2.1.0 beta2
# Date created: 17 Jul 1999
# Whom: imura@kml.cs.titech.ac.jp
#
# $FreeBSD$
#
-DISTNAME= qt-x11-2.1.0-beta3
-PKGNAME= qt-2.1.0b3
+PORTNAME= qt
+PORTVERSION= 2.1.0b3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.troll.no/qt/source/
+DISTNAME= qt-x11-2.1.0-beta3
MAINTAINER= imura@FreeBSD.org
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 0657a338f1e7..daf839b9d882 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: qt21
-# Version required: 2.1.0 beta2
# Date created: 17 Jul 1999
# Whom: imura@kml.cs.titech.ac.jp
#
# $FreeBSD$
#
-DISTNAME= qt-x11-2.1.0-beta3
-PKGNAME= qt-2.1.0b3
+PORTNAME= qt
+PORTVERSION= 2.1.0b3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.troll.no/qt/source/
+DISTNAME= qt-x11-2.1.0-beta3
MAINTAINER= imura@FreeBSD.org
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 0657a338f1e7..daf839b9d882 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: qt21
-# Version required: 2.1.0 beta2
# Date created: 17 Jul 1999
# Whom: imura@kml.cs.titech.ac.jp
#
# $FreeBSD$
#
-DISTNAME= qt-x11-2.1.0-beta3
-PKGNAME= qt-2.1.0b3
+PORTNAME= qt
+PORTVERSION= 2.1.0b3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.troll.no/qt/source/
+DISTNAME= qt-x11-2.1.0-beta3
MAINTAINER= imura@FreeBSD.org
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 0657a338f1e7..daf839b9d882 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: qt21
-# Version required: 2.1.0 beta2
# Date created: 17 Jul 1999
# Whom: imura@kml.cs.titech.ac.jp
#
# $FreeBSD$
#
-DISTNAME= qt-x11-2.1.0-beta3
-PKGNAME= qt-2.1.0b3
+PORTNAME= qt
+PORTVERSION= 2.1.0b3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.troll.no/qt/source/
+DISTNAME= qt-x11-2.1.0-beta3
MAINTAINER= imura@FreeBSD.org
diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile
index fafaf2f8d529..c59b9c020232 100644
--- a/x11-toolkits/rep-gtk/Makefile
+++ b/x11-toolkits/rep-gtk/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rep-gtk
-# Version required: 0.9.1
# Date created: 06 October 1999
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= rep-gtk-0.9.1
+PORTNAME= rep-gtk
+PORTVERSION= 0.9.1
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://rep-gtk.sourceforge.net/pub/rep-gtk/
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index fafaf2f8d529..c59b9c020232 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rep-gtk
-# Version required: 0.9.1
# Date created: 06 October 1999
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= rep-gtk-0.9.1
+PORTNAME= rep-gtk
+PORTVERSION= 0.9.1
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://rep-gtk.sourceforge.net/pub/rep-gtk/
diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile
index 6c19cf215bb9..f1e020e1aa43 100644
--- a/x11-toolkits/ruby-gtk/Makefile
+++ b/x11-toolkits/ruby-gtk/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ruby-gtk
-# Version required: 0.23
# Date created: 19 April 1999
# Whom: Yasuhiro Fukuma <yasuf@big.or.jp>
#
# $FreeBSD$
#
-DISTNAME= ruby-gtk-0.23
+PORTNAME= ruby-gtk
+PORTVERSION= 0.23
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.ueda.info.waseda.ac.jp/~igarashi/ruby/ \
ftp://ftp.netlab.co.jp/pub/lang/ruby/contrib/ \
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 6c19cf215bb9..f1e020e1aa43 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ruby-gtk
-# Version required: 0.23
# Date created: 19 April 1999
# Whom: Yasuhiro Fukuma <yasuf@big.or.jp>
#
# $FreeBSD$
#
-DISTNAME= ruby-gtk-0.23
+PORTNAME= ruby-gtk
+PORTVERSION= 0.23
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.ueda.info.waseda.ac.jp/~igarashi/ruby/ \
ftp://ftp.netlab.co.jp/pub/lang/ruby/contrib/ \
diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile
index 507078e1e92a..f43db79c8861 100644
--- a/x11-toolkits/ruby-tk/Makefile
+++ b/x11-toolkits/ruby-tk/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: rubytk
-# Version required: 1.4.3
# Date created: 15 March 1999
# Whom: Yasuhiro Fukuma <yasuf@big.or.jp>
#
# $FreeBSD$
#
-DISTNAME= ruby-${VERSION}
-PKGNAME?= rubytk-${VERSION}
+PORTNAME?= rubytk
+PORTVERSION?= 1.4.3
CATEGORIES?= x11-toolkits
MASTER_SITES= ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
@@ -15,6 +14,7 @@ MASTER_SITES= ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
ftp://blade.nagaokaut.ac.jp/pub/lang/ruby/${BRANCH_NAME}/ \
ftp://ftp.krnet.ne.jp/pub/ruby/${BRANCH_NAME}/ \
ftp://mirror.nucba.ac.jp/mirror/ruby/${BRANCH_NAME}/
+DISTNAME= ruby-${PORTVERSION}
MAINTAINER?= yasuf@big.or.jp
diff --git a/x11-toolkits/ruby14-tk/Makefile b/x11-toolkits/ruby14-tk/Makefile
index 507078e1e92a..f43db79c8861 100644
--- a/x11-toolkits/ruby14-tk/Makefile
+++ b/x11-toolkits/ruby14-tk/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: rubytk
-# Version required: 1.4.3
# Date created: 15 March 1999
# Whom: Yasuhiro Fukuma <yasuf@big.or.jp>
#
# $FreeBSD$
#
-DISTNAME= ruby-${VERSION}
-PKGNAME?= rubytk-${VERSION}
+PORTNAME?= rubytk
+PORTVERSION?= 1.4.3
CATEGORIES?= x11-toolkits
MASTER_SITES= ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
@@ -15,6 +14,7 @@ MASTER_SITES= ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
ftp://blade.nagaokaut.ac.jp/pub/lang/ruby/${BRANCH_NAME}/ \
ftp://ftp.krnet.ne.jp/pub/ruby/${BRANCH_NAME}/ \
ftp://mirror.nucba.ac.jp/mirror/ruby/${BRANCH_NAME}/
+DISTNAME= ruby-${PORTVERSION}
MAINTAINER?= yasuf@big.or.jp
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index 5e7baa7705c3..dec12e538d9c 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: SlingShot
-# Version required: 2.1
# Date created: 5 March 1997
# Whom: Pedro Giffuni
#
# $FreeBSD$
#
-DISTNAME= SlingShot2.1
-PKGNAME= slingshot-2.1
+PORTNAME= slingshot
+PORTVERSION= 2.1
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+DISTNAME= SlingShot${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 735d1e080bc2..c35268ad331a 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: tix
-# Version required: 4.1.0.007
# Date created: 22 December 1996
# Whom: Thomas Gellekum <tg@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= Tix4.1.0.007
-PKGNAME= tix-4.1.0.007
+PORTNAME= tix
+PORTVERSION= 4.1.0.007
CATEGORIES= x11-toolkits tk82
MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/%SUBDIR%/ \
ftp://ftp.riken.go.jp/pub/lang/tcl/netsoft/%SUBDIR%/
MASTER_SITE_SUBDIR= sorted/packages-8.0/x11/Tix/4.1.0.007
+DISTNAME= Tix${PORTVERSION}
MAINTAINER= jmz@FreeBSD.org
diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index 3c24491f0da3..88ea0cdfda69 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: tk8.0
-# Version required: tk8.0
# Date created: 19 August 1997
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= tk8.0.5
-PKGNAME= tk-8.0.5
+PORTNAME= tk
+PORTVERSION= 8.0.5
CATEGORIES= x11-toolkits tk80
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= cwt@Freebsd.ORG
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 3737698b9dfc..7344789d1824 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: tk
-# Version required: 8.2.3
# Date created: 19 August 1997
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= tk8.2.3
-PKGNAME= tk-8.2.3
+PORTNAME= tk
+PORTVERSION= 8.2.3
CATEGORIES= x11-toolkits tk82
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_2/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= jseger@FreeBSD.org
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 6ed6626fb576..01f4c55c5eba 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: tk
-# Version required: 8.3.b1
# Date created: 19 August 1997
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= tk8.3b1
-PKGNAME= tk-8.3.b1
+PORTNAME= tk
+PORTVERSION= 8.3.b1
CATEGORIES= x11-toolkits #tk83
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_3/
+DISTNAME= ${PORTNAME}8.3b1
MAINTAINER= jseger@FreeBSD.org
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 6ed6626fb576..01f4c55c5eba 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: tk
-# Version required: 8.3.b1
# Date created: 19 August 1997
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= tk8.3b1
-PKGNAME= tk-8.3.b1
+PORTNAME= tk
+PORTVERSION= 8.3.b1
CATEGORIES= x11-toolkits #tk83
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_3/
+DISTNAME= ${PORTNAME}8.3b1
MAINTAINER= jseger@FreeBSD.org
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile
index 96f8f1f425de..3148b73da8d2 100644
--- a/x11-toolkits/tkstep80/Makefile
+++ b/x11-toolkits/tkstep80/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: TkStep
-# Version required: 8.0p2
# Date created: 06 November 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= tk8.0.4
-PKGNAME= tkstep-8.0.4
+PORTNAME= tkstep
+PORTVERSION= 8.0.4
CATEGORIES= x11-toolkits tk80
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
+DISTNAME= tk${PORTVERSION}
PATCH_SITES= ftp://touchwood.ee.uts.edu.au/pub/TkSTEP/
PATCHFILES= tk8.0.4-to-tkstep8.0.4-2.patch.tar.gz
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index a013f6e14578..08e11af75371 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: v
-# Version required: 1.19
# Date created: 8 Feb 1998
# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= v-1.19
+PORTNAME= v
+PORTVERSION= 1.19
CATEGORIES= x11-toolkits devel graphics
MASTER_SITES= ftp://ftp.ntua.gr/pub/X11/v/old/ \
ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/programming/objectcentral/old/
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 72ad623c97ef..4ae308b0a5be 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: vdk
-# Version required: 1.0.6
# Date created: 30 January 2000
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= vdk-1.0.6
+PORTNAME= vdk
+PORTVERSION= 1.0.6
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.programmers.net/artic/Motta/vdk/
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index 8f828fae027c..02ce06f83d46 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: vdkbuilder
-# Version required: 1.0.6
# Date created: 29 January 2000
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= vdkbuilder-1.0.6
+PORTNAME= vdkbuilder
+PORTVERSION= 1.0.6
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.programmers.net/artic/Motta/vdk/
diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index 276e317604ba..f2b1fa88440d 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: wxGTK
-# Version required: 2.1.0b9
# Date created: September 18, 1999
# Whom: nectar@FreeBSD.ORG
#
# $FreeBSD$
#
-DISTNAME= wxGTK-2.1.11
-PKGNAME= wxgtk-2.1.11
+PORTNAME= wxgtk
+PORTVERSION= 2.1.11
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/ \
http://www.nectar.com/distfiles/
+DISTNAME= wxGTK-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= nectar@FreeBSD.ORG
diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile
index 276e317604ba..f2b1fa88440d 100644
--- a/x11-toolkits/wxgtk/Makefile
+++ b/x11-toolkits/wxgtk/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: wxGTK
-# Version required: 2.1.0b9
# Date created: September 18, 1999
# Whom: nectar@FreeBSD.ORG
#
# $FreeBSD$
#
-DISTNAME= wxGTK-2.1.11
-PKGNAME= wxgtk-2.1.11
+PORTNAME= wxgtk
+PORTVERSION= 2.1.11
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/ \
http://www.nectar.com/distfiles/
+DISTNAME= wxGTK-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= nectar@FreeBSD.ORG
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 276e317604ba..f2b1fa88440d 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: wxGTK
-# Version required: 2.1.0b9
# Date created: September 18, 1999
# Whom: nectar@FreeBSD.ORG
#
# $FreeBSD$
#
-DISTNAME= wxGTK-2.1.11
-PKGNAME= wxgtk-2.1.11
+PORTNAME= wxgtk
+PORTVERSION= 2.1.11
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/ \
http://www.nectar.com/distfiles/
+DISTNAME= wxGTK-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= nectar@FreeBSD.ORG
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index 19227ce1aa20..ada44155a0e7 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Xbae
-# Version required: 4.6.2
# Date created: 11 December 96
# Whom: Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
# With some
@@ -8,12 +7,13 @@
# $FreeBSD$
#
-DISTNAME= Xbae-4.7
-PKGNAME= xbae-4.7
+PORTNAME= xbae
+PORTVERSION= 4.7
CATEGORIES= x11-toolkits math
MASTER_SITES= ftp://sunsite.doc.ic.ac.uk/packages/X11/contrib/widgets/ \
${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= widgets/motif
+DISTNAME= Xbae-${PORTVERSION}
MAINTAINER= Lars.Koeller@Uni-Bielefeld.de
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index 4ee31e536f99..025b7e73cec8 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: xforms
-# Version required: 0.88.1
# Date created: 28 March 1997
# Whom: gena
#
@@ -24,7 +23,8 @@ MASTER_SITES= ftp://bragg.phys.uwm.edu/pub/xforms/freeBSD/ \
ftp://ftp.via.ecp.fr/pub2/xforms/freeBSD/ \
ftp://ftp.st.ryukoku.ac.jp/pub/X11/xforms/freeBSD/
.endif
-PKGNAME= xforms-0.88.1
+PORTNAME= xforms
+PORTVERSION= 0.88.1
CATEGORIES= graphics x11-toolkits
EXTRACT_SUFX= .tgz
diff --git a/x11-toolkits/xg/Makefile b/x11-toolkits/xg/Makefile
index b60bc48e9c52..1a098ae6e865 100644
--- a/x11-toolkits/xg/Makefile
+++ b/x11-toolkits/xg/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xg
-# Version required: 1.0
# Date created: 3 December 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= xg
-PKGNAME= xg-1.0
+PORTNAME= xg
+PORTVERSION= 1.0
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://messners.com/code/ \
http://www.messners.com/code/
+DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 2f361a1c5277..e48aa57be846 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmhtml
-# Version required: 1.69
# Date created: 18 Feb 1999
# Whom: Peter Hawkins <thepish@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= XmHTML-1.1.0
+PORTNAME= XmHTML
+PORTVERSION= 1.1.0
CATEGORIES= x11-toolkits www
MASTER_SITES= ftp://crl.nmsu.edu/pub/XmHTML/ \
ftp://ftp.ist.co.uk/pub/motif/XmHTML/ \
diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile
index 8ff028ef143b..82a8d2e6091a 100644
--- a/x11-toolkits/xview-clients/Makefile
+++ b/x11-toolkits/xview-clients/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xview-clients
-# Version required: 3.2p1-X11R6
# Date created: 22 November 1994
# Whom: ljo (orig)
#
# $FreeBSD$
#
-DISTNAME= xview3.2p1-X11R6
-PKGNAME= xview-clients-3.2.1
+PORTNAME= xview-clients
+PORTVERSION= 3.2.1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_LOCAL} \
${MASTER_SITE_XCONTRIB}
+DISTNAME= xview3.2p1-X11R6
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index 37a599140797..e428c19eb00f 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: XView
-# Version required: 3.2p1-X11R6
# Date created: 22 November 1994
# Whom: ljo (orig)
#
# $FreeBSD$
#
-DISTNAME= xview3.2p1-X11R6
-PKGNAME= xview-3.2.1
+PORTNAME= xview
+PORTVERSION= 3.2.1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_LOCAL} \
${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= libraries
+DISTNAME= xview3.2p1-X11R6
MAINTAINER= ports@FreeBSD.org