27 files changed, 191 insertions, 95 deletions

diff --git a/astro/xearth/Makefile b/astro/xearth/Makefile
index 8f7976ff0fa8..69f89af58e93 100644
--- a/astro/xearth/Makefile
+++ b/astro/xearth/Makefile
@@ -1,14 +1,16 @@
+# New ports collection makefile for:    xearth
+# Version required:     0.92
+# Date created:         29 October 1995
+# Whom:                 piero
 #
-# Makefile for x11/xearth (FreeBSD) - piero Sat Oct 29 12:37:15 PDT 1994
-# $Id: Makefile,v 1.2 1995/02/14 12:30:46 asami Exp $
+# $Id$
 #
 
-# Distribution stuff
 DISTNAME=	xearth-0.92
-MASTER_SITES=	ftp://cag.lcs.mit.edu/pub/tuna/
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://cag.lcs.mit.edu/pub/tuna/
 
-USE_IMAKE=	is_set
+USE_IMAKE=	yes
 
 # Copy the list of FreeBSD sites
 pre-patch:
diff --git a/comms/viewfax/Makefile b/comms/viewfax/Makefile
index 571beb424948..ebaee8141a55 100644
--- a/comms/viewfax/Makefile
+++ b/comms/viewfax/Makefile
@@ -1,6 +1,15 @@
+# New ports collection makefile for:    g3view
+# Version required:     1.8
+# Date created:         3 February 1995
+# Whom:                 jmz
+#
+# $Id$
+#
+
 DISTNAME= 	g3view-1.8
-MASTER_SITES=   ftp://ftp.leo.org//pub/comp/networking/communication/modem/mgetty/
 CATEGORIES+=	x11
+MASTER_SITES=   ftp://ftp.leo.org//pub/comp/networking/communication/modem/mgetty/
+
 MAINTAINER=	jmz@FreeBSD.org
 
 pre-install:
diff --git a/emulators/tkhfs/Makefile b/emulators/tkhfs/Makefile
index 515b98d02999..528579de7599 100644
--- a/emulators/tkhfs/Makefile
+++ b/emulators/tkhfs/Makefile
@@ -1,8 +1,19 @@
+# New ports collection makefile for:    tkhfs
+# Version required:     2.4 (taken from FSBox.tcl)
+# Date created:         17 November 1994
+# Whom:                 jmz
+#
+# $Id$
+#
+
 DISTNAME=	tkhfs
-MASTER_SITES=	ftp://ftp.obs-besancon.fr/pub/outgoing/
+PKGNAME=	tkhfs-2.4
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://ftp.obs-besancon.fr/pub/outgoing/
+
+MAINTAINER=	jmz@FreeBSD.org
+
 EXEC_DEPENDS=	hfs:${PORTSDIR}/utils/hfs
 LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk
-MAINTAINER=	jmz@FreeBSD.org
 
 .include <bsd.port.mk>
diff --git a/misc/tkinfo/Makefile b/misc/tkinfo/Makefile
index ecb2f5fcc5cf..7eafe99c7d49 100644
--- a/misc/tkinfo/Makefile
+++ b/misc/tkinfo/Makefile
@@ -3,11 +3,14 @@
 # Date created:         16 Jan 1995
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
+# $Id$
+#
 
 DISTNAME=	tkinfo-0.6
-EXTRACT_SUFX=  .tar.Z
-MASTER_SITES=	ftp://ptolemy.eecs.berkeley.edu/pub/misc/
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://ptolemy.eecs.berkeley.edu/pub/misc/
+EXTRACT_SUFX=	.tar.Z
+
 EXEC_DEPENDS=	wish:${PORTSDIR}/x11/tk
 
 .include <bsd.port.mk>
diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index 51683bc6f47e..50b65a524224 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -3,11 +3,15 @@
 # Date created:         27 Dec 1994
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
+# $Id$
+#
 
 DISTNAME=	tkman-1.6
-MASTER_SITES=	ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/
 CATEGORIES+=	x11
-EXEC_DEPENDS=	wish:${PORTSDIR}/x11/tk rman:${PORTSDIR}/utils/rman
+MASTER_SITES=	ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/
 EXTRACT_SUFX=	.tar.Z
 
+EXEC_DEPENDS=	wish:${PORTSDIR}/x11/tk \
+		rman:${PORTSDIR}/utils/rman
+
 .include <bsd.port.mk>
diff --git a/sysutils/xperfmon/Makefile b/sysutils/xperfmon/Makefile
index fefa76e18091..dd5644ebbd17 100644
--- a/sysutils/xperfmon/Makefile
+++ b/sysutils/xperfmon/Makefile
@@ -3,11 +3,11 @@
 # Date created:		8 March 95
 # Whom:			Lars Koeller <lars.koeller@odie.physik2.uni-rostock.de>
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:51:34 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/12 15:22:37 asami Exp $
 #
 
 DISTNAME=	xperfmon++
