5 files changed, 36 insertions, 25 deletions
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index 547e9df9ab5d..9b6eea7d26f3 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -1,16 +1,18 @@
 # New ports collection makefile for:	ctwm
-# Version required:	3.2 patchlevel 1
+# Version required:	3.3
 # Date created:		13 November 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.6 1995/02/11 15:31:40 torstenb Exp $
+# $Id: Makefile,v 1.7 1995/04/01 12:50:47 jkh Exp $
 #
 
 DISTNAME=	ctwm-3.3
-MASTER_SITES=	ftp://ftp.x.org/contrib/window_managers/
 CATEGORIES+=	x11
-USE_IMAKE=	YES
+MASTER_SITES=	ftp://ftp.x.org/contrib/window_managers/
 EXTRACT_SUFX=	.tar.Z
+
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
+USE_IMAKE=	yes
+
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index 4c7e7e5ce459..31d293cf7835 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -3,23 +3,24 @@
 # Date created:		25 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.14 1995/03/27 13:24:18 asami Exp $
+# $Id: Makefile,v 1.15 1995/04/01 12:50:52 jkh Exp $
 #
 
 DISTNAME=	fvwm
-NO_WRKSUBDIR=	yes
+PKGNAME=	fvwm-1.23b
+CATEGORIES+=	x11
+MASTER_SITES=	ftp://spcot.sanders.com/pub/fvwm/
 DISTFILES=	fvwm-core.tar.gz fvwm-modules.tar.gz \
 		fvwm-icons.tar.gz
-MASTER_SITES=	ftp://spcot.sanders.com/pub/fvwm/
-CATEGORIES+=	x11
+
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+
+NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
 XMKMF=		xmkmf
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 pre-install:
 	@cp ${FILESDIR}/configure2.h ${WRKSRC}/configure.h
 	@(cd ${WRKSRC}; ${MAKE} Makefiles)
 
-
-
 .include <bsd.port.mk>
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index dbeba57236d3..74bc5fde995d 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -7,15 +7,17 @@
 #
 
 DISTNAME=	olvwm4
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/
+PKGNAME=	olvwm-4.1
 CATEGORIES+=	x11
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTFILES=	olvwm4.tar.Z olvwm4.Patch01.Z
 EXTRACT_ONLY=	olvwm4.tar.Z
-NO_WRKSUBDIR=	yes
+
 LIB_DEPENDS=	xview\\.3\\.:${PORTSDIR}/x11/xview-lib
 
+NO_WRKSUBDIR=	yes
+USE_IMAKE=	yes
+
 pre-patch:
 	@echo "Applying olvwm4 Patch01"
 	@zcat ${DISTDIR}/olvwm4.Patch01.Z | patch -E -d ${WRKSRC} --quiet
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index 4c78638a5646..a40df0b68684 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -1,20 +1,23 @@
 # New ports collection makefile for:	piewm
-# Version required:	?
+# Version required:	? (there is only one piewm version avyway)
 # Date created:		24 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1995/03/24 11:11:44 asami Exp $
+# $Id: Makefile,v 1.8 1995/04/01 12:51:03 jkh Exp $
 #
 
 DISTNAME=	piewm
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/
+PKGNAME=	piewm-1.0
 CATEGORIES+=	x11
-MAINTAINER=	asami@FreeBSD.ORG
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.Z
-PKG_CMD=	pkg_create -N
+
+MAINTAINER=	asami@FreeBSD.ORG
+
 LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
+USE_IMAKE=	yes
+
 # piewm.tar.Z includes and old version of xpm, and also a bunch of .o
 #  files plus an executable
 
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index 0f50e2e40cfa..e2799fb57905 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -3,15 +3,18 @@
 # Date created:		5th December 1994
 # Whom:			gpalmer
 #
-# $Id: Makefile,v 1.5 1995/03/06 01:59:35 gpalmer Exp $
+# $Id: Makefile,v 1.6 1995/04/01 12:51:14 jkh Exp $
 #
 
 DISTNAME=	tvtwm
-DISTFILES=	tvtwm.pl11.tar.gz
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://ftp.x.org/contrib/window_managers/
+PKGNAME=	tvtwm-pl11
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://ftp.x.org/contrib/window_managers/
+DISTFILES=	tvtwm.pl11.tar.gz
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
+
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
+USE_IMAKE=	yes
 .include <bsd.port.mk>