20 files changed, 48 insertions, 40 deletions

diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 75ff15d96637..ad26c08489f9 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.41 1998/05/05 21:47:21 jmz Exp $
+# $Id: Makefile,v 1.42 1998/07/03 05:01:55 cwt Exp $
 #
 
 DISTNAME=	xc
@@ -27,11 +27,13 @@ MAINTAINER=	jmz@FreeBSD.ORG
 
 IS_INTERACTIVE=	yes	# configure script asks questions
 NO_PACKAGE=	package available from XFree86
-USE_X11=	yes
 ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+# can't use USE_X_PREFIX here -- it will cause a circular dependency
+PREFIX=		${X11BASE}
+MTREE_FILE=	/etc/mtree/BSD.x11.dist
 
 .if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO)
 pre-fetch:
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 75ff15d96637..ad26c08489f9 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.41 1998/05/05 21:47:21 jmz Exp $
+# $Id: Makefile,v 1.42 1998/07/03 05:01:55 cwt Exp $
 #
 
 DISTNAME=	xc
@@ -27,11 +27,13 @@ MAINTAINER=	jmz@FreeBSD.ORG
 
 IS_INTERACTIVE=	yes	# configure script asks questions
 NO_PACKAGE=	package available from XFree86
-USE_X11=	yes
 ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+# can't use USE_X_PREFIX here -- it will cause a circular dependency
+PREFIX=		${X11BASE}
+MTREE_FILE=	/etc/mtree/BSD.x11.dist
 
 .if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO)
 pre-fetch:
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 75ff15d96637..ad26c08489f9 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.41 1998/05/05 21:47:21 jmz Exp $
+# $Id: Makefile,v 1.42 1998/07/03 05:01:55 cwt Exp $
 #
 
 DISTNAME=	xc
@@ -27,11 +27,13 @@ MAINTAINER=	jmz@FreeBSD.ORG
 
 IS_INTERACTIVE=	yes	# configure script asks questions
 NO_PACKAGE=	package available from XFree86
-USE_X11=	yes
 ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+# can't use USE_X_PREFIX here -- it will cause a circular dependency
+PREFIX=		${X11BASE}
+MTREE_FILE=	/etc/mtree/BSD.x11.dist
 
 .if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO)
 pre-fetch:
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index 75ff15d96637..ad26c08489f9 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.41 1998/05/05 21:47:21 jmz Exp $
+# $Id: Makefile,v 1.42 1998/07/03 05:01:55 cwt Exp $
 #
 
 DISTNAME=	xc
@@ -27,11 +27,13 @@ MAINTAINER=	jmz@FreeBSD.ORG
 
 IS_INTERACTIVE=	yes	# configure script asks questions
 NO_PACKAGE=	package available from XFree86
-USE_X11=	yes
 ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+# can't use USE_X_PREFIX here -- it will cause a circular dependency
+PREFIX=		${X11BASE}
+MTREE_FILE=	/etc/mtree/BSD.x11.dist
 
 .if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO)
 pre-fetch:
diff --git a/x11/blast/Makefile b/x11/blast/Makefile
index 48dcb611d382..a5dc957681cc 100644
--- a/x11/blast/Makefile
+++ b/x11/blast/Makefile
@@ -3,7 +3,7 @@
 # Date created:         9 Jul 1996
 # Whom:            searle
 #
-# $Id: Makefile,v 1.6 1998/01/29 15:51:38 jseger Exp $
+# $Id: Makefile,v 1.7 1998/04/11 02:35:57 jseger Exp $
 #
 
 DISTNAME=	blast-1.0-ss-10.20
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://hpux.csc.liv.ac.uk/hpux/X11/Demos/blast-1.0/ \
 
 MAINTAINER=	jseger@FreeBSD.org
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN1=		blast.1
 WRKSRC=		${WRKDIR}/blast-1.0
 
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index 55a54d791f5d..42aa9b05ee1d 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -3,7 +3,7 @@
 # Date created:        22 April 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/13 02:19:24 steve Exp $
 #
 
 DISTNAME=	dgs-0.5.0
@@ -19,7 +19,7 @@ LIB_DEPENDS= 	jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 WRKSRC=		${WRKDIR}/${DISTNAME}/dgs
 
 GNU_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 MAN1=		gs.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1
 
diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile
index 36ac7b11f590..a5f5aedd534e 100644
--- a/x11/dxpc/Makefile
+++ b/x11/dxpc/Makefile
@@ -3,7 +3,7 @@
 # Date created:		2 May 1998
 # Whom:			Bruce A. Mah <bmah@ca.sandia.gov>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/17 06:27:45 mph Exp $
 #
 
 DISTNAME=       dxpc-3.7.0
@@ -16,7 +16,7 @@ MAINTAINER=	bmah@ca.sandia.gov
 MAN1=		dxpc.1
 
 GNU_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 post-install:
 	strip ${PREFIX}/bin/dxpc
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 17c8e75f2312..94de7da6279c 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -3,7 +3,7 @@
 # Date created:        24 November 1997
 # Whom:                Murray Stokely <murray@cdrom.com>
 #
-# $Id: Makefile,v 1.5 1997/11/29 23:43:27 asami Exp $
+# $Id: Makefile,v 1.6 1998/02/23 15:38:44 steve Exp $
 #
 
 DISTNAME=	Eterm-DR-0.7+PL5
@@ -20,7 +20,7 @@ LIB_DEPENDS=	Imlib\\.1\\.:${PORTSDIR}/graphics/imlib
 WRKSRC=		$(WRKDIR)/Eterm-DR-0.7
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN1=		Eterm.1
 ALL_TARGET=	FreeBSD
 
diff --git a/x11/fbsd-icons/Makefile b/x11/fbsd-icons/Makefile
index 0b3b23910608..ff9dfa75221c 100644
--- a/x11/fbsd-icons/Makefile
+++ b/x11/fbsd-icons/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sat Jun 14 09:43:24 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.2 1997/06/29 10:50:38 obrien Exp $
+# $Id: Makefile,v 1.3 1998/06/27 05:19:51 asami Exp $
 #
 
 DISTNAME=	fbsd-icons
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	andreas@FreeBSD.ORG
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile
index 5cb9cc0b21d2..4eb0af9293e1 100644
--- a/x11/libsx/Makefile
+++ b/x11/libsx/Makefile
@@ -3,7 +3,7 @@
 # Date created:			5 December 1996
 # Whom:				Pedro Giffuni
 #
-# $Id: Makefile,v 1.4 1997/09/03 05:22:17 max Exp $
+# $Id: Makefile,v 1.5 1997/09/15 07:28:02 tg Exp $
 #
 
 DISTNAME=	libsx
@@ -17,7 +17,7 @@ MAINTAINER=	giffunip@asme.org
 
 LIB_DEPENDS=	Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 ALL_TARGET=	src freq
 
 do-install:
diff --git a/x11/offix-clipboard/Makefile b/x11/offix-clipboard/Makefile
index 620d4d14ffca..635a4d2d997c 100644
--- a/x11/offix-clipboard/Makefile
+++ b/x11/offix-clipboard/Makefile
@@ -3,7 +3,7 @@
 # Date created:      28 Jun 1997
 # Whom:              Ruslan Shevchenko <ruslan@shevchenko.kiev.ua>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/06 12:13:51 tg Exp $
 #
 
 DISTNAME=	Clipboard-2.4
@@ -18,7 +18,7 @@ LIB_DEPENDS=	Dnd\\.1\\.:${PORTSDIR}/x11/libdnd
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
-USE_X11=	YES
+USE_X_PREFIX=	YES
 MAN1=		clipboard.1
 
 .include <bsd.port.mk>
diff --git a/x11/offix-execute/Makefile b/x11/offix-execute/Makefile
index 408820e36436..58392313d6df 100644
--- a/x11/offix-execute/Makefile
+++ b/x11/offix-execute/Makefile
@@ -3,7 +3,7 @@
 # Date created:      28 Jun 1997
 # Whom:              Ruslan Shevchenko <ruslan@shevchenko.kiev.ua>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/06 12:22:44 tg Exp $
 #
 
 DISTNAME=	Execute-2.4
@@ -19,6 +19,6 @@ LIB_DEPENDS=	Dnd\\.1\\.:${PORTSDIR}/x11/libdnd \
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
-USE_X11=	YES
+USE_X_PREFIX=	YES
 
 .include <bsd.port.mk>
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 5b26cdb35c98..5a52331ae3f2 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5th December 1994
 # Whom:                 gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.14 1998/03/15 19:47:49 steve Exp $