-PKGNAME=	xperfmon++-1.1
+PKGNAME=	xperfmon-1.1
 USE_IMAKE=	yes
 CATEGORIES+=	x11
 # In Germany try this
diff --git a/sysutils/xperfmon3/Makefile b/sysutils/xperfmon3/Makefile
index fefa76e18091..dd5644ebbd17 100644
--- a/sysutils/xperfmon3/Makefile
+++ b/sysutils/xperfmon3/Makefile
@@ -3,11 +3,11 @@
 # Date created:		8 March 95
 # Whom:			Lars Koeller <lars.koeller@odie.physik2.uni-rostock.de>
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:51:34 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/12 15:22:37 asami Exp $
 #
 
 DISTNAME=	xperfmon++
-PKGNAME=	xperfmon++-1.1
+PKGNAME=	xperfmon-1.1
 USE_IMAKE=	yes
 CATEGORIES+=	x11
 # In Germany try this
diff --git a/x11-clocks/emiclock/Makefile b/x11-clocks/emiclock/Makefile
index 42bbfd0d42c5..3fda324c5b1b 100644
--- a/x11-clocks/emiclock/Makefile
+++ b/x11-clocks/emiclock/Makefile
@@ -3,14 +3,17 @@
 # Date created:		15 March 1995
 # Whom:			Nobuhiro Yasutomi
 #
-# $Id: Makefile,v 1.2 1995/03/24 11:11:38 asami Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:50:48 jkh Exp $
 #
+
 DISTNAME=	EmiClock-1.0.2
-MASTER_SITES=	ftp://theta.iis.u-tokyo.ac.jp/pub1/X/contrib/applications/
+PKGNAME=	emiclock-1.0.2
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://theta.iis.u-tokyo.ac.jp/pub1/X/contrib/applications/
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 USE_IMAKE=	yes
-PKGNAME=	emiclock-1.0.2
 
 LANGRES=	resources/R6/EUC/EmiClock.ad
 LANGDIR=	$(X11BASE)/lib/X11/ja_JP.EUC/app-defaults
diff --git a/x11-clocks/xdaliclock/Makefile b/x11-clocks/xdaliclock/Makefile
index 00fa290a8c6b..10885b25709d 100644
--- a/x11-clocks/xdaliclock/Makefile
+++ b/x11-clocks/xdaliclock/Makefile
@@ -3,14 +3,16 @@
 # Date created:				10th February 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1995/02/10 23:32:43 gpalmer Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:51:18 jkh Exp $
 #
 
 DISTNAME=	xdaliclock-2.05
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
 EXTRACT_SUFX=	.tar.Z
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
+USE_IMAKE=	yes
+
 .include <bsd.port.mk>
diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile
index f32f3c3d1ee7..2417bb73b926 100644
--- a/x11-fm/xfm/Makefile
+++ b/x11-fm/xfm/Makefile
@@ -3,14 +3,16 @@
 # Date created:		28 December 1994
 # Whom:			jc@irbs.com John Capo
 #
-# $Id: Makefile,v 1.3 1995/02/11 13:51:45 asami Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:51:23 jkh Exp $
 #
 
 DISTNAME=	xfm-1.3
-DISTFILES=	xfm-1.3.tar.gz
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/applications/
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/applications/
+DISTFILES=	xfm-1.3.tar.gz
+
 LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
+USE_IMAKE=	yes
+
 .include <bsd.port.mk>
diff --git a/x11-fonts/xfed/Makefile b/x11-fonts/xfed/Makefile
index 04af9f1ca326..dfa9b0d81f43 100644
--- a/x11-fonts/xfed/Makefile
+++ b/x11-fonts/xfed/Makefile
@@ -3,23 +3,26 @@
 # Date created:         7 December 1994
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.6 1995/04/01 12:51:21 jkh Exp $
+# $Id: Makefile,v 1.7 1995/04/01 14:54:57 asami Exp $
 #
 
+DISTNAME=	xfed
+PKGNAME=	xfed-1.0
+CATEGORIES+=	x11
+
+MAINTAINER=	asami@FreeBSD.ORG
+
 USE_IMAKE=	yes
+
 MAKE_FLAGS=	MANDIR=${PREFIX}/man/man1 BINDIR=${PREFIX}/bin -f
-DISTNAME=	xfed
 TARFILE=	xfed.tar.gz
