aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--x11-wm/9menu/Makefile4
-rw-r--r--x11-wm/9wm/Makefile4
-rw-r--r--x11-wm/afterstep-i18n/Makefile6
-rw-r--r--x11-wm/afterstep-stable/Makefile6
-rw-r--r--x11-wm/afterstep/Makefile6
-rw-r--r--x11-wm/amaterus/Makefile4
-rw-r--r--x11-wm/amiwm/Makefile6
-rw-r--r--x11-wm/blackbox/Makefile4
-rw-r--r--x11-wm/ctwm/Makefile8
-rw-r--r--x11-wm/e16/Makefile4
-rw-r--r--x11-wm/enlightenment-devel/Makefile4
-rw-r--r--x11-wm/enlightenment/Makefile4
-rw-r--r--x11-wm/epplets/Makefile6
-rw-r--r--x11-wm/flwm/Makefile4
-rw-r--r--x11-wm/fvwm/Makefile4
-rw-r--r--x11-wm/fvwm2-beta/Makefile4
-rw-r--r--x11-wm/fvwm2-devel/Makefile4
-rw-r--r--x11-wm/fvwm2-i18n/Makefile16
-rw-r--r--x11-wm/fvwm2/Makefile4
-rw-r--r--x11-wm/fvwm24/Makefile4
-rw-r--r--x11-wm/fvwm95-i18n/Makefile6
-rw-r--r--x11-wm/fvwm95/Makefile6
-rw-r--r--x11-wm/gnome2wmaker/Makefile4
-rw-r--r--x11-wm/gwm/Makefile4
-rw-r--r--x11-wm/hackedbox/Makefile4
-rw-r--r--x11-wm/icewm/Makefile4
-rw-r--r--x11-wm/libdockapp/Makefile6
-rw-r--r--x11-wm/lwm/Makefile6
-rw-r--r--x11-wm/mlvwm/Makefile6
-rw-r--r--x11-wm/olvwm/Makefile6
-rw-r--r--x11-wm/openbox/Makefile4
-rw-r--r--x11-wm/piewm/Makefile4
-rw-r--r--x11-wm/qvwm/Makefile4
-rw-r--r--x11-wm/sapphire/Makefile6
-rw-r--r--x11-wm/sawfish/Makefile4
-rw-r--r--x11-wm/sawfish2/Makefile4
-rw-r--r--x11-wm/scwm/Makefile4
-rw-r--r--x11-wm/toolbox/Makefile4
-rw-r--r--x11-wm/tvtwm/Makefile6
-rw-r--r--x11-wm/ude/Makefile6
-rw-r--r--x11-wm/vtwm/Makefile6
-rw-r--r--x11-wm/windowmaker-i18n/Makefile6
-rw-r--r--x11-wm/windowmaker/Makefile7
-rw-r--r--x11-wm/wm2/Makefile6
-rw-r--r--x11-wm/wmakerconf/Makefile4
-rw-r--r--x11-wm/wmanager/Makefile4
-rw-r--r--x11-wm/wmg/Makefile6
-rw-r--r--x11-wm/wmthemeinstall/Makefile4
-rw-r--r--x11-wm/wmx/Makefile6
-rw-r--r--x11-wm/xfce/Makefile4
-rw-r--r--x11-wm/xfce4/Makefile4
-rw-r--r--x11-wm/xwmm/Makefile4
-rw-r--r--x11/9menu/Makefile4
53 files changed, 134 insertions, 135 deletions
diff --git a/x11-wm/9menu/Makefile b/x11-wm/9menu/Makefile
index a3a81d40c435..fcb8eae637e7 100644
--- a/x11-wm/9menu/Makefile
+++ b/x11-wm/9menu/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: 9menu
-# Version required: 1.5
# Date created: Sun Aug 13 12:36:14 CDT 1995
# Whom: erich@rrnet.com
#
# $FreeBSD$
#
-DISTNAME= 9menu-1.5
+PORTNAME= 9menu
+PORTVERSION= 1.5
CATEGORIES= x11-wm plan9
MASTER_SITES= ftp://ftp.mathcs.emory.edu/pub/arnold/
EXTRACT_SUFX= .shar.gz
diff --git a/x11-wm/9wm/Makefile b/x11-wm/9wm/Makefile
index a1aa2a8ee355..c51058816d5a 100644
--- a/x11-wm/9wm/Makefile
+++ b/x11-wm/9wm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: 9wm
-# Version required: 1.1
# Date created: Sun Aug 13 12:36:14 CDT 1995
# Whom: erich@rrnet.com
#
# $FreeBSD$
#
-DISTNAME= 9wm-1.1
+PORTNAME= 9wm
+PORTVERSION= 1.1
CATEGORIES= x11-wm plan9
MASTER_SITES= ftp://ftp.mathcs.emory.edu/pub/arnold/
EXTRACT_SUFX= .shar.gz
diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index 969e31ab22cf..3f4451c16e06 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: afterstep-i18n
-# Version required: 1.0
# Date created: 23 October 1998
# Whom: issei@jp.FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= AfterStep-1.0
-PKGNAME= afterstep-i18n-1.0
+PORTNAME= afterstep-i18n
+PORTVERSION= 1.0
CATEGORIES= x11-wm afterstep
MASTER_SITES= ${MASTER_SITE_AFTERSTEP} \
http://people.FreeBSD.org/~kuriyama/distfiles/ \
http://www.itlb.te.noda.sut.ac.jp/~manome/afterstep/archive/ \
http://www.itlb.te.noda.sut.ac.jp/~manome/afterstep/archive/icons/
MASTER_SITE_SUBDIR= stable/archives
+DISTNAME= AfterStep-1.0
DISTFILES= ${DISTNAME}.tar.gz \
unofficial-I18N.98Feb27.tar.gz \
kterm.xpm kterm2.xpm KTerm-AS.xpm netscape4.xpm
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 0e296b750818..2abb47892014 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: afterstep-stable
-# Version required: 1.8.0
# Date created: 1 May 1998
# Whom: Brett Taylor
#
# $FreeBSD$
#
-DISTNAME= AfterStep-1.8.0
-PKGNAME= afterstep-1.8.0
+PORTNAME= afterstep
+PORTVERSION= 1.8.0
CATEGORIES= x11-wm afterstep
MASTER_SITES= ${MASTER_SITE_AFTERSTEP}
MASTER_SITE_SUBDIR= stable
+DISTNAME= AfterStep-${PORTVERSION}
MAINTAINER= dima@Chg.ru
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index 86d51313dcc3..fbf2cbf3ec3f 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: afterstep
-# Version required: 1.0
# Date created: October 29th 1996
# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= AfterStep-1.0
-PKGNAME= afterstep-1.0
+PORTNAME= afterstep
+PORTVERSION= 1.0
CATEGORIES= x11-wm afterstep
MASTER_SITES= ${MASTER_SITE_AFTERSTEP} \
ftp://ftp.cs.tu-berlin.de/pub/X/afterstep/
MASTER_SITE_SUBDIR= stable/archives
+DISTNAME= AfterStep-${PORTVERSION}
MAINTAINER= jfitz@FreeBSD.org
diff --git a/x11-wm/amaterus/Makefile b/x11-wm/amaterus/Makefile
index 775fcd0abd61..96a75b0a7031 100644
--- a/x11-wm/amaterus/Makefile
+++ b/x11-wm/amaterus/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: amaterus
-# Version required: 0.31
# Date created: 26 January 2000
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= amaterus-0.31
+PORTNAME= amaterus
+PORTVERSION= 0.31
CATEGORIES= x11-wm
MASTER_SITES= http://www.taiyaki.org/src/
diff --git a/x11-wm/amiwm/Makefile b/x11-wm/amiwm/Makefile
index fdadfe02c264..b636933e9fc9 100644
--- a/x11-wm/amiwm/Makefile
+++ b/x11-wm/amiwm/Makefile
@@ -1,15 +1,15 @@
# New ports collection Makefile for: amiwm-0.20pl28
-# Version required: 0.20pl48
# Date created: 13 November 1997
# Whom: Douglas Carmichael <dcarmich@mcs.com>
#
# $FreeBSD$
#
-DISTNAME= amiwm0.20pl48
-PKGNAME= amiwm-0.20p48
+PORTNAME= amiwm
+PORTVERSION= 0.20.p48
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/
+DISTNAME= ${PORTNAME}0.20pl48
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index 6416a64158ee..1c5d2ff14812 100644
--- a/x11-wm/blackbox/Makefile
+++ b/x11-wm/blackbox/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Blackbox
-# Version required: 0.51.3.1
# Date created: June 15, 1998
# Whom: Brian Handy <handy@physics.montana.edu>
#
# $FreeBSD$
#
-DISTNAME= blackbox-0.51.3.1
+PORTNAME= blackbox
+PORTVERSION= 0.51.3.1
CATEGORIES= x11-wm
MASTER_SITES= ftp://portal.alug.org/pub/blackbox/0.5x.x/ \
ftp://ftp.dti.ad.jp/pub/X/blackbox/0.5x.x/
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index b605ad12986a..5f064f7c0579 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ctwm
-# Version required: 3.4
# Date created: 13 November 1994
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= ctwm-3.5.2b
+PORTNAME= ctwm
+PORTVERSION= 3.5.2b
CATEGORIES= x11-wm
MASTER_SITES= ftp://slhp1.epfl.ch/pub/
-DISTFILES+= ctwm-3.5.2b.tar.gz ctwm-images.tar.gz
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ctwm-images${EXTRACT_SUFX}
MAINTAINER= torstenb@FreeBSD.org
@@ -17,7 +17,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
-MAKE_ENV+= LOCALBASE=${LOCALBASE}
+MAKE_ENV= LOCALBASE=${LOCALBASE}
USE_IMAKE= yes
MAN1= ctwm.1
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 7d84ee4ed2d1..7cf23d2e5ed8 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: enlightenment
-# Version required: 0.16.3
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= enlightenment-0.16.3
+PORTNAME= enlightenment
+PORTVERSION= 0.16.3
CATEGORIES= x11-wm gnome
MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
ftp://ftp.dti.ad.jp/pub/X/enlightenment/enlightenment/ \
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 7d84ee4ed2d1..7cf23d2e5ed8 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: enlightenment
-# Version required: 0.16.3
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= enlightenment-0.16.3
+PORTNAME= enlightenment
+PORTVERSION= 0.16.3
CATEGORIES= x11-wm gnome
MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
ftp://ftp.dti.ad.jp/pub/X/enlightenment/enlightenment/ \
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 7d84ee4ed2d1..7cf23d2e5ed8 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: enlightenment
-# Version required: 0.16.3
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= enlightenment-0.16.3
+PORTNAME= enlightenment
+PORTVERSION= 0.16.3
CATEGORIES= x11-wm gnome
MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
ftp://ftp.dti.ad.jp/pub/X/enlightenment/enlightenment/ \
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index 1a60815c7b9a..ba50b42d024e 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: epplets
-# Version required: 0.5
# Date created: 18 October 1999
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= epplet-base-0.5
-PKGNAME= epplets-0.5
+PORTNAME= epplets
+PORTVERSION= 0.5
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.enlightenment.org/e/epplets/
+DISTNAME= epplet-base-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile
index 6edc11ed2d8b..9f21843558af 100644
--- a/x11-wm/flwm/Makefile
+++ b/x11-wm/flwm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flwm
-# Version required: 0.25
# Date created: 12 February 1999
# Whom: Dima Sivachenko <dima@chg.ru>
#
# $FreeBSD$
#
-DISTNAME= flwm-0.25
+PORTNAME= flwm
+PORTVERSION= 0.25
CATEGORIES= x11-wm
MASTER_SITES= http://www.cinenet.net/users/spitzak/flwm/ \
ftp://ftp.sai.msu.su/pub/X11/win_man/
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index f3484a0deb32..4ce49ec7e8c8 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: fvwm
-# Version required: 1.24r
# Date created: 12 May 1995
# Whom: me
#
# $FreeBSD$
#
-DISTNAME= fvwm-1.24r
+PORTNAME= fvwm
+PORTVERSION= 1.24r
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.hpc.uh.edu/pub/fvwm/version-1/ \
ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/1.x/
diff --git a/x11-wm/fvwm2-beta/Makefile b/x11-wm/fvwm2-beta/Makefile
index ec6e824e2ad2..4e3923c9577f 100644
--- a/x11-wm/fvwm2-beta/Makefile
+++ b/x11-wm/fvwm2-beta/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Fvwm2
-# Version required: 2.2.4
# Date created: 20 Jan 1996
# Whom: peter
#
# $FreeBSD$
#
-DISTNAME= fvwm-2.2.4
+PORTNAME= fvwm
+PORTVERSION= 2.2.4
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index ec6e824e2ad2..4e3923c9577f 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Fvwm2
-# Version required: 2.2.4
# Date created: 20 Jan 1996
# Whom: peter
#
# $FreeBSD$
#
-DISTNAME= fvwm-2.2.4
+PORTNAME= fvwm
+PORTVERSION= 2.2.4
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/
diff --git a/x11-wm/fvwm2-i18n/Makefile b/x11-wm/fvwm2-i18n/Makefile
index 4ba9dacbbac6..1d8c7d02b6a3 100644
--- a/x11-wm/fvwm2-i18n/Makefile
+++ b/x11-wm/fvwm2-i18n/Makefile
@@ -1,18 +1,17 @@
# New ports collection makefile for: Internationalized fvwm2
-# Version required: 2.2
# Date created: 20 Jan 1996
# Whom: peter
#
# $FreeBSD$
#
-DISTNAME= fvwm-${FVWM_DISTVER}
-PKGNAME= fvwm-i18n-${FVWM_DISTVER}
+PORTNAME= fvwm-i18n
+PORTVERSION= 2.2
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/
PATCH_SITES= ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/I18N_MB/
-PATCHFILES= fvwm-${FVWM_DISTVER}-I18N_MB-${FVWM_PATCHVER}.patch
+PATCHFILES= fvwm-${PORTVERSION}-I18N_MB-${FVWM_PATCHVER}.patch
MAINTAINER= matusita@jp.freebsd.org
@@ -32,16 +31,15 @@ MAN1= fvwm2.1 xpmroot.1 FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 \
FvwmWharf.1 FvwmWinList.1
MANCOMPRESSED= no
-FVWM_DISTVER= 2.2
FVWM_PATCHVER= 1999042001
FVWM_DIR= lib/X11/fvwm2
RC_FILES= decor_examples new-features system.fvwm2rc \
system.fvwm2rc-sample-1 system.fvwm2rc-sample-2
-PLIST_SUB= FVWM_DISTVER=${FVWM_DISTVER} FVWM_DIR=${FVWM_DIR}
+PLIST_SUB= FVWM_DISTVER=${PORTVERSION} FVWM_DIR=${FVWM_DIR}
CONFIGURE_ARGS+= --enable-extras --enable-kanji
-CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/${FVWM_DIR}/${FVWM_DISTVER}
+CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/${FVWM_DIR}/${PORTVERSION}
CONFIGURE_ARGS+= --with-iconpath=${PREFIX}/${FVWM_DIR}/pixmaps:/usr/include/X11/bitmaps:/usr/include/X11/pixmaps
pre-configure:
@@ -50,10 +48,10 @@ pre-configure:
@find ${WRKSRC} -name Makefile.in -exec ${TOUCH} \{} \;
post-install:
- @${MKDIR} ${PREFIX}/${FVWM_DIR}/${FVWM_DISTVER}
+ @${MKDIR} ${PREFIX}/${FVWM_DIR}/${PORTVERSION}
@for i in ${RC_FILES}; do \
${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/$$i \
- ${PREFIX}/${FVWM_DIR}/${FVWM_DISTVER}/$$i; \
+ ${PREFIX}/${FVWM_DIR}/${PORTVERSION}/$$i; \
done
@${MKDIR} ${PREFIX}/${FVWM_DIR}/pixmaps
${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${WRKSRC}/icons/*.xbm \
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index ec6e824e2ad2..4e3923c9577f 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Fvwm2
-# Version required: 2.2.4
# Date created: 20 Jan 1996
# Whom: peter
#
# $FreeBSD$
#
-DISTNAME= fvwm-2.2.4
+PORTNAME= fvwm
+PORTVERSION= 2.2.4
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index ec6e824e2ad2..4e3923c9577f 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Fvwm2
-# Version required: 2.2.4
# Date created: 20 Jan 1996
# Whom: peter
#
# $FreeBSD$
#
-DISTNAME= fvwm-2.2.4
+PORTNAME= fvwm
+PORTVERSION= 2.2.4
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index e09d333306a5..f08d33ffbeba 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: fvwm95-2
-# Version required: 2.0.43a
# Date created: 23 Nov 1998
# Whom: Yoshishige Arai <ryo2@on.rim.or.jp>
#
# $FreeBSD$
#
-DISTNAME= fvwm95-2.0.43a-Autoconf
-PKGNAME= fvwm95-i18n-2.0.43a
+PORTNAME= fvwm95-i18n
+PORTVERSION= 2.0.43a
CATEGORIES= x11-wm
MASTER_SITES= ftp://mitac11.uia.ac.be/pub/fvwm95/ \
ftp://ftp.plig.org/pub/fvwm95/ \
@@ -15,6 +14,7 @@ MASTER_SITES= ftp://mitac11.uia.ac.be/pub/fvwm95/ \
ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/misc/fvwm95/ \
${MASTER_SITE_PORTS_JP} \
http://people.FreeBSD.org/~sada/distfiles/
+DISTNAME= fvwm95-2.0.43a-Autoconf
DISTFILES= ${EXTRACT_ONLY} fvwm95-2.0.43a-FreeBSD.apmpatch.tar.gz
PATCH_SITES= ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/misc/fvwm95/ \
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index cd32f2c1234c..45936b993f55 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: fvwm95-2
-# Version required: 2.0.43a
# Date created: Sa 1 Feb 1997 14:46:05 MET
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= fvwm95-2.0.43a-Autoconf
-PKGNAME= fvwm95-2.0.43a
+PORTNAME= fvwm95
+PORTVERSION= 2.0.43a
CATEGORIES= x11-wm
MASTER_SITES= ftp://mitac11.uia.ac.be/pub/fvwm95/
+DISTNAME= ${PKGNAME}-Autoconf
EXTRACT_SUFX= .tgz
MAINTAINER= dima@Chg.RU
diff --git a/x11-wm/gnome2wmaker/Makefile b/x11-wm/gnome2wmaker/Makefile
index eb32bbe63d67..c8cabcfd361a 100644
--- a/x11-wm/gnome2wmaker/Makefile
+++ b/x11-wm/gnome2wmaker/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnome2wmaker
-# Version required: 1.2
# Date Created: 18 September 1999
# Whom: Jeremy Lea <reg@shale.csir.co.za>
#
# $FreeBSD$
#
-DISTNAME= gnome2wmaker-1.2
+PORTNAME= gnome2wmaker
+PORTVERSION= 1.2
CATEGORIES= x11-toolkits
MASTER_SITES= http://ulli.linuxbox.com/gnome2wmaker/
diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile
index 3e0898f291c8..a26df4e190e8 100644
--- a/x11-wm/gwm/Makefile
+++ b/x11-wm/gwm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gwm
-# Version required: 1.8c
# Date created: 14 November 1996
# Whom: markm
#
# $FreeBSD$
#
-DISTNAME= gwm-1.8c
+PORTNAME= gwm
+PORTVERSION= 1.8c
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= window_managers/gwm
diff --git a/x11-wm/hackedbox/Makefile b/x11-wm/hackedbox/Makefile
index 6416a64158ee..1c5d2ff14812 100644
--- a/x11-wm/hackedbox/Makefile
+++ b/x11-wm/hackedbox/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Blackbox
-# Version required: 0.51.3.1
# Date created: June 15, 1998
# Whom: Brian Handy <handy@physics.montana.edu>
#
# $FreeBSD$
#
-DISTNAME= blackbox-0.51.3.1
+PORTNAME= blackbox
+PORTVERSION= 0.51.3.1
CATEGORIES= x11-wm
MASTER_SITES= ftp://portal.alug.org/pub/blackbox/0.5x.x/ \
ftp://ftp.dti.ad.jp/pub/X/blackbox/0.5x.x/
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index b7773766e559..e46ff190cbfe 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: icewm
-# Version required: 1.0.2
# Date created: 10 August 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= icewm-1.0.2
+PORTNAME= icewm
+PORTVERSION= 1.0.2
CATEGORIES= x11-wm
MASTER_SITES= http://download.sourceforge.net/icewm/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index ca46d27bb037..84e54c27658f 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: DockApp Library
-# Version required: 0.2
# Date created: 17 July 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= docklib-0.2
-PKGNAME= libdockapp-0.2
+PORTNAME= libdockapp
+PORTVERSION= 0.2
CATEGORIES= x11-wm
MASTER_SITES= http://wit401310.student.utwente.nl/apps/apps/ \
http://people.FreeBSD.org/~jim/distfiles/ \
ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
+DISTNAME= docklib-${PORTVERSION}
MAINTAINER= jim@FreeBSD.org
diff --git a/x11-wm/lwm/Makefile b/x11-wm/lwm/Makefile
index 67008d7090be..d72cec78eb75 100644
--- a/x11-wm/lwm/Makefile
+++ b/x11-wm/lwm/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: lwm
-# Version required: 0.06
# Date created: 17 March 1998
# Whom: J Han <hjh@photino.com>
#
# $FreeBSD$
#
-DISTNAME= lwm
-PKGNAME= lwm-0.06
+PORTNAME= lwm
+PORTVERSION= 0.06
CATEGORIES= x11-wm
MASTER_SITES= http://users.ch.genedata.com/~enh/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= hjh@photino.com
diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index 5bc9ba470ced..626ce25a9e64 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mlvwm
-# Version required: 0.9.0
# Date created: 19 Januruary 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= mlvwm090
-PKGNAME= mlvwm-0.9.0
+PORTNAME= mlvwm
+PORTVERSION= 0.9.0
CATEGORIES= x11-wm
MASTER_SITES= http://www2u.biglobe.ne.jp/~y-miyata/mlvwm/
+DISTNAME= mlvwm090
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} mini-icons.tar.gz
MAINTAINER= nakai@FreeBSD.org
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index ecc96a830f21..59e0a4d06187 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: olvwm
-# Version required: 4.1
# Date created: 21 October 1994
# Whom: smace
#
# $FreeBSD$
#
-DISTNAME= olvwm4
-PKGNAME= olvwm-4.2
+PORTNAME= olvwm
+PORTVERSION= 4.2
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= window_managers
+DISTNAME= ${PORTNAME}4
EXTRACT_SUFX= .tar.Z
PATCH_SITES= ${MASTER_SITES}
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index 6416a64158ee..1c5d2ff14812 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Blackbox
-# Version required: 0.51.3.1
# Date created: June 15, 1998
# Whom: Brian Handy <handy@physics.montana.edu>
#
# $FreeBSD$
#
-DISTNAME= blackbox-0.51.3.1
+PORTNAME= blackbox
+PORTVERSION= 0.51.3.1
CATEGORIES= x11-wm
MASTER_SITES= ftp://portal.alug.org/pub/blackbox/0.5x.x/ \
ftp://ftp.dti.ad.jp/pub/X/blackbox/0.5x.x/
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index a623c4b1d776..e0411687f88c 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: piewm
-# Version required: 1.03
# Date created: 24 November 1994
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= piewm-1.03
+PORTNAME= piewm
+PORTVERSION= 1.03
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.crynwr.com/piewm/
diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile
index f3c76f868b9d..c48337d40205 100644
--- a/x11-wm/qvwm/Makefile
+++ b/x11-wm/qvwm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: qvwm
-# Version required: 1.1.6
# Date created: 2 January 1997
# Whom: Yukihiro Nakai<Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= qvwm-1.1.6
+PORTNAME= qvwm
+PORTVERSION= 1.1.6
CATEGORIES= x11-wm
MASTER_SITES= ftp://www.qvwm.org/pub/qvwm/
diff --git a/x11-wm/sapphire/Makefile b/x11-wm/sapphire/Makefile
index 501e13e9ba52..dc006f0c51d1 100644
--- a/x11-wm/sapphire/Makefile
+++ b/x11-wm/sapphire/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: sapphire
-# Version required: 0.14.0.2
# Date created: 26 Jan 2000
# Whom: trevor@jpj.net
#
# $FreeBSD$
#
-DISTNAME= sapphire-0.14.0-2
-PKGNAME= sapphire-0.14.0.2
+PORTNAME= sapphire
+PORTVERSION= 0.14.0.2
CATEGORIES= x11-wm
MASTER_SITES= http://download.sourceforge.net/sapphire/
+DISTNAME= ${PORTNAME}-0.14.0-2
MAINTAINER= trevor@jpj.net
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index b5c5f5c1fdfd..3c366af35df2 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sawmill
-# Version required: 0.25.2
# Date created: 13 September 1999
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= sawmill-0.25.2
+PORTNAME= sawmill
+PORTVERSION= 0.25.2
CATEGORIES= x11-wm
MASTER_SITES= ftp://sawmill.sourceforge.net/pub/sawmill/
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index b5c5f5c1fdfd..3c366af35df2 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sawmill
-# Version required: 0.25.2
# Date created: 13 September 1999
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= sawmill-0.25.2
+PORTNAME= sawmill
+PORTVERSION= 0.25.2
CATEGORIES= x11-wm
MASTER_SITES= ftp://sawmill.sourceforge.net/pub/sawmill/
diff --git a/x11-wm/scwm/Makefile b/x11-wm/scwm/Makefile
index 1c1cd9926166..9ec26ea20b86 100644
--- a/x11-wm/scwm/Makefile
+++ b/x11-wm/scwm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: scwm
-# Version required: 0.99.6.1
# Date created: 26 December 1997
# Whom: Yukihiro Nakai <nacai@iname.com>
#
# $FreeBSD$
#
-DISTNAME= scwm-0.99.6.1
+PORTNAME= scwm
+PORTVERSION= 0.99.6.1
CATEGORIES= x11-wm
MASTER_SITES= ftp://scwm.mit.edu/pub/scwm/
diff --git a/x11-wm/toolbox/Makefile b/x11-wm/toolbox/Makefile
index fe3974cd1eeb..6c13f5684ac8 100644
--- a/x11-wm/toolbox/Makefile
+++ b/x11-wm/toolbox/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: toolbox
-# Version required: 0.4.6
# Date created: 05 June 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= toolbox-0.4.6
+PORTNAME= toolbox
+PORTVERSION= 0.4.6
CATEGORIES= x11-wm
MASTER_SITES= http://www2.bc.edu/~kelleyry/toolbox/
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index c579fb37a6b1..68167dbf74d8 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: tvtwm
-# Version required: pl11
# Date created: 5th December 1994
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= tvtwm.pl11
-PKGNAME= tvtwm-pl11
+PORTNAME= tvtwm
+PORTVERSION= pl11
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= window_managers
+DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= gpalmer@FreeBSD.org
diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile
index 79ab91e41d48..4c6433a8cb7c 100644
--- a/x11-wm/ude/Makefile
+++ b/x11-wm/ude/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: ude
-# Version required: 0.2.7.1
# Date created: 06 Mar 2000
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= ude-0.2.7-BETA
-PKGNAME= ude-0.2.7.1
+PORTNAME= ude
+PORTVERSION= 0.2.7.1
CATEGORIES= x11-wm
MASTER_SITES= ftp://download.sourceforge.net/pub/sourceforge/udeproject/ \
ftp://ude.the-coffeeshop.dk/pub/UDE/
+DISTNAME= ${PORTNAME}-0.2.7-BETA
MAINTAINER= will@FreeBSD.org
diff --git a/x11-wm/vtwm/Makefile b/x11-wm/vtwm/Makefile
index 8111771ecf1f..259f2e8f067d 100644
--- a/x11-wm/vtwm/Makefile
+++ b/x11-wm/vtwm/Makefile
@@ -1,12 +1,12 @@
-# New ports collection makefile for: tvtwm
-# Version required: 5.4.5a
+# New ports collection makefile for: vtwm
# Date created: 21 December 1998
# Whom: bmah@ca.sandia.gov
#
# $FreeBSD$
#
-DISTNAME= vtwm-5.4.5a
+PORTNAME= vtwm
+PORTVERSION= 5.4.5a
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.visi.com/users/hawkeyd/X/
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 98e8f9ad48ce..3a47174f7890 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: WindowMaker with i18n extention
-# Version required: 0.62.0
# Date created: 24 Nov 1998
# Whom: mac@jp.freebsd.org
#
# $FreeBSD$
#
-DISTNAME= WindowMaker-0.62.0
-PKGNAME= windowmaker-i18n-0.62.0
+PORTNAME= windowmaker-i18n
+PORTVERSION= 0.62.0
CATEGORIES= x11-wm windowmaker
MASTER_SITES= ${MASTER_SITE_WINDOWMAKER}
MASTER_SITE_SUBDIR= beta/srcs
+DISTNAME= WindowMaker-${PORTVERSION}
MAINTAINER= mac@jp.freebsd.org
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index b9a387600585..348b5d4d82d2 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: WindowMaker
-# Version required: 0.62.1
# Date created: August 13, 1997
# Whom: handy@physics.montana.edu
#
# $FreeBSD$
+#
-DISTNAME= WindowMaker-0.62.1
-PKGNAME= windowmaker-0.62.1
+PORTNAME= windowmaker
+PORTVERSION= 0.62.1
CATEGORIES= x11-wm windowmaker
MASTER_SITES= ${MASTER_SITE_WINDOWMAKER} \
http://jgo.local.net/cool_downloads/wm/
MASTER_SITE_SUBDIR= beta/srcs
+DISTNAME= WindowMaker-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
MAINTAINER= sobomax@altavista.net
diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile
index 3ac38f6fa74b..109ed89c8a2b 100644
--- a/x11-wm/wm2/Makefile
+++ b/x11-wm/wm2/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: wm2
-# Version required: 4.0
# Date created: 16 February 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= wm2-4
-PKGNAME= wm2-4.0
+PORTNAME= wm2
+PORTVERSION= 4.0
CATEGORIES= x11-wm
MASTER_SITES= http://www.all-day-breakfast.com/wm2/
+DISTNAME= ${PORTNAME}-4
MAINTAINER= nakai@FreeBSD.org
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 3ac58b83a248..6f834adfaef0 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmakerconf
-# Version required: 2.6.1
# Date Created: 14 August 1999
# Whom: Dominik Rothert <dr@domix.de>
#
# $FreeBSD$
#
-DISTNAME= wmakerconf-2.6.1
+PORTNAME= wmakerconf
+PORTVERSION= 2.6.1
CATEGORIES= x11-wm
MASTER_SITES= http://ulli.linuxave.net/wmakerconf/
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index 252029ccefab..280c5a2c6c7c 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmanager
-# Version required: 0.2
# Date created: 19 Nov 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= wmanager-0.2
+PORTNAME= wmanager
+PORTVERSION= 0.2
CATEGORIES= x11-wm
MASTER_SITES= http://heuss.techfak.uni-bielefeld.de/www/mtessmer/wmanager/
EXTRACT_SUFX= .src.tar.bz2
diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile
index 20575aa2a758..54c87279171f 100644
--- a/x11-wm/wmg/Makefile
+++ b/x11-wm/wmg/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: wmg
-# Version required: 0.15.0
# Date created: 27 August 1999
# Whom: Yukihiro Nakai <Nacai@iname.com>
#
# $FreeBSD$
#
-DISTNAME= wmG-0.15.0
-PKGNAME= wmg-0.15.0
+PORTNAME= wmg
+PORTVERSION= 0.15.0
CATEGORIES= x11-wm gnome
MASTER_SITES= http://ductape.net/~reeve/downloads/ \
http://www.geocities.com/SiliconValley/Screen/4079/downloads/
+DISTNAME= wmG-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/x11-wm/wmthemeinstall/Makefile b/x11-wm/wmthemeinstall/Makefile
index a26e275eaba3..305e4b38b1a1 100644
--- a/x11-wm/wmthemeinstall/Makefile
+++ b/x11-wm/wmthemeinstall/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: WindowMaker Theme Installer
-# Version required: 0.62
# Date created: 09 Oct 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= wmthemeinstall-0.62
+PORTNAME= wmthemeinstall
+PORTVERSION= 0.62
CATEGORIES= x11-wm
MASTER_SITES= http://www.lovett.com/FreeBSD/ \
ftp://ftp.cronyx.ru/.w3/distfiles/
diff --git a/x11-wm/wmx/Makefile b/x11-wm/wmx/Makefile
index 933e8dc853bc..e92d73d3aaa4 100644
--- a/x11-wm/wmx/Makefile
+++ b/x11-wm/wmx/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: wmx
-# Version required: 4.0
# Date created: 11. Jan 1998
# Whom: Stefan Zehl <sec@42.org>
#
# $FreeBSD$
#
-DISTNAME= wmx-5sec6
-PKGNAME= wmx-5.6
+PORTNAME= wmx
+PORTVERSION= 5.6
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.42.org/pub/wmx/ \
http://www.all-day-breakfast.com/wmx/
+DISTNAME= ${PORTNAME}-5sec6
MAINTAINER= sec@42.org
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index 0b4f5a4b8c5d..03ccbac2794d 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xfce
-# Version required: 3.3.1
# Date created: 30 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xfce-3.3.1
+PORTNAME= xfce
+PORTVERSION= 3.3.1
CATEGORIES= x11-wm
MASTER_SITES= http://www.xfce.org/archive/
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 0b4f5a4b8c5d..03ccbac2794d 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xfce
-# Version required: 3.3.1
# Date created: 30 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xfce-3.3.1
+PORTNAME= xfce
+PORTVERSION= 3.3.1
CATEGORIES= x11-wm
MASTER_SITES= http://www.xfce.org/archive/
diff --git a/x11-wm/xwmm/Makefile b/x11-wm/xwmm/Makefile
index d90ca07a72d2..acdc50ce1dd1 100644
--- a/x11-wm/xwmm/Makefile
+++ b/x11-wm/xwmm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xwmm
-# Version required: 0.7
# Date created: 26 Nov 1999
# Whom: imura@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= xwmm-0.7
+PORTNAME= xwmm
+PORTVERSION= 0.7
CATEGORIES= x11-wm
MASTER_SITES= http://people.FreeBSD.org/~imura/distfiles/
diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index a3a81d40c435..fcb8eae637e7 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: 9menu
-# Version required: 1.5
# Date created: Sun Aug 13 12:36:14 CDT 1995
# Whom: erich@rrnet.com
#
# $FreeBSD$
#
-DISTNAME= 9menu-1.5
+PORTNAME= 9menu
+PORTVERSION= 1.5
CATEGORIES= x11-wm plan9
MASTER_SITES= ftp://ftp.mathcs.emory.edu/pub/arnold/
EXTRACT_SUFX= .shar.gz