+# $Id: Makefile,v 1.15 1998/03/16 07:13:53 steve Exp $
 #
 
 DISTNAME=	rxvt-2.4.5
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.math.fu-berlin.de/pub/rxvt/
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=  yes
 MAN1=		rxvt.1
 
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 5b26cdb35c98..5a52331ae3f2 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5th December 1994
 # Whom:                 gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.14 1998/03/15 19:47:49 steve Exp $
+# $Id: Makefile,v 1.15 1998/03/16 07:13:53 steve Exp $
 #
 
 DISTNAME=	rxvt-2.4.5
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.math.fu-berlin.de/pub/rxvt/
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=  yes
 MAN1=		rxvt.1
 
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 5b26cdb35c98..5a52331ae3f2 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5th December 1994
 # Whom:                 gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.14 1998/03/15 19:47:49 steve Exp $
+# $Id: Makefile,v 1.15 1998/03/16 07:13:53 steve Exp $
 #
 
 DISTNAME=	rxvt-2.4.5
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.math.fu-berlin.de/pub/rxvt/
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=  yes
 MAN1=		rxvt.1
 
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index c3cf88d306e3..4e1d3760e646 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -3,7 +3,7 @@
 # Date created:         9 January 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.9 1998/06/10 02:23:25 jmz Exp $
+# $Id: Makefile,v 1.10 1998/06/17 20:12:02 jmz Exp $
 #
 
 DISTNAME=	xloadimage.4.1
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.cdrom.com/pub/X11/R5contrib/
 
 MAINTAINER=	jmz@FreeBSD.org
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 ALL_TARGET=
 
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 5d01b0f69f0d..2b75855e5c01 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 November 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.35 1998/07/20 16:37:51 asami Exp $
+# $Id: Makefile,v 1.36 1998/07/21 07:09:04 tg Exp $
 #
 
 DISTNAME=       xlockmore-4.11
@@ -23,7 +23,7 @@ CONFIGURE_ARGS= --without-gl --without-motif --without-sx \
 .if defined(MAKE_KERBEROS4)
 CONFIGURE_ARGS+= --enable-kerberos4
 .endif
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN1=		xlock.1
 
 OSVERSION!=     sysctl -n kern.osreldate
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index 6440ba005e6e..eaa669c1724a 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -3,7 +3,7 @@
 # Date created:        16 Jan 1997
 # Whom:                Stefan Zehl <sec@42.org>
 #
-# $Id: Makefile,v 1.1.1.1 1998/04/19 06:02:25 mph Exp $
+# $Id: Makefile,v 1.2 1998/04/21 01:23:58 asami Exp $
 #
 
 DISTNAME=	xmove.2.0beta2
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.cs.columbia.edu/pub/xmove/
 MAINTAINER=	sec@42.org
 
 WRKSRC=		${WRKDIR}/xmove
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN1=		xmove.1 xmovectrl.1
 
 post-extract:
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 0757f777e912..5103bf588ddf 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -3,7 +3,7 @@
 # Date created:         10 July 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.12 1998/07/14 01:34:50 jseger Exp $
+# $Id: Makefile,v 1.13 1998/07/24 03:12:51 asami Exp $
 #
 
 DISTNAME=	xscreensaver-2.24
@@ -18,7 +18,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 BROKEN=		libkrb
 
 GNU_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN1=		attraction.1 blitspin.1 bouboule.1 braid.1 bubbles.1 \
 		decayscreen.1 deco.1 drift.1 epicycle.1 flag.1 flame.1 \
 		forest.1 galaxy.1 goop.1 grav.1 greynetic.1 halo.1 helix.1 \
diff --git a/x11/xtacy/Makefile b/x11/xtacy/Makefile
index 49611a6bf67e..d1d0d41263db 100644
--- a/x11/xtacy/Makefile
+++ b/x11/xtacy/Makefile
@@ -3,7 +3,7 @@
 # Date created:         25 July 1996
 # Whom:                 matt@bdd.net
 #
-# $Id: Makefile,v 1.2 1996/11/18 10:37:03 asami Exp $
+# $Id: Makefile,v 1.3 1998/02/01 22:25:50 fenner Exp $
 #
 
 DISTNAME=	Xtacy113
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	apps/graphics/hacks/X
 
 MAINTAINER=	matt@bdd.net
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/Xtacy
 ALL_TARGET=	xtacy