-
 .if !defined(MASTER_SITE_OVERRIDE)
 SOURCEFILES=	Epistle,README,Imakefile,xfed.man \
 		icon.bit,next.bit,prev.bit,quit.bit,save.bit \
 		defs.h,main.c,output.c,parse.y,scan.l
 #MASTER_SITES=	ftp://me10.lbl.gov/pub/hp_X11R3_tape/source/app/
-CATEGORIES+=	x11
 SOURCESITE=	ftp://ftp.cs.orst.edu/pub/src/X11R4/contrib/clients/xfed/
 #EXTRACT_SUFX=	.tar.Z
-MAINTAINER=	asami@FreeBSD.ORG
 
 fetch:	pre-fetch
 	@if [ ! -d ${DISTDIR} ]; then mkdir -p ${DISTDIR}; fi
diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index 1acbb21c1f70..86c02f652e6d 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -3,14 +3,16 @@
 # Date created:		18 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.0 1994/11/18 00:00:00 asami Exp $
+# $Id: Makefile,v 1.6 1995/04/04 09:24:46 asami Exp $
 #
 
 DISTNAME=	Xaw3d-1.1
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/widgets/Xaw3d/R6/
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/widgets/Xaw3d/R6/
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 WRKSRC=		${WRKDIR}/lib/Xaw3d
+USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 0af732bd5794..0b00c7039a0d 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -3,14 +3,16 @@
 # Date created:		14 December 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.2 1995/02/11 13:51:16 asami Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:50:43 jkh Exp $
 #
 
 DISTNAME=	blt-1.7
-DISTFILES=	BLT-1.7.tar.gz
-MASTER_SITES=	ftp://ftp.aud.alcatel.com/tcl/extensions/
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://ftp.aud.alcatel.com/tcl/extensions/
+DISTFILES=	BLT-1.7.tar.gz
+
 LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk
+
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all sharedlib
 
diff --git a/x11-toolkits/iv/Makefile b/x11-toolkits/iv/Makefile
index 41888929dd5e..b5ce5b6fa0ef 100644
--- a/x11-toolkits/iv/Makefile
+++ b/x11-toolkits/iv/Makefile
@@ -3,13 +3,14 @@
 # Date created:		23.sept.1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.3 1994/11/15 03:19:35 adam Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:50:56 jkh Exp $
 #
 
-EXTRACT_SUFFIX=	.tar.Z
 VERSION=	3.1
 DISTNAME=	iv-${VERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFFIX}
+EXTRACT_SUFX=	.tar.Z
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+
 WRKSRC=		${WRKDIR}/iv
 MAKEFILE=	makefile
 NCFTPFLAGS=	-NP
@@ -19,9 +20,8 @@ pre-fetch:
 	@if [ ! -f ${DISTDIR}/${DISTFILES} ]; then \
 	    mkdir -p ${DISTDIR}/${DISTNAME} ; \
 	    ${MAKE} MASTER_SITES=ftp://interviews.stanford.edu/pub/ \
-CATEGORIES+=	x11
 		DISTDIR=${DISTDIR}/${DISTNAME} DISTNAME=${VERSION} fetch ; \
-	    mv ${DISTDIR}/${DISTNAME}/${VERSION}${EXTRACT_SUFFIX} \
+	    mv ${DISTDIR}/${DISTNAME}/${VERSION}${EXTRACT_SUFX} \
 		${DISTDIR}/${DISTFILES} ; \
 	    rmdir ${DISTDIR}/${DISTNAME} ; \
 	fi
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>
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 444fd1de03d0..a2a47605081f 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -3,17 +3,19 @@
 # Date created:		5th December 1994
 # Whom:			gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.5 1995/02/01 22:38:08 gpalmer Exp $
+# $Id: Makefile,v 1.6 1995/04/01 12:51:04 jkh Exp $
 #
 
 DISTNAME=	rxvt-2.09
-USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/rxvt
-PREFIX=		/usr/X11R6
-MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/misc/
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/misc/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
+WRKSRC=		${WRKDIR}/rxvt
+USE_IMAKE=	yes
+PREFIX=		/usr/X11R6
+
 # Get rid of the rclock directory until I can figure out how to patch
 # that up also and make it!
 pre-configure:
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 444fd1de03d0..a2a47605081f 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -3,17 +3,19 @@
 # Date created:		5th December 1994
 # Whom:			gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.5 1995/02/01 22:38:08 gpalmer Exp $
+# $Id: Makefile,v 1.6 1995/04/01 12:51:04 jkh Exp $
 #
 
 DISTNAME=	rxvt-2.09
-USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/rxvt
-PREFIX=		/usr/X11R6
-MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/misc/
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/misc/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
+WRKSRC=		${WRKDIR}/rxvt
+USE_IMAKE=	yes
+PREFIX=		/usr/X11R6
+
 # Get rid of the rclock directory until I can figure out how to patch
 # that up also and make it!
 pre-configure:
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 444fd1de03d0..a2a47605081f 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -3,17 +3,19 @@
 # Date created:		5th December 1994
 # Whom:			gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.5 1995/02/01 22:38:08 gpalmer Exp $
+# $Id: Makefile,v 1.6 1995/04/01 12:51:04 jkh Exp $
 #
 
 DISTNAME=	rxvt-2.09
-USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/rxvt
-PREFIX=		/usr/X11R6
-MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/misc/
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/misc/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
+WRKSRC=		${WRKDIR}/rxvt
+USE_IMAKE=	yes
+PREFIX=		/usr/X11R6
+
 # Get rid of the rclock directory until I can figure out how to patch
 # that up also and make it!
 pre-configure:
diff --git a/x11/sxpc/Makefile b/x11/sxpc/Makefile
index 1485ebe5d953..7da5c7d4fe86 100644
--- a/x11/sxpc/Makefile
+++ b/x11/sxpc/Makefile
@@ -3,18 +3,20 @@
 # Date created:		22nd March 1995
 # Whom:			jkh@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1995/03/22 21:14:52 jkh Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:51:06 jkh Exp $
 #
 
 DISTNAME=	sxpc-1.4
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
+EXTRACT_SUFX=	.shar.Z
+
 MAINTAINER=	jkh@FreeBSD.ORG
+
 NO_WRKSUBDIR=	yes
-EXTRACT_SUFX=		.shar.Z
 EXTRACT_CMD=		zcat
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|sh
+USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 620a4beabf85..e71b557f894e 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -3,11 +3,14 @@
 # Date created:		31 January 1995
 # Whom:			janek
 #
+# $Id$
+#
 
 DISTNAME=	x3270-3.0.3
+CATEGORIES+=	x11 emulation
+MASTER_SITES=	ftp://ftp.icm.edu.pl/pub/X11/contrib/applications/x3270/
 DISTFILES=	x3270-3.0.3.4.tar.gz
+
 USE_IMAKE=	yes
-MASTER_SITES=	ftp://ftp.icm.edu.pl/pub/X11/contrib/applications/x3270/
-CATEGORIES+=	x11 emulation
 
 .include <bsd.port.mk>
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index a7f62097177b..7997533edfec 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -1,9 +1,19 @@
+# New ports collection makefile for:    xgrab
+# Version required:     2.3
+# Date created:         27 February 1995
+# Whom:                 jmz
+#
+# $Id$
+#
+
 DISTNAME=	xgrabsc.2_3
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://ftp.sunet.se/pub/X11/R5contrib/
+PKGNAME=	xgrab-2.3
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://ftp.sunet.se/pub/X11/R5contrib/
+
 MAINTAINER=	jmz@FreeBSD.org
 
+USE_IMAKE=	yes
 MAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
 		XAPPLOADDIR=${PREFIX}/lib/app-defaults  -f
 
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index d358bc768c6d..2d0690589f94 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -1,7 +1,17 @@
+# New ports collection makefile for:    xkeycaps
+# Version required:     2.28
+# Date created:         12 February 1995
+# Whom:                 jmz
+#
+# $Id$
+#
+
 DISTNAME=	xkeycaps-2.28
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://ftp.sunet.se/pub/X11/contrib/applications/
 CATEGORIES+=	x11
+MASTER_SITES=	ftp://ftp.sunet.se/pub/X11/contrib/applications/
+
 MAINTAINER=	jmz@FreeBSD.org
 
+USE_IMAKE=	yes
+
 .include <bsd.port.mk>
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 7ada6e1cba9e..a688737c150f 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -1,12 +1,23 @@
+# New ports collection makefile for:    xloadimage
+# Version required:     3.03
+# Date created:         9 January 1994
+# Whom:                 jmz
+#
+# $Id$
+#
+
 DISTNAME=	xloadimage
+PKGNAME=	xloadimage-3.03
+CATEGORIES+=	x11
+MASTER_SITES=	ftp://gatekeeper.dec.com/pub/X11-contrib/
 DISTFILES=	xloadimage.3.03.tar.Z
+
+MAINTAINER=	jmz@FreeBSD.org
+
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
-MASTER_SITES=	ftp://gatekeeper.dec.com/pub/X11-contrib/
-CATEGORIES+=	x11
 MAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
 		XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f
-MAINTAINER=	jmz@FreeBSD.org
 
 pre-install:
 	@mkdir -p ${PREFIX}/lib/X11/app-defaults