Rename all USE_X11 to USE_X_PREFIX. Requires 1.279 (3.0-current) or

1.227.2.41 (2.2-stable) of bsd.port.mk for this to be interpreted correctly.
author: Satoshi Asami <asami@FreeBSD.org> 1998-08-05 09:31:52 +0000
committer: Satoshi Asami <asami@FreeBSD.org> 1998-08-05 09:31:52 +0000
commit: ceba2112833ea325577af308d27cad5d00490059 (patch)
tree: 43770c600bd76bb00bd98dc59b4e2b6d76064eb1
parent: 4f43ab018ab882c42157803c6c7856dce3689cdc (diff)
download: ports-ceba2112833ea325577af308d27cad5d00490059.tar.gz
ports-ceba2112833ea325577af308d27cad5d00490059.zip
215 files changed, 456 insertions, 442 deletions
diff --git a/astro/saoimage/Makefile b/astro/saoimage/Makefile
index fdb2f8d5cac7..ed7e1cb39574 100644
--- a/astro/saoimage/Makefile
+++ b/astro/saoimage/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 Feb 1998
 # Whom:			giffunip@asme.org
 #
-# $Id: Makefile,v 1.1.1.1 1998/04/17 21:27:31 mph Exp $
+# $Id: Makefile,v 1.2 1998/07/24 12:22:47 scrappy Exp $
 #
 
 DISTNAME=       saoimage-1.22
@@ -17,7 +17,7 @@ ALL_TARGET=	FreeBSD
 INSTALL_TARGET= -f makefile.$(ALL_TARGET) install_saobin install_saoman
 
 MANL=		saoimage.l
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 pre-patch:
 	$(CP) $(WRKSRC)/makefile.sun $(WRKSRC)/makefile.$(ALL_TARGET)
diff --git a/astro/stars/Makefile b/astro/stars/Makefile
index fbee0bd10099..884f2f31ae62 100644
--- a/astro/stars/Makefile
+++ b/astro/stars/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 Jul 1996
 # Whom:			searle
 #
-# $Id: Makefile,v 1.5 1998/01/28 21:11:20 jseger Exp $
+# $Id: Makefile,v 1.6 1998/07/27 23:23:36 asami Exp $
 #
 
 DISTNAME=	stars-1.0-ss-10.10
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://hpux.csc.liv.ac.uk/hpux/X11/Demos/stars-1.0/ \
 
 MAINTAINER=	jseger@FreeBSD.org
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		$(WRKDIR)/$(PKGNAME)
 
 do-build:
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 679e85bf8552..fa0fa327a80c 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 July 1998
 # Whom:			Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.2 1998/07/20 10:01:55 asami Exp $
 #
 
 DISTNAME=	esound-0.2.4
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/esound
 
diff --git a/audio/vat/Makefile b/audio/vat/Makefile
index c1044f5e594b..e4454f5fc2fb 100644
--- a/audio/vat/Makefile
+++ b/audio/vat/Makefile
@@ -3,7 +3,7 @@
 # Date created:		2 November 1996
 # Whom:			fenner
 #
-# $Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp $
+# $Id: Makefile,v 1.5 1998/06/26 19:05:26 fenner Exp $
 #
 
 DISTNAME=	vat-4.0b2
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build
 LIB_DEPENDS=	tk80:${PORTSDIR}/x11/tk80 \
 		gsm:${GSM_DIR}
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--with-gsm=${GSM_WORK}
 INSTALL_TARGET=	install install-man
diff --git a/audio/x11amp/Makefile b/audio/x11amp/Makefile
index cb4234504827..dd989aa105fb 100644
--- a/audio/x11amp/Makefile
+++ b/audio/x11amp/Makefile
@@ -3,7 +3,7 @@
 # Date created:         13 Jul 1998
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/07/13 22:53:31 dburr Exp $
+# $Id: Makefile,v 1.2 1998/07/13 22:55:43 dburr Exp $
 #
 
 DISTNAME=	x11amp-0.7-FreeBSD
@@ -17,7 +17,7 @@ MAINTAINER=	dburr@FreeBSD.ORG
 
 WRKSRC=		${WRKDIR}/x11amp
 
-USE_X11=	YES
+USE_X_PREFIX=	YES
 NO_BUILD=	YES
 
 do-install:
diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile
index b02a365dc645..9aa562db8f2a 100644
--- a/biology/seaview/Makefile
+++ b/biology/seaview/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Dec 5 1997
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
-# $Id: Makefile,v 1.3 1998/03/30 23:44:07 asami Exp $
+# $Id: Makefile,v 1.4 1998/07/27 23:24:01 asami Exp $
 #
 
 DISTNAME=       seaview
@@ -16,7 +16,7 @@ MAINTAINER=     frankch@waru.life.nthu.edu.tw
 
 LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms
 
-USE_X11=	YES
+USE_X_PREFIX=	YES
 NO_WRKSUBDIR=	YES
 EXTRACT_BEFORE_ARGS=	-xf
 
diff --git a/cad/kaskade/Makefile b/cad/kaskade/Makefile
index 41e839f8a0ba..dc536683c5b6 100644
--- a/cad/kaskade/Makefile
+++ b/cad/kaskade/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 Sept. 1997
 # Whom:			Pedro Giffuni
 #
-# $Id: Makefile,v 1.2 1997/11/22 09:56:34 asami Exp $
+# $Id: Makefile,v 1.3 1997/11/26 23:10:55 jseger Exp $
 #
 
 DISTNAME=	3.1.1
@@ -18,7 +18,7 @@ DIST_SUBDIR=	kaskade
 WRKSRC=         ${WRKDIR}/3.1
 MAKEFILE=	makefile
 ALL_TARGET=	k6
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 do-install:
 	$(INSTALL_PROGRAM) $(WRKSRC)/k6 $(PREFIX)/bin
diff --git a/chinese/kcfonts/Makefile b/chinese/kcfonts/Makefile
index 5e1c8bd2bb37..d8564bd2b718 100644
--- a/chinese/kcfonts/Makefile
+++ b/chinese/kcfonts/Makefile
@@ -3,7 +3,7 @@
 # Date Created:				5 Dec 1997
 # Whom:					Ming-I Hseh <PA@FreeBSD.Ntu.edu.TW>
 #
-# $Id: Makefile,v 1.4 1997/12/17 17:17:16 vanilla Exp $
+# $Id: Makefile,v 1.5 1997/12/24 07:58:40 vanilla Exp $
 #
 
 DISTNAME=	kcfonts-1.05
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://freebsd.ntu.edu.tw/freebsd/taiwan/ \
 
 MAINTAINER=	PA@FreeBSD.ee.Ntu.edu.TW
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.mk>
diff --git a/chinese/rxvt/Makefile b/chinese/rxvt/Makefile
index 7ffa94ccb193..84b448170576 100644
--- a/chinese/rxvt/Makefile
+++ b/chinese/rxvt/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Nov 16 1997
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
-# $Id: Makefile,v 1.4 1997/12/19 19:23:18 vanilla Exp $
+# $Id: Makefile,v 1.5 1998/01/05 17:30:59 vanilla Exp $
 #
 
 DISTNAME=       rxvt-2.4.5
@@ -15,7 +15,7 @@ MAINTAINER=     frankch@waru.life.nthu.edu.tw
 
 RUN_DEPENDS=	${X11BASE}/bin/xcin:${PORTSDIR}/chinese/xcin
 
-USE_X11=        yes
+USE_X_PREFIX=   yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS= --enable-big5=yes --enable-xcin=yes
 MAN1=           crxvt2.1
diff --git a/chinese/ted/Makefile b/chinese/ted/Makefile
index e3b7d2582acf..63abe1119247 100644
--- a/chinese/ted/Makefile
+++ b/chinese/ted/Makefile
@@ -3,7 +3,7 @@
 # Date Created:		18 Sep 1997
 # Whom:			Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.13 1998/05/14 09:34:13 vanilla Exp $
+# $Id: Makefile,v 1.14 1998/06/24 14:53:00 vanilla Exp $
 #
 
 DISTNAME=		ted4.2h
@@ -17,7 +17,7 @@ MAINTAINER=		vanilla@FreeBSD.ORG
 
 RUN_DEPENDS=		${X11BASE}/bin/xcin:${PORTSDIR}/chinese/xcin
 
-USE_X11=		yes
+USE_X_PREFIX=		yes
 WRKSRC=			${WRKDIR}/ted
 
 .include <bsd.port.mk>
diff --git a/chinese/xcin/Makefile b/chinese/xcin/Makefile
index a1d093feb388..030612a99afd 100644
--- a/chinese/xcin/Makefile
+++ b/chinese/xcin/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Nov 28 ,1997
 # Whom:			Yen-Shuo Su <yssu@CCCA.NCTU.edu.tw>
 #
-# $Id: Makefile,v 1.5 1998/03/03 07:49:50 asami Exp $
+# $Id: Makefile,v 1.6 1998/03/09 07:07:17 vanilla Exp $
 #
 
 DISTNAME=       xcin-2.3.02
@@ -17,7 +17,7 @@ MAINTAINER=     yssu@CCCA.NCTU.edu.tw
 
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/chinese/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS	=-prefix="${X11BASE}" \
 		-x-font-prefix="${X11BASE}/lib/X11/fonts"
diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index a1d093feb388..030612a99afd 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Nov 28 ,1997
 # Whom:			Yen-Shuo Su <yssu@CCCA.NCTU.edu.tw>
 #
-# $Id: Makefile,v 1.5 1998/03/03 07:49:50 asami Exp $
+# $Id: Makefile,v 1.6 1998/03/09 07:07:17 vanilla Exp $
 #
 
 DISTNAME=       xcin-2.3.02
@@ -17,7 +17,7 @@ MAINTAINER=     yssu@CCCA.NCTU.edu.tw
 
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/chinese/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS	=-prefix="${X11BASE}" \
 		-x-font-prefix="${X11BASE}/lib/X11/fonts"
diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile
index ff57d0f0dfdb..dd97e6b2ea60 100644
--- a/databases/xmysql/Makefile
+++ b/databases/xmysql/Makefile
@@ -3,7 +3,7 @@
 # Date created:			Tue Sep  2 15:46:09 CEST 1997
 # Whom:				Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1998/01/29 12:26:01 andreas Exp $
+# $Id: Makefile,v 1.4 1998/03/02 19:28:17 andreas Exp $
 #
 
 DISTNAME=	xmysql-1.8
@@ -19,6 +19,6 @@ BUILD_DEPENDS=	mysql:${PORTSDIR}/databases/mysql
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
 		xforms\\.0\\.:${PORTSDIR}/x11/xforms
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index b0c4f3edd06b..59c100e392d0 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -3,7 +3,7 @@
 # Date created:			Di   2 Sep 1997 16:29:27 CEST
 # Whom:				Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.4 1998/02/02 15:58:45 asami Exp $
+# $Id: Makefile,v 1.5 1998/03/02 18:42:21 andreas Exp $
 #
 
 DISTNAME=	xmysqladmin-0.4.4
@@ -20,7 +20,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
 		xforms\\.0\\.:${PORTSDIR}/x11/xforms
 
 WRKSRC=		${WRKDIR}/xmysqladmin
-USE_X11=	yes
+USE_X_PREFIX=	yes
 ALL_TARGET=	xmysqladmin
 
 .include <bsd.port.mk>
diff --git a/deskutils/offix-trash/Makefile b/deskutils/offix-trash/Makefile
index bc45f970e623..ec11c4dcdb64 100644
--- a/deskutils/offix-trash/Makefile
+++ b/deskutils/offix-trash/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:35:01 tg Exp $
 #
 
 DISTNAME=	Trash-2.4
@@ -19,6 +19,6 @@ LIB_DEPENDS=	Dnd++\\.1\\.:${PORTSDIR}/x11/libdnd
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 USE_GMAKE=	YES
-USE_X11=	YES
+USE_X_PREFIX=	YES
 
 .include <bsd.port.mk>
diff --git a/deskutils/xopps/Makefile b/deskutils/xopps/Makefile
index 158662fcf6ce..7db7e383449b 100644
--- a/deskutils/xopps/Makefile
+++ b/deskutils/xopps/Makefile
@@ -3,7 +3,7 @@
 # Date created:		1 Ag 1997
 # Whom:			Pedro Giffuni (orig)
 #
-# $Id: Makefile,v 1.2 1998/02/22 14:58:36 andreas Exp $
+# $Id: Makefile,v 1.3 1998/02/25 10:13:00 asami Exp $
 #
 
 DISTNAME=	xopps.1.13
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://devvax.jpl.nasa.gov/pub/xopps/
 MAINTAINER=	ports@FreeBSD.org
 
 ALL_TARGET=
-USE_X11=	yes
+USE_X_PREFIX=	yes
 REQUIRES_MOTIF=	yes
 MACH=		FreeBSD
 MAKE_ENV=	'MACH=$(MACH)'
diff --git a/devel/amulet/Makefile b/devel/amulet/Makefile
index ad9fdf2fd721..0010f03a3965 100644
--- a/devel/amulet/Makefile
+++ b/devel/amulet/Makefile
@@ -3,7 +3,7 @@
 # Date created:       26 July 1997
 # Whom:               Filip Bovyn (bovynf@awe.be)
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/12 14:04:51 kuriyama Exp $
 
 DISTNAME=	amulet
 PKGNAME=	amulet-3.0
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	bovynf@awe.be
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		$(WRKDIR)/amulet
 MAKE_ENV+=	AMULET_DIR=$(WRKSRC) AMULET_VARS_FILE=Makefile.vars.gcc.FreeBSD
 
diff --git a/devel/gide/Makefile b/devel/gide/Makefile
index 9a33d597dd0f..3c43d00a8d80 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -3,7 +3,7 @@
 # Date created:        29 Jul 1998
 # Whom:                rom
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/31 21:02:41 jkh Exp $
 #
 
 DISTNAME= 	gIDE-0.0.4
@@ -12,9 +12,9 @@ MASTER_SITES=   http://gide.pn.org/
 
 MAINTAINER=	rom_glsa@ein-hashofet.co.il
 
-LIB_DEPENDS+=   gtk\\.1\\.4:${PORTSDIR}/x11/gtk
+LIB_DEPENDS=    gtk\\.1\\.4:${PORTSDIR}/x11/gtk
 
-USE_X11=        yes
+USE_X_PREFIX=   yes
 GNU_CONFIGURE=  yes
 USE_GMAKE= 	yes
 
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index eae51780d872..cbe4fd66a186 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 June 1998
 # Whom:			Dom Mitchell <dom@myrddin.demon.co.uk>
 #
-# $Id: Makefile,v 1.3 1998/07/03 23:21:56 steve Exp $
+# $Id: Makefile,v 1.4 1998/07/30 05:33:15 vanilla Exp $
 #
 
 DISTNAME=	glade-0.3
@@ -15,7 +15,7 @@ MAINTAINER=     dom@myrddin.demon.co.uk
 LIB_DEPENDS=	gtk\\.1\\.5:${PORTSDIR}/x11/gtk
 
 GNU_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index eae51780d872..cbe4fd66a186 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 June 1998
 # Whom:			Dom Mitchell <dom@myrddin.demon.co.uk>
 #
-# $Id: Makefile,v 1.3 1998/07/03 23:21:56 steve Exp $
+# $Id: Makefile,v 1.4 1998/07/30 05:33:15 vanilla Exp $
 #
 
 DISTNAME=	glade-0.3
@@ -15,7 +15,7 @@ MAINTAINER=     dom@myrddin.demon.co.uk
 LIB_DEPENDS=	gtk\\.1\\.5:${PORTSDIR}/x11/gtk
 
 GNU_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/qtez/Makefile b/devel/qtez/Makefile
index b23f2d59e796..47837eaa658c 100644
--- a/devel/qtez/Makefile
+++ b/devel/qtez/Makefile
@@ -3,7 +3,7 @@
 # Date created:				14 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.5 1998/07/02 05:55:55 tg Exp $
+# $Id: Makefile,v 1.6 1998/07/02 05:56:47 tg Exp $
 #
 
 DISTNAME=	QTEZ-v0.62a
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.:${PORTSDIR}/x11/qt
 
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/qtez
 
 do-install:
diff --git a/editors/e93/Makefile b/editors/e93/Makefile
index ef42efa5ee7a..e0fcf79b4aa0 100644
--- a/editors/e93/Makefile
+++ b/editors/e93/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 June 1995
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.17 1998/03/17 07:29:51 tg Exp $
+# $Id: Makefile,v 1.18 1998/03/17 07:48:56 tg Exp $
 #
 
 DISTNAME=	e93-1.2r6X
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.ORG
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 
 MAKEFILE=	makefile
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 .if !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	yes	# asks "ok?" about license
diff --git a/editors/gxedit/Makefile b/editors/gxedit/Makefile
index 6d9417efe92d..37bebe2ccd6a 100644
--- a/editors/gxedit/Makefile
+++ b/editors/gxedit/Makefile
@@ -3,7 +3,7 @@
 # Date created:		01 Jul 1998
 # Whom:			Dom Mitchell <dom@myrddin.demon.co.uk>
 #
-# $Id: Makefile,v 1.7 1998/07/20 18:51:39 steve Exp $
+# $Id: Makefile,v 1.8 1998/07/31 15:39:37 jseger Exp $
 #
 
 DISTNAME=	GXedit1.07
@@ -17,7 +17,7 @@ MAINTAINER=     dom@myrddin.demon.co.uk
 LIB_DEPENDS=	gtk\\.1\\.4:${PORTSDIR}/x11/gtk
 
 EXTRACT_BEFORE_ARGS= -xf
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gxedit ${PREFIX}/bin
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index c0f007f4bb93..c0902a9082a2 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -3,7 +3,7 @@
 # Date created:				7 April 1996
 # Whom:	Daniel Eischen <deischen@iworks.InterWorks.org>
 #
-# $Id: Makefile,v 1.11 1998/07/27 23:24:14 asami Exp $
+# $Id: Makefile,v 1.12 1998/07/28 06:34:31 hoek Exp $
 #
 
 DISTNAME=	nedit-5.0.2
@@ -17,7 +17,7 @@ MAINTAINER=	deischen@iworks.InterWorks.org
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 REQUIRES_MOTIF=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
 EXTRACT_ONLY=	nedit_source.tar.gz
 MAN1=		nedit.1 nc.1
diff --git a/editors/offix-editor/Makefile b/editors/offix-editor/Makefile
index 8e0a0cf43b3e..00478c60e9da 100644
--- a/editors/offix-editor/Makefile
+++ b/editors/offix-editor/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:18:24 tg Exp $
 #
 
 DISTNAME=	Editor-2.4
@@ -19,7 +19,7 @@ LIB_DEPENDS=	Dnd\\.1\\.:${PORTSDIR}/x11/libdnd \
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
-USE_X11=	YES
+USE_X_PREFIX=	YES
 MAN1=		editor.1
 
 .include <bsd.port.mk>
diff --git a/editors/wily/Makefile b/editors/wily/Makefile
index 22b074a34a86..ea44edac4820 100644
--- a/editors/wily/Makefile
+++ b/editors/wily/Makefile
@@ -3,7 +3,7 @@
 # Date created:   	23 September 1997
 # Whom: 		koshy
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/17 11:53:02 tg Exp $
+# $Id: Makefile,v 1.2 1998/07/07 11:39:46 jkoshy Exp $
 #
 
 DISTNAME=	wily-0.13.36
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jkoshy@freebsd.org
 
-USE_X11=	YES
+USE_X_PREFIX=	YES
 GNU_CONFIGURE=	YES
 
 WILYDOCDIR=	${PREFIX}/share/doc/wily
diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index 8ec69f7e22b0..894e459d3c57 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 Dez 1997
 # Whom:			dirk.meyer@dinoex.sub.org
 #
-# $Id: Makefile,v 1.1.1.1 1998/02/21 21:24:35 steve Exp $
+# $Id: Makefile,v 1.2 1998/02/22 08:34:59 fenner Exp $
 
 DISTNAME=	FrodoV4_1a.Src
 PKGNAME=	frodo-4.1
@@ -14,7 +14,7 @@ MAINTAINER=	dirk.meyer@dinoex.sub.org
 
 RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
 
-USE_X11=	YES
+USE_X_PREFIX=	YES
 ALL_TARGET=	Frodo
 WRKSRC=		${WRKDIR}/Frodo/Src
 
diff --git a/emulators/ines/Makefile b/emulators/ines/Makefile
index 137944a053dc..1dff46605075 100644
--- a/emulators/ines/Makefile
+++ b/emulators/ines/Makefile
@@ -3,7 +3,7 @@
 # Date created:		02 November 1996
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.5 1997/08/24 20:27:22 max Exp $
+# $Id: Makefile,v 1.6 1998/01/26 09:43:36 vanilla Exp $
 #
 
 DISTNAME=	iNES07-FreeBSD-80x86-bin
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
 WRKSRC=		${WRKDIR}/NES
-USE_X11=	yes
+USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
 do-install:
diff --git a/emulators/mastergear/Makefile b/emulators/mastergear/Makefile
index a8f495ee366c..adf0e631e3e2 100644
--- a/emulators/mastergear/Makefile
+++ b/emulators/mastergear/Makefile
@@ -3,7 +3,7 @@
 # Date created:        02 November 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.4 1997/07/01 11:40:41 tg Exp $
+# $Id: Makefile,v 1.5 1998/01/25 17:03:52 steve Exp $
 #
 
 DISTNAME=	SMS
@@ -14,7 +14,7 @@ DISTFILES=	MG.tar.Z
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mg ${PREFIX}/bin
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 2b4c18c939c8..2635698afae5 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -3,7 +3,7 @@
 # Date created:         20 July 1997
 # Whom:                 Yukihiro Nakai<Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/02 14:56:42 jseger Exp $
+# $Id: Makefile,v 1.2 1998/07/27 01:00:43 steve Exp $
 #
 
 DISTNAME=	s9x.linux.105.i386
@@ -18,7 +18,7 @@ RUN_DEPENDS=    /compat/linux/lib/libc.so.5:${PORTSDIR}/emulators/linux_lib
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 STRIP=
 BINOWN=		root
diff --git a/emulators/vgb/Makefile b/emulators/vgb/Makefile
index 877f5cf4289c..494d17c2666c 100644
--- a/emulators/vgb/Makefile
+++ b/emulators/vgb/Makefile
@@ -3,7 +3,7 @@
 # Date created:        31 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.3 1996/11/29 19:47:00 torstenb Exp $
+# $Id: Makefile,v 1.4 1997/04/30 03:18:00 asami Exp $
 #
 
 DISTNAME=	GB
@@ -14,8 +14,8 @@ DISTFILES=	VGB.tar.Z
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
-USE_X11=	yes
-CONFIGURE_ENV+= X11BASE=${X11BASE}
+USE_X_PREFIX=	yes
+CONFIGURE_ENV=  X11BASE=${X11BASE}
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/gblist ${PREFIX}/bin
diff --git a/ftp/moxftp/Makefile b/ftp/moxftp/Makefile
index 63e90c265118..243a58dc9175 100644
--- a/ftp/moxftp/Makefile
+++ b/ftp/moxftp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 December 1994
 # Whom:			janek
 #
-# $Id: Makefile,v 1.13 1997/10/28 18:12:43 jseger Exp $
+# $Id: Makefile,v 1.14 1997/10/30 00:59:20 asami Exp $
 #
 
 DISTNAME=	moxftp-2.2
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.pacbell.com/X11/contrib/applications/
 EXTRACT_SUFX=	.tar.Z
 
 HAS_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 STRIP=
 MAN1=		${PROGRAM_NAME}.1
 
diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index 55f7b202f9a6..a2ae1a55b859 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -3,7 +3,7 @@
 # Date created:				2 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/03 23:27:36 mph Exp $
+# $Id: Makefile,v 1.2 1998/07/27 23:24:25 asami Exp $
 #
 
 DISTNAME=		3Dc-0.8.1
@@ -17,7 +17,7 @@ MAINTAINER=		andy@icc.surw.chel.su
 LIB_DEPENDS=		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
 			Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d
 
-USE_X11=		yes
+USE_X_PREFIX=		yes
 WRKSRC=			${WRKDIR}/3Dc
 
 do-build:
diff --git a/games/3dpong/Makefile b/games/3dpong/Makefile
index 1f92aeae634e..5a1a3e59f380 100644
--- a/games/3dpong/Makefile
+++ b/games/3dpong/Makefile
@@ -3,7 +3,7 @@
 # Date created:				10 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/04/27 03:51:02 mph Exp $
+# $Id: Makefile,v 1.2 1998/07/27 23:24:27 asami Exp $
 #
 
 DISTNAME=	3dpong.0.3
@@ -14,7 +14,7 @@ MASTER_SITES=	http://zippy.sonoma.edu/kendrick/nbs/unix/x/3dpong/
 MAINTAINER=	andy@icc.surw.chel.su
 
 MAKEFILE=	makefile
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/3dpong
 
 do-install:
diff --git a/games/KnightCap/Makefile b/games/KnightCap/Makefile
index 536bc1f6d875..6a4e8796b0b7 100644
--- a/games/KnightCap/Makefile
+++ b/games/KnightCap/Makefile
@@ -3,7 +3,7 @@
 # Date created:				10 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.2 1998/07/20 10:13:42 asami Exp $
+# $Id: Makefile,v 1.3 1998/07/27 23:24:29 asami Exp $
 #
 
 DISTNAME=	KnightCap-3.5
@@ -19,7 +19,7 @@ LIB_DEPENDS=	MesaGL\\.13\\.:${PORTSDIR}/graphics/Mesa2 \
 
 FETCH_BEFORE_ARGS=	-P
 ALL_TARGET=	KnightCap
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/Export
 
 do-install:
diff --git a/games/affenspiel/Makefile b/games/affenspiel/Makefile
index 3c2c1958eb85..cd14f2791c05 100644
--- a/games/affenspiel/Makefile
+++ b/games/affenspiel/Makefile
@@ -3,7 +3,7 @@
 # Date created:				2 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/07/04 19:26:34 steve Exp $
+# $Id: Makefile,v 1.2 1998/07/27 23:24:31 asami Exp $
 #
 
 DISTNAME=		affenspiel-1.0
@@ -15,7 +15,7 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		andy@icc.surw.chel.su
 
 WRKSRC=			${WRKDIR}/affenspiel
-USE_X11=		yes
+USE_X_PREFIX=		yes
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/affenspiel ${PREFIX}/bin
diff --git a/games/angband/Makefile b/games/angband/Makefile
index c5d2e9bdd66d..e8f0c4106ca7 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -3,7 +3,7 @@
 # Date created:        21 Feb 1997
 # Whom:                Matthew Hunt <mph@pobox.com>
 #
-# $Id: Makefile,v 1.5 1998/02/10 08:17:19 tg Exp $
+# $Id: Makefile,v 1.6 1998/04/17 23:26:22 mph Exp $
 #
 
 DISTNAME=	angband-283
@@ -14,7 +14,7 @@ DISTFILES=	angband-283.tar.gz ext-x11-283.tar.gz
 
 MAINTAINER=	mph@freebsd.org
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 DIST_SUBDIR=	angband
 
 EXTSRC=		${WRKDIR}/ext-x11-283
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index b905d869d3b8..7966d0c2f24f 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -3,7 +3,7 @@
 # Date created:				17 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.2 1998/07/20 16:34:57 asami Exp $
+# $Id: Makefile,v 1.3 1998/07/27 23:24:33 asami Exp $
 #
 
 DISTNAME=	battalion-1.4
@@ -17,7 +17,7 @@ LIB_DEPENDS=	MesaGL\\.13\\.:${PORTSDIR}/graphics/Mesa2 \
 		MesaGLU\\.13\\.:${PORTSDIR}/graphics/Mesa2
 
 ALL_TARGET=
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/battalionSource
 
 MAN6=		battalion.6
diff --git a/games/bogged/Makefile b/games/bogged/Makefile
index 26808ca1026e..cd6e648807cc 100644
--- a/games/bogged/Makefile
+++ b/games/bogged/Makefile
@@ -3,7 +3,7 @@
 # Date created:				18 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/12 23:53:06 steve Exp $
 #
 
 DISTNAME=		bogged-1.0.0
@@ -21,7 +21,7 @@ EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	${WRKDIR}
 
 NO_BUILD=		yes
-USE_X11=		yes
+USE_X_PREFIX=		yes
 WRKSRC=			${WRKDIR}
 
 post-extract:
diff --git a/games/cgoban/Makefile b/games/cgoban/Makefile
index 0ab70bc69552..3e7233e2ba6f 100644
--- a/games/cgoban/Makefile
+++ b/games/cgoban/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1996
 # Whom:                simonm@dcs.gla.ac.uk
 #
-# $Id: Makefile,v 1.6 1997/11/28 14:55:42 jseger Exp $
+# $Id: Makefile,v 1.7 1998/06/11 02:44:04 mph Exp $
 #
 
 DISTNAME=	cgoban-1.9.2
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://igs.nuri.net/Go/igs_clients/Unix/
 MAINTAINER=	simonm@dcs.gla.ac.uk
 
 GNU_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 ALL_TARGET=
 MAN6=		cgoban.6
 
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index 2959e0584b8c..470dba20edc0 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -3,7 +3,7 @@
 # Date created:				9 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/04/27 04:48:03 mph Exp $
+# $Id: Makefile,v 1.2 1998/07/27 23:24:38 asami Exp $
 #
 
 DISTNAME=	gemdropx
@@ -14,7 +14,7 @@ MASTER_SITES=	http://zippy.sonoma.edu/kendrick/nbs/unix/x/gemdropx/
 MAINTAINER=	andy@icc.surw.chel.su
 
 MAKEFILE=	makefile
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/gemdropx ${PREFIX}/bin
diff --git a/games/icbm3d/Makefile b/games/icbm3d/Makefile
index 418d8445d398..daac3ae759fb 100644
--- a/games/icbm3d/Makefile
+++ b/games/icbm3d/Makefile
@@ -3,7 +3,7 @@
 # Date created:				20 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/03/28 15:22:36 steve Exp $
+# $Id: Makefile,v 1.2 1998/07/27 23:24:40 asami Exp $
 #
 
 DISTNAME=	icbm3d.0.3
@@ -14,7 +14,7 @@ MASTER_SITES=	http://zippy.sonoma.edu/kendrick/nbs/unix/x/icbm3d/
 MAINTAINER=	andy@icc.surw.chel.su
 
 MAKEFILE=	makefile
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/icbm3d
 
 do-install:
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 7726c06dfea4..d8342aa4177f 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -3,7 +3,7 @@
 # Date created:         27. April 1996
 # Whom:                 Ronald Kuehn <kuehn@rz.tu-clausthal.de>
 #
-# $Id$
+# $Id: Makefile,v 1.8 1996/12/19 05:10:13 asami Exp $
 #
 
 DISTNAME=       imaze
@@ -22,7 +22,7 @@ LIB_DEPENDS=	xview\\.3\\.2:${PORTSDIR}/x11/xview-lib
 .endif
 
 EXTRACT_ONLY=	imaze1.3.tar.Z
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 post-extract:
 	@${CP} ${FILESDIR}/Makefile ${WRKDIR}/imaze/Makefile
diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile
index da44effb62ae..689ed4a29919 100644
--- a/games/libshhcards/Makefile
+++ b/games/libshhcards/Makefile
@@ -3,7 +3,7 @@
 # Date created:				12 April 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/02 02:35:47 mph Exp $
+# $Id: Makefile,v 1.1.1.1 1998/05/02 18:02:43 mph Exp $
 #
 
 DISTNAME=	shhcards-1.0.3
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.computas.no/users/shh/pub-unix/files/ \
 MAINTAINER=	andy@icc.surw.chel.su
 
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 do-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/shhcards.h ${PREFIX}/include
diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index 025ab0ffbc61..1ce9372bf3e2 100644
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@@ -3,7 +3,7 @@
 # Date created:				13 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.2 1998/05/17 23:09:43 mph Exp $
+# $Id: Makefile,v 1.3 1998/07/27 23:24:42 asami Exp $
 #
 
 DISTNAME=		Maelstrom-1.4.3-L2.0.6-src
@@ -15,7 +15,7 @@ MAINTAINER=		andy@icc.surw.chel.su
 
 LIB_DEPENDS=		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
-USE_X11=		yes
+USE_X_PREFIX=		yes
 WRKSRC=			${WRKDIR}/Maelstrom
 
 do-configure:
diff --git a/games/pp/Makefile b/games/pp/Makefile
index 0494ae100033..f6e4a0adedd6 100644
--- a/games/pp/Makefile
+++ b/games/pp/Makefile
@@ -3,7 +3,7 @@
 # Date created:				21 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/08/01 05:00:13 nectar Exp $
 #
 
 DISTNAME=	pp-0.01
@@ -17,7 +17,7 @@ MAINTAINER=	andy@icc.surw.chel.su
 LIB_DEPENDS=	qt\\.1\\.:${PORTSDIR}/x11/qt
 BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/ppsrc
 
 pre-build:
diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile
index feb21f9e837f..3d6b58577591 100644
--- a/games/spellcast/Makefile
+++ b/games/spellcast/Makefile
@@ -3,7 +3,7 @@
 # Date created:				28 June 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/31 19:32:38 nectar Exp $
 #
 
 DISTNAME=		spellcast-1.1
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	games/multiplayer
 
 MAINTAINER=		andy@icc.surw.chel.su
 
-USE_X11=		yes
+USE_X_PREFIX=		yes
 MAN6=			spellcast.6
 
 do-install:
diff --git a/games/xabacus/Makefile b/games/xabacus/Makefile
index eb4ae32b5d2a..9665679acb1c 100644
--- a/games/xabacus/Makefile
+++ b/games/xabacus/Makefile
@@ -3,7 +3,7 @@
 # Date created:				3 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/05 01:25:23 mph Exp $
+# $Id: Makefile,v 1.2 1998/07/27 23:24:48 asami Exp $
 #
 
 DISTNAME=		xabacus-5.4.4
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	applications
 MAINTAINER=		andy@icc.surw.chel.su
 
 GNU_CONFIGURE=		yes
-USE_X11=		yes
+USE_X_PREFIX=		yes
 REQUIRES_MOTIF=		yes
 WRKSRC=			${WRKDIR}/xabacus
 
diff --git a/games/xbl/Makefile b/games/xbl/Makefile
index add625544f85..5c51021a0d8d 100644
--- a/games/xbl/Makefile
+++ b/games/xbl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		May 25 1997
 # Whom:			pgs (original)
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/04 01:38:15 asami Exp $
+# $Id: Makefile,v 1.2 1998/02/20 18:39:48 steve Exp $
 #
 
 DISTNAME=	xbl-1.0h
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	giffunip@asme.org
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 HAS_CONFIGURE=	yes
 MANN=		xbl.n
 
diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index a9731db94eb0..0754e3769596 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -3,7 +3,7 @@
 # Date created:         20 Feb 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/02/20 09:31:36 tg Exp $
+# $Id: Makefile,v 1.2 1998/02/20 09:49:29 tg Exp $
 #
 
 DISTNAME=       xbomb-2.1
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN6=		xbomb.6
 
 post-install:
diff --git a/games/xchain/Makefile b/games/xchain/Makefile
index c9cf6064761e..33ed41bf2015 100644
--- a/games/xchain/Makefile
+++ b/games/xchain/Makefile
@@ -3,7 +3,7 @@
 # Date created:				13 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/04/27 04:36:16 mph Exp $
+# $Id: Makefile,v 1.2 1998/07/27 23:24:51 asami Exp $
 #
 
 DISTNAME=	xchain_1.0-2
@@ -15,7 +15,7 @@ MAINTAINER=	andy@icc.surw.chel.su
 
 RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/xchain-1.0
 
 MAN6=		xchain.6
diff --git a/games/xcogitate/Makefile b/games/xcogitate/Makefile
index 6434a7a49252..3bf5c1c5e0bb 100644
--- a/games/xcogitate/Makefile
+++ b/games/xcogitate/Makefile
@@ -3,7 +3,7 @@
 # Date created:				15 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.2 1998/04/28 03:30:19 mph Exp $
+# $Id: Makefile,v 1.3 1998/07/27 23:24:53 asami Exp $
 #
 
 DISTNAME=	xcogitate-1.02
@@ -14,7 +14,7 @@ MAINTAINER=	andy@icc.surw.chel.su
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/XCOGITATE_SOURCE
 
 do-build:
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 1135bad6e4e9..4397bee5d0dc 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -3,7 +3,7 @@
 # Date created:         2 Jun 1998
 # Whom:                 Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
-# $Id: Makefile,v 1.1.1.1 1998/06/07 11:03:06 dburr Exp $
+# $Id: Makefile,v 1.2 1998/07/05 23:08:31 steve Exp $
 #
 
 DISTNAME=	xconq-7.2.2
@@ -17,7 +17,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xpm
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 MAN6=		xconq.6 cconq.6
 
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index 90a8ddbfbacd..bea6a4090ead 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -3,7 +3,7 @@
 # Date created:		27 August 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.6 1997/12/25 22:29:20 asami Exp $
+# $Id: Makefile,v 1.7 1998/05/28 07:39:14 tg Exp $
 #
 
 DISTNAME=	xgalaga-2.0
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.ORG
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 HAS_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 # xgalaga has a very strange usage of these variables...
 CONFIGURE_ARGS=	--prefix=${X11BASE}/lib/X11/xgalaga \
 		--exec_prefix=${X11BASE}/bin
diff --git a/games/xjumpjump/Makefile b/games/xjumpjump/Makefile
index dd3c659b59d9..66f475a7cfe0 100644
--- a/games/xjumpjump/Makefile
+++ b/games/xjumpjump/Makefile
@@ -3,7 +3,7 @@
 # Date created:				9 April 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/04/24 01:54:53 mph Exp $
+# $Id: Makefile,v 1.2 1998/07/27 23:24:57 asami Exp $
 #
 
 DISTNAME=	xjumpjump
@@ -16,7 +16,7 @@ MAINTAINER=	andy@icc.surw.chel.su
 
 LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 pre-build:
 	@ ${RM} ${WRKSRC}/xjumpjump
diff --git a/games/xlines/Makefile b/games/xlines/Makefile
index 9c0c99ffce53..1f83e4ff4f5c 100644
--- a/games/xlines/Makefile
+++ b/games/xlines/Makefile
@@ -3,7 +3,7 @@
 # Date created:				11 February 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.2 1998/07/11 00:39:24 steve Exp $
+# $Id: Makefile,v 1.3 1998/07/27 23:25:03 asami Exp $
 #
 
 DISTNAME=	xlines
@@ -16,7 +16,7 @@ MAINTAINER=	andy@icc.surw.chel.su
 LIB_DEPENDS=	qt\\.1\\.:${PORTSDIR}/x11/qt
 BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
 
 pre-build:
diff --git a/games/xmastermind/Makefile b/games/xmastermind/Makefile
index bfde725c9b71..c5fa408f404b 100644
--- a/games/xmastermind/Makefile
+++ b/games/xmastermind/Makefile
@@ -3,7 +3,7 @@
 # Date created:				23 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/18 14:18:40 tg Exp $
+# $Id: Makefile,v 1.2 1998/07/27 23:25:04 asami Exp $
 #
 
 DISTNAME=		xmastermind-0.1
@@ -15,7 +15,7 @@ MAINTAINER=		andy@icc.surw.chel.su
 
 LIB_DEPENDS=		xforms\\.0\\.:${PORTSDIR}/x11/xforms
 
-USE_X11=		yes
+USE_X_PREFIX=		yes
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/xmastermind ${PREFIX}/bin
diff --git a/games/xminehunter/Makefile b/games/xminehunter/Makefile
index 7f3fbecfd370..2afc0c9c8724 100644
--- a/games/xminehunter/Makefile
+++ b/games/xminehunter/Makefile
@@ -3,7 +3,7 @@
 # Date created:		09 January 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1997/02/13 10:21:24 asami Exp $
+# $Id: Makefile,v 1.4 1997/02/21 15:41:27 tg Exp $
 #
 
 DISTNAME=	xminehunter-0.4
@@ -15,7 +15,7 @@ MAINTAINER=	tg@FreeBSD.ORG
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/xminehunter
 REQUIRES_MOTIF=	yes
 ALL_TARGET=	xminehunter
diff --git a/games/xneko/Makefile b/games/xneko/Makefile
index bb739918d3f1..60095a5a522b 100644
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 December 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.6 1997/03/12 08:21:35 asami Exp $
+# $Id: Makefile,v 1.7 1998/07/27 23:25:06 asami Exp $
 #
 
 DISTNAME=	xneko
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
 
 MAINTAINER=	markm@FreeBSD.ORG
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 IGNOREFILES=	${DISTFILES}
 WRKSRC=		${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xneko
 
diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index e38c3c4d9d52..ed0d2190416a 100644
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@@ -3,7 +3,7 @@
 # Date created:				2 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.2 1998/03/16 03:19:02 hoek Exp $
+# $Id: Makefile,v 1.3 1998/07/27 23:25:09 asami Exp $
 #
 
 DISTNAME=	xnibbles-1.0BETA3
@@ -17,7 +17,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 ALL_TARGET=	linux
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/xnibbles
 
 MAN6=		xnibbles.6
diff --git a/games/xothello/Makefile b/games/xothello/Makefile
index 4fef4d26172b..50e945d324ab 100644
--- a/games/xothello/Makefile
+++ b/games/xothello/Makefile
@@ -3,7 +3,7 @@
 # Date created:				31 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/04/24 02:08:53 mph Exp $
+# $Id: Makefile,v 1.2 1998/07/27 23:25:15 asami Exp $
 #
 
 DISTNAME=	xothello
@@ -18,7 +18,7 @@ LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms
 
 NO_CDROM=	Possible trademark infringement
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 pre-build:
 	@ ${RM} ${WRKSRC}/xothello
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index 6eeab06e1ebd..a0bc883c3593 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 March 1997
 # Whom:			Matthew Hunt <mph@pobox.com>
 #
-# $Id: Makefile,v 1.3 1997/09/07 02:54:16 max Exp $
+# $Id: Makefile,v 1.4 1998/04/17 23:26:24 mph Exp $
 #
 
 DISTNAME=	xpat2-1.04
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	mph@freebsd.org
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN6=		xpat2.6
 
 post-install:
diff --git a/games/xrisk/Makefile b/games/xrisk/Makefile
index 6ed0aae4195e..05aa134c586e 100644
--- a/games/xrisk/Makefile
+++ b/games/xrisk/Makefile
@@ -3,7 +3,7 @@
 # Date created:         4 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.9 1996/12/08 01:44:40 max Exp $
+# $Id: Makefile,v 1.10 1997/01/03 09:37:42 obrien Exp $
 #
 
 DISTNAME=       xrisk-2.13
@@ -13,7 +13,7 @@ EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=	swallace@FreeBSD.org
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 RESTRICTED=	"Possible trademark infringement"
 
 .include <bsd.port.mk>
diff --git a/games/xroach/Makefile b/games/xroach/Makefile
index ecdef0890091..96094ee6b66e 100644
--- a/games/xroach/Makefile
+++ b/games/xroach/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 December 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.6 1997/03/12 08:21:18 asami Exp $
+# $Id: Makefile,v 1.7 1998/07/27 23:25:22 asami Exp $
 #
 
 DISTNAME=	xroach
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
 
 MAINTAINER=	markm@FreeBSD.ORG
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 IGNOREFILES=	${DISTFILES}
 WRKSRC=		${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xroach
 
diff --git a/games/xroads/Makefile b/games/xroads/Makefile
index 2899c2123de5..cc916c5e06e9 100644
--- a/games/xroads/Makefile
+++ b/games/xroads/Makefile
@@ -3,7 +3,7 @@
 # Date created:				21 June 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/07/02 06:42:45 tg Exp $
+# $Id: Makefile,v 1.2 1998/07/05 11:40:46 asami Exp $
 #
 
 DISTNAME=	xroads-v0.1.5
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.geocities.com/SiliconValley/Way/1795/ \
 
 MAINTAINER=	andy@icc.surw.chel.su
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/xroads ${PREFIX}/bin
diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index 5fc307dd2d5d..361cdb72e94f 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -3,7 +3,7 @@
 # Date created:               9 Oct 1996
 # Whom:                 Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.6 1997/03/06 04:54:41 asami Exp $
+# $Id: Makefile,v 1.7 1997/11/20 02:10:57 fenner Exp $
 #
 
 DISTNAME=       xshisen-1.36
@@ -16,7 +16,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 # runs fine on ssh connection
 #IS_INTERACTIVE=	YES	# Has to create an app-defaults file
-USE_X11=	YES
+USE_X_PREFIX=	YES
 GNU_CONFIGURE=	YES
 #CONFIGURE_ARGS=--enable-japanese=euc	#Japanese char set euc, jis sjis
 MAN6=		xshisen.6
diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile
index 6fb70c045187..d0507575d454 100644
--- a/games/xshogi/Makefile
+++ b/games/xshogi/Makefile
@@ -3,7 +3,7 @@
 # Date created:        20 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/17 11:53:34 asami Exp $
+# $Id: Makefile,v 1.2 1997/01/03 09:26:34 obrien Exp $
 #
 
 DISTNAME=	xshogi-1.2p03
@@ -15,7 +15,7 @@ MAINTAINER=     Nakai@Mlab.t.u-tokyo.ac.jp
 
 RUN_DEPENDS=    ${LOCALBASE}/libexec/gnushogix:${PORTSDIR}/games/gnushogi
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAKEFILE=	Makefile.custom
 MAN6=		xshogi.6
 
diff --git a/games/xsok/Makefile b/games/xsok/Makefile
index 5d374af8384e..46e23293f023 100644
--- a/games/xsok/Makefile
+++ b/games/xsok/Makefile
@@ -3,7 +3,7 @@
 # Date created:         07 Feb 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/02/09 08:10:57 tg Exp $
 #
 
 DISTNAME=       xsok-1.02
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.ORG
 
 LIB_DEPENDS=	Xpm\\.4:${PORTSDIR}/graphics/xpm
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN6=		xsok.6x
 
 post-install:
diff --git a/games/xtris/Makefile b/games/xtris/Makefile
index 664e0b9c4f9f..626e1b759d25 100644
--- a/games/xtris/Makefile
+++ b/games/xtris/Makefile
@@ -3,7 +3,7 @@
 # Date created:         24. Sep 97
 # Whom:                 sec@42.org
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/01/25 22:29:34 steve Exp $
 #
 
 DISTNAME=       xtris-1.15
@@ -15,7 +15,7 @@ MAINTAINER=	sec@42.org
 RESTRICTED=	"Possible trademark infringement"
 WRKSRC=		${WRKDIR}/xtris
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN6=		xtris.6 xtserv.6 xtbot.6
 
 .include <bsd.port.mk>
diff --git a/games/xtruco/Makefile b/games/xtruco/Makefile
index a1d054cecfa9..5a9f9c64079f 100644
--- a/games/xtruco/Makefile
+++ b/games/xtruco/Makefile
@@ -3,7 +3,7 @@
 # Date created:				14 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/03/15 17:11:15 jseger Exp $
+# $Id: Makefile,v 1.2 1998/07/27 23:25:31 asami Exp $
 #
 
 DISTNAME=		xtruco
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	games
 
 MAINTAINER=		andy@icc.surw.chel.su
 
-USE_X11=		yes
+USE_X_PREFIX=		yes
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/xtruco ${PREFIX}/bin
diff --git a/games/xvmahjongg/Makefile b/games/xvmahjongg/Makefile
index 0c2a11e7a813..f847712c054b 100644
--- a/games/xvmahjongg/Makefile
+++ b/games/xvmahjongg/Makefile
@@ -3,7 +3,7 @@
 # Date created:				21 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/14 07:11:06 tg Exp $
+# $Id: Makefile,v 1.2 1998/07/27 23:25:33 asami Exp $
 #
 
 DISTNAME=	xvmahjongg2.1
@@ -19,7 +19,7 @@ LIB_DEPENDS=	xview\\.3\\.2:${PORTSDIR}/x11/xview-lib \
 		olgx\\.3\\.2:${PORTSDIR}/x11/xview-lib
 
 ALL_TARGET=	mahjongg.swap
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/mahjongg2.1
 MAN6=		xvmahjongg.6
 
diff --git a/games/xworm/Makefile b/games/xworm/Makefile
index 6727a0b7fe91..07d669f21e87 100644
--- a/games/xworm/Makefile
+++ b/games/xworm/Makefile
@@ -3,7 +3,7 @@
 # Date created:				18 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/07/04 19:31:54 steve Exp $
+# $Id: Makefile,v 1.2 1998/07/05 11:41:43 asami Exp $
 #
 
 DISTNAME=	xworm102
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.ekran.no/archive/x/
 MAINTAINER=	andy@icc.surw.chel.su
 
 ALL_TARGET=	freebsd
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/XWorm
 
 do-install:
diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile
index 9d775bd7b373..51893d58f9eb 100644
--- a/graphics/EZWGL/Makefile
+++ b/graphics/EZWGL/Makefile
@@ -3,7 +3,7 @@
 # Date created:				4 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.4 1998/07/27 22:12:27 asami Exp $
+# $Id: Makefile,v 1.5 1998/08/04 00:55:57 mph Exp $
 #
 
 DISTNAME=	EZWGL-1.39
@@ -16,7 +16,7 @@ MAINTAINER=	andy@icc.surw.chel.su
 LIB_DEPENDS=	jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
 
 ALL_TARGET=	shared clean static
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
 MAN3=	EZ.3 EZ_ActivateNoteBookPage.3 EZ_ActivateWidget.3 \
diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index f94685b97d7f..d22486c2226e 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.24 1998/07/20 10:14:24 asami Exp $
+# $Id: Makefile,v 1.25 1998/07/25 13:08:27 jseger Exp $
 #
 
 DISTNAME=       MesaLib-3.0beta6
@@ -17,7 +17,7 @@ MAINTAINER=	jseger@FreeBSD.ORG
 WRKSRC=		${WRKDIR}/Mesa-3.0
 
 ALL_TARGET=	freebsd
-USE_X11=	yes
+USE_X_PREFIX=	yes
 LIBS=		libMesaGL libMesaGLU
 SHLIB_VERSION=	14.0
 NO_LATEST_LINK=	yes
diff --git a/graphics/aero/Makefile b/graphics/aero/Makefile
index 8941e1a6f101..ab21ecb1c365 100644
--- a/graphics/aero/Makefile
+++ b/graphics/aero/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Aug 28 13:35:31 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.7 1997/08/11 15:16:10 erich Exp $
+# $Id: Makefile,v 1.8 1998/05/11 03:16:04 steve Exp $
 #
 
 DISTNAME=	aero_1.7.0_src
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${X11BASE}/lib/libfwf.a:${PORTSDIR}/x11/FWF
 RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray
 LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/aero/src
 MAKEFILE=	Makefile.linux
 
diff --git a/graphics/dore/Makefile b/graphics/dore/Makefile
index 98a5c9d41d2f..9d4e7315b0c7 100644
--- a/graphics/dore/Makefile
+++ b/graphics/dore/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 February 1995
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.5 1996/11/18 11:27:45 asami Exp $
+# $Id: Makefile,v 1.6 1997/04/30 03:18:01 asami Exp $
 #
 
 DISTNAME=	pdore-6.0
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.Z
 
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/dore
 EXTRACT_CMD=	mkdir -p dore; cd dore; tar
 MAKEFILE=	mk.stdx
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 30f81e60a91a..440c7a532ecf 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 June 1997
 # Whom:			brett@peloton.physics.montana.edu
 #
-# $Id: Makefile,v 1.2 1998/07/04 23:43:34 vanilla Exp $
+# $Id: Makefile,v 1.3 1998/07/18 18:45:22 vanilla Exp $
 #
 
 DISTNAME=	fnlib_DR-0.3
@@ -17,7 +17,7 @@ MAINTAINER=	vanilla@FreeBSD.ORG
 
 LIB_DEPENDS=	Imlib\\.1\\.7:${PORTSDIR}/graphics/imlib
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/fnlib
diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index eb5b5b32a1d0..7a5285ddc7a0 100644
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sun Sep  7 17:55:07 EDT 1997
 # Whom:			Randall Hopper <rhh@ct.picker.com>
 #
-# $Id: Makefile,v 1.5 1998/06/07 08:54:13 dburr Exp $
+# $Id: Makefile,v 1.6 1998/07/06 13:26:32 dburr Exp $
 #
 
 DISTNAME=	fxtv-0.47
@@ -25,8 +25,8 @@ LIB_DEPENDS=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
 #		mpeg_encode:${PORTSDIR}/graphics/mpeg_encode \
 #		mplex:${PORTSDIR}/graphics/mplex
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=      yes
-MAKE_FLAGS+=	-e
+MAKE_FLAGS=	-e
 
 .include <bsd.port.mk>
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 59490975390b..40569f3ba7f0 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -3,7 +3,7 @@
 # Date created:				5 November 1996
 # Whom:					fenner
 #
-# $Id: Makefile,v 1.4 1997/11/27 00:32:32 fenner Exp $
+# $Id: Makefile,v 1.5 1998/07/20 10:13:46 asami Exp $
 
 DISTNAME=	geomview-1.6.1
 CATEGORIES=	graphics tk42
@@ -19,7 +19,7 @@ LIB_DEPENDS=	xforms\\.0:${PORTSDIR}/x11/xforms \
 
 WRKSRC=		${WRKDIR}/Geomview
 REQUIRES_MOTIF=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 MAN1=		addbbox.1 animate.1 anytooff.1 anytoucd.1 bdy.1 clip.1 \
 		cplxview.1 crayola.1 example.1 flythrough.1 geomview.1 \
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 888a3128f9ed..18fcf86614d3 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.34 1998/06/07 03:58:38 vanilla Exp $
+# $Id: Makefile,v 1.35 1998/07/30 05:39:26 vanilla Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -24,7 +24,7 @@ LIB_DEPENDS+=	png\\.2\\.:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 #LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 888a3128f9ed..18fcf86614d3 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.34 1998/06/07 03:58:38 vanilla Exp $
+# $Id: Makefile,v 1.35 1998/07/30 05:39:26 vanilla Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -24,7 +24,7 @@ LIB_DEPENDS+=	png\\.2\\.:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 #LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 888a3128f9ed..18fcf86614d3 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.34 1998/06/07 03:58:38 vanilla Exp $
+# $Id: Makefile,v 1.35 1998/07/30 05:39:26 vanilla Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -24,7 +24,7 @@ LIB_DEPENDS+=	png\\.2\\.:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 #LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/graphics/gimp-manual-html/Makefile b/graphics/gimp-manual-html/Makefile
index a28490e8d647..49e6129cf73b 100644
--- a/graphics/gimp-manual-html/Makefile
+++ b/graphics/gimp-manual-html/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 June 1998
 # Whom:			Brett Taylor
 #
-# $Id: Makefile,v 1.1.1.1 1998/06/10 13:57:13 dburr Exp $
+# $Id: Makefile,v 1.2 1998/06/16 11:29:35 asami Exp $
 #
 
 DISTNAME=	GimpUserManual-1.0.0
@@ -48,7 +48,7 @@ WRKSRC=		${WRKDIR}/GimpUserManaul_v1.0.0
 
 BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 NO_BUILD=	yes
 
@@ -70,7 +70,7 @@ DISTFILES=	GimpUserManual-1.0.0-pdf
 EXTRACT_ONLY=	#empty
 NO_BUILD=	yes
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 post-fetch:
 	@${MKDIR} ${WRKDIR}
@@ -92,7 +92,7 @@ EXTRACT_AFTER_ARGS= > ${DISTNAME}
 
 NO_BUILD=	yes
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 pre-extract:
 	@${CP} ${PKGDIR}/PLIST_PS ${PKGDIR}/PLIST
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 888a3128f9ed..18fcf86614d3 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.34 1998/06/07 03:58:38 vanilla Exp $
+# $Id: Makefile,v 1.35 1998/07/30 05:39:26 vanilla Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -24,7 +24,7 @@ LIB_DEPENDS+=	png\\.2\\.:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 #LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 888a3128f9ed..18fcf86614d3 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.34 1998/06/07 03:58:38 vanilla Exp $
+# $Id: Makefile,v 1.35 1998/07/30 05:39:26 vanilla Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -24,7 +24,7 @@ LIB_DEPENDS+=	png\\.2\\.:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 #LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 888a3128f9ed..18fcf86614d3 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.34 1998/06/07 03:58:38 vanilla Exp $
+# $Id: Makefile,v 1.35 1998/07/30 05:39:26 vanilla Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -24,7 +24,7 @@ LIB_DEPENDS+=	png\\.2\\.:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 #LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index 28736fde8073..c988b86fd530 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -3,7 +3,7 @@
 # Date created:        21 April 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.1.1.1 1998/07/13 02:21:33 steve Exp $
+# $Id: Makefile,v 1.2 1998/07/20 18:57:55 asami Exp $
 #
 
 DISTNAME=	gtkDPS-0.2.11
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	pswrap:${PORTSDIR}/x11/dgs
 CONFIGURE_ARGS=	--with-dps-includes=${X11BASE}/include \
 		--with-dps-libraries=${X11BASE}/lib
 GNU_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/graphics/hobbes-icons-xpm/Makefile b/graphics/hobbes-icons-xpm/Makefile
index 4d2318d56c41..9d7f4d65aae9 100644
--- a/graphics/hobbes-icons-xpm/Makefile
+++ b/graphics/hobbes-icons-xpm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 October 1996
 # Whom:			pgs
 #
-# $Id: Makefile,v 1.4 1997/10/29 12:28:36 tg Exp $
+# $Id: Makefile,v 1.5 1998/02/20 18:39:48 steve Exp $
 #
 
 DISTNAME=	hobbes-icons-xpm3
@@ -16,7 +16,7 @@ MASTER_SITES=   ftp://ftp.x.org/R5contrib/  \
 
 MAINTAINER=	giffunip@asme.org
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
 # Where it will be installed (change pkg/PLIST if you change this)
diff --git a/graphics/hpscan/Makefile b/graphics/hpscan/Makefile
index 2ada90545a3d..f32543085cd0 100644
--- a/graphics/hpscan/Makefile
+++ b/graphics/hpscan/Makefile
@@ -3,7 +3,7 @@
 # Date created:		12 January 1996
 # Whom:			nate
 #
-# $Id: Makefile,v 1.10 1998/04/15 22:17:54 jseger Exp $
+# $Id: Makefile,v 1.11 1998/05/04 20:22:38 jseger Exp $
 #
 
 DISTNAME=	scanner
@@ -17,7 +17,7 @@ MAINTAINER=	nate@FreeBSD.org
 LIB_DEPENDS+=  jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
 
 NO_WRKSUBDIR=		yes
-USE_X11=		yes
+USE_X_PREFIX=		yes
 USE_IMAKE=		yes
 NO_INSTALL_MANPAGES=	yes
 
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 9d7805ee70bb..9b8b48fc0b8a 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.23 1998/07/18 18:42:21 vanilla Exp $
+# $Id: Makefile,v 1.24 1998/07/30 05:30:42 vanilla Exp $
 #
 
 DISTNAME=	imlib-1.7
@@ -21,7 +21,7 @@ LIB_DEPENDS=    png\\.2\\.:${PORTSDIR}/graphics/png \
 		gtk\\.1\\.5:${PORTSDIR}/x11/gtk
 
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
 		LIBS=-L${LOCALBASE}/lib \
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index 9d7805ee70bb..9b8b48fc0b8a 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.23 1998/07/18 18:42:21 vanilla Exp $
+# $Id: Makefile,v 1.24 1998/07/30 05:30:42 vanilla Exp $
 #
 
 DISTNAME=	imlib-1.7
@@ -21,7 +21,7 @@ LIB_DEPENDS=    png\\.2\\.:${PORTSDIR}/graphics/png \
 		gtk\\.1\\.5:${PORTSDIR}/x11/gtk
 
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
 		LIBS=-L${LOCALBASE}/lib \
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 9d7805ee70bb..9b8b48fc0b8a 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.23 1998/07/18 18:42:21 vanilla Exp $
+# $Id: Makefile,v 1.24 1998/07/30 05:30:42 vanilla Exp $
 #
 
 DISTNAME=	imlib-1.7
@@ -21,7 +21,7 @@ LIB_DEPENDS=    png\\.2\\.:${PORTSDIR}/graphics/png \
 		gtk\\.1\\.5:${PORTSDIR}/x11/gtk
 
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
 		LIBS=-L${LOCALBASE}/lib \
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index f94685b97d7f..d22486c2226e 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.24 1998/07/20 10:14:24 asami Exp $
+# $Id: Makefile,v 1.25 1998/07/25 13:08:27 jseger Exp $
 #
 
 DISTNAME=       MesaLib-3.0beta6
@@ -17,7 +17,7 @@ MAINTAINER=	jseger@FreeBSD.ORG
 WRKSRC=		${WRKDIR}/Mesa-3.0
 
 ALL_TARGET=	freebsd
-USE_X11=	yes
+USE_X_PREFIX=	yes
 LIBS=		libMesaGL libMesaGLU
 SHLIB_VERSION=	14.0
 NO_LATEST_LINK=	yes
diff --git a/graphics/mpeg2codec/Makefile b/graphics/mpeg2codec/Makefile
index bc2edfe3a727..4a3763834b68 100644
--- a/graphics/mpeg2codec/Makefile
+++ b/graphics/mpeg2codec/Makefile
@@ -3,7 +3,7 @@
 # Date created:		November 25, 1996
 # Whom:			"Philippe Charnier" <charnier@lirmm.fr>
 #
-# $Id: Makefile,v 1.2 1996/11/18 11:28:25 asami Exp $
+# $Id: Makefile,v 1.3 1996/12/09 15:37:19 erich Exp $
 #
 
 DISTNAME=	mpeg2codec-1.2
@@ -13,7 +13,7 @@ DISTFILES=	mpeg2vidcodec_v12.tar.gz
 
 MAINTAINER=	charnier@lirmm.fr
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/mpeg2
 
 do-install:
diff --git a/graphics/mpeg2play/Makefile b/graphics/mpeg2play/Makefile
index 36620bfe620e..841138404499 100644
--- a/graphics/mpeg2play/Makefile
+++ b/graphics/mpeg2play/Makefile
@@ -3,7 +3,7 @@
 # Date created:		June 21, 1996
 # Whom:			"Philippe Charnier" <charnier@lirmm.fr>
 #
-# $Id: Makefile,v 1.2 1996/11/18 11:28:32 asami Exp $
+# $Id: Makefile,v 1.3 1997/08/12 06:55:47 charnier Exp $
 #
 
 DISTNAME=	mpeg2play-1.1b
@@ -13,7 +13,7 @@ DISTFILES=	mpeg2play-1.1b.tar.gz
 
 MAINTAINER=	charnier@lirmm.fr
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 USE_IMAKE=	yes
 REQUIRES_MOTIF=	yes
 ALL_TARGET=	mpeg2play
diff --git a/graphics/mpegedit/Makefile b/graphics/mpegedit/Makefile
index d771bcb18160..0d6ac4687aaf 100644
--- a/graphics/mpegedit/Makefile
+++ b/graphics/mpegedit/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Thu Aug  1 10:50:57 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.4 1996/11/20 12:50:36 asami Exp $
+# $Id: Makefile,v 1.5 1997/08/11 14:53:41 erich Exp $
 #
 
 DISTNAME=	mpegedit_v2.2
@@ -15,6 +15,6 @@ MAINTAINER=	erich@FreeBSD.org
 
 BUILD_DEPENDS=	${PREFIX}/include/pbmplus.h:${PORTSDIR}/graphics/netpbm
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/netshow/Makefile b/graphics/netshow/Makefile
index 6f2cb9b82cc0..fbc581eb20cd 100644
--- a/graphics/netshow/Makefile
+++ b/graphics/netshow/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Thu Jun 11 22:38:52 PDT 1998
 # Whom:                 dburr@FreeBSD.ORG
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/12 06:24:53 dburr Exp $
 #
 
 DISTNAME=	netshow_linux
@@ -22,7 +22,7 @@ NO_PACKAGE=	${RESTRICTED}
 
 NO_BUILD=	yes
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 pre-extract:
 	@${MKDIR} ${WRKDIR}
diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile
index 82beb92f59fa..7b56169dd22f 100644
--- a/graphics/vcg/Makefile
+++ b/graphics/vcg/Makefile
@@ -3,7 +3,7 @@
 # Date created: 19 February 1995
 # Whom: hsu
 #
-# $Id: Makefile,v 1.5 1996/11/18 11:29:26 asami Exp $
+# $Id: Makefile,v 1.6 1996/11/18 14:01:03 asami Exp $
 #
 
 DISTNAME=	vcg.1.30
@@ -12,7 +12,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/
 DISTFILES=	vcg.1.30.r3.17.tgz
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MANL=		pbmrot90.l pbmshift.l pbm2hp.l vcgdemomaker.l vcg.l xvcg.l
 
 pre-patch:
diff --git a/graphics/xdl/Makefile b/graphics/xdl/Makefile
index c81db28e1b93..0a0385a59285 100644
--- a/graphics/xdl/Makefile
+++ b/graphics/xdl/Makefile
@@ -3,7 +3,7 @@
 # Date created:         17 July 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.4 1997/11/15 13:53:58 asami Exp $
+# $Id: Makefile,v 1.5 1997/12/25 22:29:25 asami Exp $
 #
 
 DISTNAME=	xdl-2.1
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN1=		xdl.1
 
 .include <bsd.port.mk>
diff --git a/graphics/xmfract/Makefile b/graphics/xmfract/Makefile
index d4f2c5edce0e..d7dbbe8b7c11 100644
--- a/graphics/xmfract/Makefile
+++ b/graphics/xmfract/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Thu Aug  1 09:10:22 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.3 1996/08/03 09:00:15 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/18 09:54:00 asami Exp $
 #
 
 DISTNAME=	xmfract_1.4
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	graphics
 MAINTAINER=	erich@FreeBSD.org
 
 REQUIRES_MOTIF=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index 900a4b531427..5fffbdc60022 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Thu Aug  1 09:10:22 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.6 1997/03/28 15:11:10 erich Exp $
+# $Id: Makefile,v 1.7 1998/05/07 16:18:50 vanilla Exp $
 #
 
 DISTNAME=	xmorph-11sep97
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	graphics
 
 MAINTAINER=	erich@FreeBSD.org
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 post-patch:
 	(cd ${WRKSRC}; makedepend)
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 40c8d6eccb0c..6642711d0ec6 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -3,7 +3,7 @@
 # Date created:         02 Feb 1996
 # Whom:                 chuckr@glue.umd.edu
 #
-# $Id: Makefile,v 1.11 1997/10/24 16:51:59 chuckr Exp $
+# $Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp $
 #
 
 DISTNAME=       xpdf-0.7a
@@ -16,7 +16,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gzip
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN1=		xpdf.1 pdftops.1 pdftotext.1
 
 .include <bsd.port.mk>
diff --git a/japanese/elisa10x8/Makefile b/japanese/elisa10x8/Makefile
index bb4700cc839c..80e0a2360893 100644
--- a/japanese/elisa10x8/Makefile
+++ b/japanese/elisa10x8/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 Sep 1997
 # Whom: Dai ISHIJIMA & ELISA Font Project <ishijima@tri.pref.osaka.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/09/28 14:20:17 itojun Exp $
 #
 
 DISTNAME=	ja-elisa8-1.0
@@ -16,7 +16,7 @@ DISTFILES=	elisau10.tgz clR5x8.bdf
 
 MAINTAINER=	ishijima@tri.pref.osaka.jp
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
 EXTRACT_ONLY=	elisau10.tgz
 
diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile
index 524214bb1087..696f8ce01188 100644
--- a/japanese/k10/Makefile
+++ b/japanese/k10/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 Feb 1998
 # Whom: Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/03/12 15:42:39 itojun Exp $
+# $Id: Makefile,v 1.2 1998/05/15 04:59:15 chuckr Exp $
 #
 
 DISTNAME=	knj10-1.00
@@ -13,7 +13,7 @@ MASTER_SITES=	http://gondow-www.cs.titech.ac.jp/~snagao/fonts/
 
 MAINTAINER=	usagi@clave.gr.jp
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=         ${WRKDIR}/knj10-1.00
 
 post-install:
diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile
index 91dae490f622..c38c98abda97 100644
--- a/japanese/k12/Makefile
+++ b/japanese/k12/Makefile
@@ -3,7 +3,7 @@
 # Date created:		24 June 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.3 1997/07/13 18:49:17 max Exp $
+# $Id: Makefile,v 1.4 1997/09/15 07:33:10 max Exp $
 #
 
 DISTNAME=	kaname_k12_bdf
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.noc.titech.ac.jp/pub/tmp/aki/FreeBSD/etc/
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
 
 post-install:
diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
index ee775b7774d7..6781e6ce7250 100644
--- a/japanese/kappa20/Makefile
+++ b/japanese/kappa20/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Sep 1997
 # Whom: Kawaguti Ginga <ginga@amalthea.phys.s.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/04/22 14:19:07 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/04/24 05:37:15 asami Exp $
 #
 
 DISTNAME=	Kappa20-0.2
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.st.ryukoku.ac.jp/pub/X11/fonts/ \
 
 MAINTAINER=	ginga@amalthea.phys.s.u-tokyo.ac.jp
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}"
 
 post-install:
diff --git a/japanese/rxvt/Makefile b/japanese/rxvt/Makefile
index 55cc7793483b..0ce0fbd8a694 100644
--- a/japanese/rxvt/Makefile
+++ b/japanese/rxvt/Makefile
@@ -17,6 +17,6 @@ CATEGORIES=	japanese x11
 
 MAINTAINER=	honda@kashio.info.mie-u.ac.jp
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 HAS_CONFIGURE=  yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --enable-menubar --enable-kanji --with-x
diff --git a/japanese/xklock/Makefile b/japanese/xklock/Makefile
index 7c9f71aeee19..7b8908a1f7a7 100644
--- a/japanese/xklock/Makefile
+++ b/japanese/xklock/Makefile
@@ -3,7 +3,7 @@
 # Date created:		20 April 1997
 # Whom:			nkazushi@highway.or.jp
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/02/28 23:29:17 obrien Exp $
 #
 
 DISTNAME=	xklock-2.7
@@ -21,7 +21,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	nkazushi@highway.or.jp
 
 WRKSRC=	${WRKDIR}
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 pre-configure:
 	@${MV} ${WRKDIR}/jnames.c ${WRKDIR}/jnames.c.in
diff --git a/japanese/xnetmaj/Makefile b/japanese/xnetmaj/Makefile
index c55d78a16b6b..704f71bbc559 100644
--- a/japanese/xnetmaj/Makefile
+++ b/japanese/xnetmaj/Makefile
@@ -3,7 +3,7 @@
 # Date created:        20 June 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/02/28 03:41:46 itojun Exp $
 #
 
 DISTNAME=	netmaj
@@ -14,7 +14,7 @@ DISTFILES=	netmaj-2.0.7.tar.gz netmaj-xui-2.0.7.tar.gz
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 ALL_TARGET=	libs all
 INSTALL_TARGET=	install install-pf
 
diff --git a/korean/hanterm-xf86/Makefile b/korean/hanterm-xf86/Makefile
index a53ba9e6f98f..2f3d8d29be31 100644
--- a/korean/hanterm-xf86/Makefile
+++ b/korean/hanterm-xf86/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 Mar 1997
 # Whom:			CHOI Junho <junker@jazz.snu.ac.kr>
 #
-# $Id: Makefile,v 1.5 1998/05/03 20:47:08 steve Exp $
+# $Id: Makefile,v 1.6 1998/07/27 00:38:56 steve Exp $
 #
 
 DISTNAME=	hanterm-xf331-p13
@@ -15,7 +15,7 @@ MAINTAINER=	junker@jazz.snu.ac.kr
 
 RUN_DEPENDS=	${PREFIX}/lib/X11/fonts/misc/johabm16.pcf.gz:${PORTSDIR}/korean/johabfonts
 
-USE_X11=		yes
+USE_X_PREFIX=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-x --build=i386--freebsd --prefix=${PREFIX}
 NO_INSTALL_MANPAGES=	yes
diff --git a/korean/hanyangfonts/Makefile b/korean/hanyangfonts/Makefile
index 9cb7a9fa422e..4bca9956535f 100644
--- a/korean/hanyangfonts/Makefile
+++ b/korean/hanyangfonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:         22 Mar 1997
 # Whom:                 Choi Jun Ho <junker@jazz.snu.ac.kr>
 #
-# $Id: Makefile,v 1.3 1997/09/22 16:21:52 max Exp $
+# $Id: Makefile,v 1.4 1998/04/19 17:51:34 steve Exp $
 #
 
 DISTNAME=       hanyang-font-pcf
@@ -14,7 +14,7 @@ MASTER_SITES=   ftp://ftp.kaist.ac.kr/pub/hangul/fonts/ \
 
 MAINTAINER=     junker@jazz.snu.ac.kr
 
-USE_X11=        yes
+USE_X_PREFIX=        yes
 NO_WRKSUBDIR=   yes
 
 FONTS=		hgm10 hgm12 hgm14 hgm16 hgm18 hgm20 \
diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile
index 695aba2542f6..440ddd216f1b 100644
--- a/korean/kaistfonts/Makefile
+++ b/korean/kaistfonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Fri Mar 27 17:26:42 KST 1998
 # Whom:			CHOI Junho <junker@jazz.snu.ac.kr>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/05 14:21:40 kuriyama Exp $
 #
 
 DISTNAME=	ko-kaistfonts-ksc-1.0
@@ -14,7 +14,7 @@ DISTFILES=	kaist-newmj18.bdf.gz ks_philgi16.bdf.gz \
 
 MAINTAINER=	junker@jazz.snu.ac.kr
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 NO_WRKSUBDIR=	yes
 MAKE_ENV=	DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}"
diff --git a/korean/mizifont/Makefile b/korean/mizifont/Makefile
index 2ebd978030ef..2f38ad5cacf3 100644
--- a/korean/mizifont/Makefile
+++ b/korean/mizifont/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 Mar 1998
 # Whom:			CHOI Junho <junker@jazz.snu.ac.kr>
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/09 14:19:16 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/06/27 05:19:54 asami Exp $
 #
 
 DISTNAME=	xfntmizi-1.1-1.noarch
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/misc/rpm
 
 NO_CDROM=	"Not a free software, but redistributable on FreeBSD mirrors"
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
 
 RPM2CPIO=	rpm2cpio
diff --git a/korean/pinetreefonts/Makefile b/korean/pinetreefonts/Makefile
index 929dd2b04800..46e7d42c62ee 100644
--- a/korean/pinetreefonts/Makefile
+++ b/korean/pinetreefonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 Mar 1997
 # Whom:			CHOI Junho <junker@jazz.snu.ac.kr>
 #
-# $Id: Makefile,v 1.3 1997/09/22 16:22:22 max Exp $
+# $Id: Makefile,v 1.4 1998/04/30 14:39:06 kuriyama Exp $
 #
 
 DISTNAME=       pinetree.precomposed-1.0
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.bdf.tar.gz
 
 MAINTAINER=	junker@jazz.snu.ac.kr
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 FONTS=		ptpR08 ptpR10 ptpR12 ptpR14 ptpR18 ptpR24 \
 		ptpB08 ptpB10 ptpB12 ptpB14 ptpB18 ptpB24
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index d5f6bc5cb05b..7856cc8815f5 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -4,7 +4,7 @@
 # Date created:		30 June 1996
 # Whom:			gena
 #
-# $Id: Makefile,v 1.10 1998/01/10 18:36:55 jdp Exp $
+# $Id: Makefile,v 1.11 1998/07/05 23:44:39 steve Exp $
 #
 
 DISTNAME=       xfmail-1.3
@@ -16,7 +16,7 @@ MAINTAINER=	gena@NetVision.net.il
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
 		xforms\\.0\\.88\\.1:${PORTSDIR}/x11/xforms
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 MAN1=		xfmail.1
 
diff --git a/math/Scilab/Makefile b/math/Scilab/Makefile
index fb6f53ba146d..8a53aa86ccba 100644
--- a/math/Scilab/Makefile
+++ b/math/Scilab/Makefile
@@ -3,7 +3,7 @@
 # Date created:        13 June 1997
 # Whom:                paulo@isr.uc.pt
 #
-# $Id: Makefile,v 1.2 1998/02/11 10:36:31 tg Exp $
+# $Id: Makefile,v 1.3 1998/07/25 12:54:07 asami Exp $
 #
 
 DISTNAME=	scilab-2.3.1
@@ -21,7 +21,7 @@ BROKEN=		package
 NO_CDROM=	"Don't sell for profit."
 WRKSRC=		${WRKDIR}/scilab-2.3
 HAS_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 SCIDIR= ${X11BASE}/lib/X11/scilab
 
diff --git a/math/apc/Makefile b/math/apc/Makefile
index 1c25d6f06e95..f907b644b8f1 100644
--- a/math/apc/Makefile
+++ b/math/apc/Makefile
@@ -3,7 +3,7 @@
 # Date created:		May 1 1997
 # Whom:			Eric A. Griff <eagriff@global2000.net>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/03 22:42:32 asami Exp $
+# $Id: Makefile,v 1.2 1997/10/15 22:46:03 max Exp $
 #
 
 DISTNAME=	apc-1.0
@@ -14,7 +14,7 @@ MAINTAINER= 	eagriff@global2000.net
 
 LIB_DEPENDS=	xforms\\.0\\.86:${PORTSDIR}/x11/xforms
 
-USE_X11=	YES
+USE_X_PREFIX=	YES
 MAN1=		apc.1
 MANCOMPRESSED=	YES
 
diff --git a/math/calctool/Makefile b/math/calctool/Makefile
index 5cb0b1e227ff..b53143e6e485 100644
--- a/math/calctool/Makefile
+++ b/math/calctool/Makefile
@@ -3,7 +3,7 @@
 # Date created:				2 Dec 1996
 # Whom:					nsayer@quack.kfu.com
 #
-# $Id: Makefile,v 1.1.1.1 1996/12/12 03:46:31 erich Exp $
+# $Id: Makefile,v 1.2 1996/12/12 05:28:54 asami Exp $
 #
  
 DISTNAME=       calctool-2.4pl13
@@ -13,7 +13,7 @@ MASTER_SITES=   ftp://ftp.kfu.com/pub/
  
 MAINTAINER=     nsayer@quack.kfu.com
 
-USE_X11=		yes
+USE_X_PREFIX=		yes
 MAN1=		calctool.1
 
 .include <bsd.port.mk>
diff --git a/math/femlab/Makefile b/math/femlab/Makefile
index 350b4e1c01d5..1f726dd853f9 100644
--- a/math/femlab/Makefile
+++ b/math/femlab/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 June 1997
 # Whom:			Pedro Giffuni
 #
-# $Id: Makefile,v 1.1.1.1 1997/09/16 07:04:58 tg Exp $
+# $Id: Makefile,v 1.2 1997/09/17 06:29:25 asami Exp $
 #
 
 DISTNAME=	femlab-2d-v1.1
@@ -17,7 +17,7 @@ MAINTAINER=	giffunip@asme.org
 BUILD_DEPENDS=	${PREFIX}/lib/libsx.a:${PORTSDIR}/x11/libsx
 
 WRKSRC=         ${WRKDIR}/${PKGNAME}
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 FEMLAB_HOME=	${PREFIX}/lib/X11/femlab
 
diff --git a/math/freefem/Makefile b/math/freefem/Makefile
index f1c621943549..869be384af9b 100644
--- a/math/freefem/Makefile
+++ b/math/freefem/Makefile
@@ -3,7 +3,7 @@
 # Date created:        20 December 1996
 # Whom:                Pedro Giffuni
 #
-# $Id: Makefile,v 1.4 1998/02/20 18:39:52 steve Exp $
+# $Id: Makefile,v 1.5 1998/04/01 02:23:51 asami Exp $
 #
 
 DISTNAME=	freefem-3.4
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.asci.fr/~prudhomm/gfem-html/freefem/
 
 MAINTAINER=     giffunip@asme.org
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-adapt --with-optimization
 
diff --git a/math/kaskade/Makefile b/math/kaskade/Makefile
index 41e839f8a0ba..dc536683c5b6 100644
--- a/math/kaskade/Makefile
+++ b/math/kaskade/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 Sept. 1997
 # Whom:			Pedro Giffuni
 #
-# $Id: Makefile,v 1.2 1997/11/22 09:56:34 asami Exp $
+# $Id: Makefile,v 1.3 1997/11/26 23:10:55 jseger Exp $
 #
 
 DISTNAME=	3.1.1
@@ -18,7 +18,7 @@ DIST_SUBDIR=	kaskade
 WRKSRC=         ${WRKDIR}/3.1
 MAKEFILE=	makefile
 ALL_TARGET=	k6
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 do-install:
 	$(INSTALL_PROGRAM) $(WRKSRC)/k6 $(PREFIX)/bin
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index fb6f53ba146d..8a53aa86ccba 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -3,7 +3,7 @@
 # Date created:        13 June 1997
 # Whom:                paulo@isr.uc.pt
 #
-# $Id: Makefile,v 1.2 1998/02/11 10:36:31 tg Exp $
+# $Id: Makefile,v 1.3 1998/07/25 12:54:07 asami Exp $
 #
 
 DISTNAME=	scilab-2.3.1
@@ -21,7 +21,7 @@ BROKEN=		package
 NO_CDROM=	"Don't sell for profit."
 WRKSRC=		${WRKDIR}/scilab-2.3
 HAS_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 SCIDIR= ${X11BASE}/lib/X11/scilab
 
diff --git a/math/siag/Makefile b/math/siag/Makefile
index c9a476d71c74..1c9851a59940 100644
--- a/math/siag/Makefile
+++ b/math/siag/Makefile
@@ -3,7 +3,7 @@
 # Date created:		27 Jan 1998
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.3 1998/03/07 00:21:29 itojun Exp $
+# $Id: Makefile,v 1.4 1998/07/06 17:41:14 itojun Exp $
 #
 
 DISTNAME=	siag-2.80
@@ -15,7 +15,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} tsiag-2.80.tar.gz
 
 MAINTAINER=	itojun@itojun.org
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/siag
 
 do-build:
diff --git a/math/wingz/Makefile b/math/wingz/Makefile
index d60ca27f9dcc..23bbfd597b86 100644
--- a/math/wingz/Makefile
+++ b/math/wingz/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Wed Nov 27 09:15:10 CST 1996
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.3 1997/05/28 05:33:09 fenner Exp $
+# $Id: Makefile,v 1.4 1997/07/13 18:49:25 max Exp $
 #
 
 DISTNAME=	Wingz-142
@@ -18,7 +18,7 @@ RUN_DEPENDS=    /compat/linux/lib/libc.so.5:${PORTSDIR}/emulators/linux_lib
 
 NO_WRKSUBDIR=	yes
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 post-install:
 	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
diff --git a/math/wingz3/Makefile b/math/wingz3/Makefile
index d60ca27f9dcc..23bbfd597b86 100644
--- a/math/wingz3/Makefile
+++ b/math/wingz3/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Wed Nov 27 09:15:10 CST 1996
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.3 1997/05/28 05:33:09 fenner Exp $
+# $Id: Makefile,v 1.4 1997/07/13 18:49:25 max Exp $
 #
 
 DISTNAME=	Wingz-142
@@ -18,7 +18,7 @@ RUN_DEPENDS=    /compat/linux/lib/libc.so.5:${PORTSDIR}/emulators/linux_lib
 
 NO_WRKSUBDIR=	yes
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 post-install:
 	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
diff --git a/math/xgfe/Makefile b/math/xgfe/Makefile
index 524710b8d829..e814e8d633d2 100644
--- a/math/xgfe/Makefile
+++ b/math/xgfe/Makefile
@@ -3,7 +3,7 @@
 # Date created:        24 March 1998
 # Whom:                Matthew Hunt <mph@pobox.com>
 #
-# $Id: Makefile,v 1.3 1998/04/18 00:08:43 mph Exp $
+# $Id: Makefile,v 1.4 1998/06/10 19:12:47 mph Exp $
 #
 
 DISTNAME=	xgfe-2.0
@@ -15,7 +15,7 @@ MAINTAINER=	mph@freebsd.org
 LIB_DEPENDS=	qt\\.1\\.3:${PORTSDIR}/x11/qt
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 MAKE_ENV=	X11BASE=$(X11BASE) PREFIX=$(PREFIX)
 .if defined(NOPORTDOCS)
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index 04c9236e17e5..fbd0d5f009ca 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -3,7 +3,7 @@
 # Date created:         20 Dec 97
 # Whom:                 Pedro Giffuni <giffunip@asme.org>
 #
-# $Id: Makefile,v 1.1.1.1 1998/04/27 05:25:00 mph Exp $
+# $Id: Makefile,v 1.2 1998/05/25 21:03:04 fenner Exp $
 #
 
 DISTNAME=	xldlas-0.85
@@ -20,7 +20,7 @@ LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms
 
 WRKSRC=		${WRKDIR}/xldlas
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 MAN1=	xldlas.1
 
diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile
index c0c139eb22af..3ce170d5e44a 100644
--- a/math/xmgr/Makefile
+++ b/math/xmgr/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So   2 M�r 1997 12:11:43 MET
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.6 1998/04/30 08:52:05 tg Exp $
+# $Id: Makefile,v 1.7 1998/06/29 18:46:39 andreas Exp $
 #
 
 DISTNAME=	xmgr-4.1.1
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${X11BASE}/lib/libhlpclient.a:${PORTSDIR}/x11/libhelp \
 		${LOCALBASE}/lib/libmfhdf.a:${PORTSDIR}/graphics/hdf
 LIB_DEPENDS=	Xbae\\.6\\.:${PORTSDIR}/x11/xbae
 
-USE_X11=	YES
+USE_X_PREFIX=	YES
 REQUIRE_MOTIF=	YES
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS=	-prefix=${X11BASE} \
diff --git a/math/xplot/Makefile b/math/xplot/Makefile
index 3d31131edbc1..3e5acffc1ac2 100644
--- a/math/xplot/Makefile
+++ b/math/xplot/Makefile
@@ -3,7 +3,7 @@
 # Date created:		3 March 1997
 # Whom:			fenner
 #
-# $Id: Makefile,v 1.1.1.1 1997/03/06 01:23:08 asami Exp $
+# $Id: Makefile,v 1.2 1998/03/20 19:25:35 fenner Exp $
 #
 
 DISTNAME=	xplot-0.90
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://mercury.lcs.mit.edu/pub/shep/
 
 MAINTAINER=	fenner@FreeBSD.ORG
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
 XPLOT_DEMOS=	demo.0 demo.1 demo.2 demo.3 demo.4 demo.5 demo.6 demo.7
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index f52e9ff29740..db29746247fd 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 October 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.15 1997/09/13 16:58:21 fenner Exp $
+# $Id: Makefile,v 1.17 1998/03/20 14:35:13 tg Exp $
 #
 
 DISTNAME=	imm-3.5a1
@@ -16,7 +16,7 @@ MAINTAINER=	fenner@freebsd.org
 
 LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/freebsd
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index 57bcddda7989..bb7d2cb6e6b2 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -3,7 +3,7 @@
 # Date created:				5 September 1996
 # Whom:	      Bill Fenner <fenner@FreeBSD.ORG>
 #
-#   $Id: Makefile,v 1.6 1997/04/20 13:19:23 wosch Exp $
+#   $Id: Makefile,v 1.7 1997/09/25 04:12:57 fenner Exp $
 #
 
 DISTNAME=	nt.1.5a23
@@ -22,7 +22,7 @@ LIB_DEPENDS=	tk42\\.1:${TK_DIR}
 RESTRICTED=	"Contains DES encryption"
 NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 # Pass this on to our child
 MAKE_ENV=	TK_SRC=${TK_SRC}
 
diff --git a/mbone/rtpmon/Makefile b/mbone/rtpmon/Makefile
index db0224c9f7e8..dd0e7a705283 100644
--- a/mbone/rtpmon/Makefile
+++ b/mbone/rtpmon/Makefile
@@ -3,7 +3,7 @@
 # Date created:				1 November 1996
 # Whom:	      Bill Fenner <fenner@FreeBSD.ORG>
 #
-#   $Id: Makefile,v 1.5 1997/09/25 00:10:58 fenner Exp $
+#   $Id: Makefile,v 1.6 1998/02/21 22:38:06 fenner Exp $
 #
 
 DISTNAME=	rtpmon-1.0a7
@@ -16,7 +16,7 @@ LIB_DEPENDS=	tk42\\.1:${PORTSDIR}/x11/tk42
 BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
 
 GNU_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN1=		rtpmon.1
 
 pre-configure:
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 931db11628ce..c24964712d58 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -3,7 +3,7 @@
 # Date created:				5 September 1996
 # Whom:	      Bill Fenner <fenner@FreeBSD.ORG>
 #
-#   $Id: Makefile,v 1.6 1997/10/15 20:35:20 fenner Exp $
+#   $Id: Makefile,v 1.7 1997/12/19 00:52:04 fenner Exp $
 #
 
 DISTNAME=	sdr.V2.4a7n
@@ -18,7 +18,7 @@ LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
 NO_WRKSUBDIR=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 # src/libs.tcl is autogenerated from the tcl/tk installed on the
 # build system, so we shouldn't use the one in the distribution.
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index c1044f5e594b..e4454f5fc2fb 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -3,7 +3,7 @@
 # Date created:		2 November 1996
 # Whom:			fenner
 #
-# $Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp $
+# $Id: Makefile,v 1.5 1998/06/26 19:05:26 fenner Exp $
 #
 
 DISTNAME=	vat-4.0b2
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build
 LIB_DEPENDS=	tk80:${PORTSDIR}/x11/tk80 \
 		gsm:${GSM_DIR}
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--with-gsm=${GSM_WORK}
 INSTALL_TARGET=	install install-man
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index 6cb385672d3f..07da14b75db3 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14 December 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.14 1998/03/17 07:47:52 tg Exp $
+# $Id: Makefile,v 1.15 1998/06/26 18:39:14 fenner Exp $
 #
 
 DISTNAME=	vic-2.8
@@ -16,7 +16,7 @@ MAINTAINER=	fenner@FreeBSD.ORG
 LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
 
 USE_AUTOCONF=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN1=		vic.1
 
 post-install:
diff --git a/mbone/wb/Makefile b/mbone/wb/Makefile
index 2903fd787c83..0aedeff88638 100644
--- a/mbone/wb/Makefile
+++ b/mbone/wb/Makefile
@@ -3,7 +3,7 @@
 # Date created:		2 Novermber 1996
 # Whom:			fenner
 #
-# $Id: Makefile,v 1.2 1996/11/18 11:33:42 asami Exp $
+# $Id: Makefile,v 1.3 1998/06/24 05:17:29 fenner Exp $
 #
 
 DISTNAME=       wb-1.59
@@ -15,7 +15,7 @@ MAINTAINER=	fenner@FreeBSD.ORG
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 # XXX ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript5
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index 4fe7817b7ce5..3f669b7950b1 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -3,7 +3,7 @@
 # Date created:         8 May 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.7 1996/11/17 09:05:59 obrien Exp $
+# $Id: Makefile,v 1.8 1997/04/20 13:19:32 wosch Exp $
 #
 
 DISTNAME=       kp-0.96
@@ -14,7 +14,7 @@ MAINTAINER=	asami@FreeBSD.org
 
 RUN_DEPENDS=	wish4.1:${PORTSDIR}/x11/tk41
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN1=		kp.1
 
 .include <bsd.port.mk>
diff --git a/misc/xpns/Makefile b/misc/xpns/Makefile
index 00b0b98a34e2..c6e010875dc5 100644
--- a/misc/xpns/Makefile
+++ b/misc/xpns/Makefile
@@ -3,7 +3,7 @@
 # Date created:         6 Apr 97
 # Whom:                 Pedro Giffuni
 #
-# $Id: Makefile,v 1.2 1997/06/29 09:38:20 obrien Exp $
+# $Id: Makefile,v 1.3 1998/02/20 18:39:56 steve Exp $
 #
 
 DISTNAME=	pns_source
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	giffunip@asme.org
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile 
 ALL_TARGET=	pns
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index eb5b5b32a1d0..7a5285ddc7a0 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sun Sep  7 17:55:07 EDT 1997
 # Whom:			Randall Hopper <rhh@ct.picker.com>
 #
-# $Id: Makefile,v 1.5 1998/06/07 08:54:13 dburr Exp $
+# $Id: Makefile,v 1.6 1998/07/06 13:26:32 dburr Exp $
 #
 
 DISTNAME=	fxtv-0.47
@@ -25,8 +25,8 @@ LIB_DEPENDS=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
 #		mpeg_encode:${PORTSDIR}/graphics/mpeg_encode \
 #		mplex:${PORTSDIR}/graphics/mplex
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=      yes
-MAKE_FLAGS+=	-e
+MAKE_FLAGS=	-e
 
 .include <bsd.port.mk>
diff --git a/multimedia/mpeg2codec/Makefile b/multimedia/mpeg2codec/Makefile
index bc2edfe3a727..4a3763834b68 100644
--- a/multimedia/mpeg2codec/Makefile
+++ b/multimedia/mpeg2codec/Makefile
@@ -3,7 +3,7 @@
 # Date created:		November 25, 1996
 # Whom:			"Philippe Charnier" <charnier@lirmm.fr>
 #
-# $Id: Makefile,v 1.2 1996/11/18 11:28:25 asami Exp $
+# $Id: Makefile,v 1.3 1996/12/09 15:37:19 erich Exp $
 #
 
 DISTNAME=	mpeg2codec-1.2
@@ -13,7 +13,7 @@ DISTFILES=	mpeg2vidcodec_v12.tar.gz
 
 MAINTAINER=	charnier@lirmm.fr
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/mpeg2
 
 do-install:
diff --git a/multimedia/mpeg2play/Makefile b/multimedia/mpeg2play/Makefile
index 36620bfe620e..841138404499 100644
--- a/multimedia/mpeg2play/Makefile
+++ b/multimedia/mpeg2play/Makefile
@@ -3,7 +3,7 @@
 # Date created:		June 21, 1996
 # Whom:			"Philippe Charnier" <charnier@lirmm.fr>
 #
-# $Id: Makefile,v 1.2 1996/11/18 11:28:32 asami Exp $
+# $Id: Makefile,v 1.3 1997/08/12 06:55:47 charnier Exp $
 #
 
 DISTNAME=	mpeg2play-1.1b
@@ -13,7 +13,7 @@ DISTFILES=	mpeg2play-1.1b.tar.gz
 
 MAINTAINER=	charnier@lirmm.fr
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 USE_IMAKE=	yes
 REQUIRES_MOTIF=	yes
 ALL_TARGET=	mpeg2play
diff --git a/multimedia/mpegedit/Makefile b/multimedia/mpegedit/Makefile
index d771bcb18160..0d6ac4687aaf 100644
--- a/multimedia/mpegedit/Makefile
+++ b/multimedia/mpegedit/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Thu Aug  1 10:50:57 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.4 1996/11/20 12:50:36 asami Exp $
+# $Id: Makefile,v 1.5 1997/08/11 14:53:41 erich Exp $
 #
 
 DISTNAME=	mpegedit_v2.2
@@ -15,6 +15,6 @@ MAINTAINER=	erich@FreeBSD.org
 
 BUILD_DEPENDS=	${PREFIX}/include/pbmplus.h:${PORTSDIR}/graphics/netpbm
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 .include <bsd.port.mk>
diff --git a/multimedia/netshow/Makefile b/multimedia/netshow/Makefile
index 6f2cb9b82cc0..fbc581eb20cd 100644
--- a/multimedia/netshow/Makefile
+++ b/multimedia/netshow/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Thu Jun 11 22:38:52 PDT 1998
 # Whom:                 dburr@FreeBSD.ORG
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/12 06:24:53 dburr Exp $
 #
 
 DISTNAME=	netshow_linux
@@ -22,7 +22,7 @@ NO_PACKAGE=	${RESTRICTED}
 
 NO_BUILD=	yes
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 pre-extract:
 	@${MKDIR} ${WRKDIR}
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index 6cb385672d3f..07da14b75db3 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14 December 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.14 1998/03/17 07:47:52 tg Exp $
+# $Id: Makefile,v 1.15 1998/06/26 18:39:14 fenner Exp $
 #
 
 DISTNAME=	vic-2.8
@@ -16,7 +16,7 @@ MAINTAINER=	fenner@FreeBSD.ORG
 LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
 
 USE_AUTOCONF=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN1=		vic.1
 
 post-install:
diff --git a/net/imm/Makefile b/net/imm/Makefile
index f52e9ff29740..db29746247fd 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 October 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.15 1997/09/13 16:58:21 fenner Exp $
+# $Id: Makefile,v 1.17 1998/03/20 14:35:13 tg Exp $
 #
 
 DISTNAME=	imm-3.5a1
@@ -16,7 +16,7 @@ MAINTAINER=	fenner@freebsd.org
 
 LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/freebsd
diff --git a/net/sdr/Makefile b/net/sdr/Makefile
index 931db11628ce..c24964712d58 100644
--- a/net/sdr/Makefile
+++ b/net/sdr/Makefile
@@ -3,7 +3,7 @@
 # Date created:				5 September 1996
 # Whom:	      Bill Fenner <fenner@FreeBSD.ORG>
 #
-#   $Id: Makefile,v 1.6 1997/10/15 20:35:20 fenner Exp $
+#   $Id: Makefile,v 1.7 1997/12/19 00:52:04 fenner Exp $
 #
 
 DISTNAME=	sdr.V2.4a7n
@@ -18,7 +18,7 @@ LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
 NO_WRKSUBDIR=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 # src/libs.tcl is autogenerated from the tcl/tk installed on the
 # build system, so we shouldn't use the one in the distribution.
diff --git a/net/wb/Makefile b/net/wb/Makefile
index 2903fd787c83..0aedeff88638 100644
--- a/net/wb/Makefile
+++ b/net/wb/Makefile
@@ -3,7 +3,7 @@
 # Date created:		2 Novermber 1996
 # Whom:			fenner
 #
-# $Id: Makefile,v 1.2 1996/11/18 11:33:42 asami Exp $
+# $Id: Makefile,v 1.3 1998/06/24 05:17:29 fenner Exp $
 #
 
 DISTNAME=       wb-1.59
@@ -15,7 +15,7 @@ MAINTAINER=	fenner@FreeBSD.ORG
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 # XXX ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript5
diff --git a/palm/xcopilot/Makefile b/palm/xcopilot/Makefile
index 41a731dd2d2d..05d52b5cd4ad 100644
--- a/palm/xcopilot/Makefile
+++ b/palm/xcopilot/Makefile
@@ -3,7 +3,7 @@
 # Date created:         July 17 1997
 # Whom:                 Nick Sayer <nsayer@quack.kfu.com>
 #
-# $Id: Makefile,v 1.2 1997/11/25 07:38:50 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/01 17:29:10 asami Exp $
 #
 
 DISTNAME=       xcopilot-v0.4
@@ -19,6 +19,6 @@ MAINTAINER=     nsayer@quack.kfu.com
 
 LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 .include <bsd.port.mk>
diff --git a/print/asprint/Makefile b/print/asprint/Makefile
index acb3d077abb3..112e7fa21d85 100644
--- a/print/asprint/Makefile
+++ b/print/asprint/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 August 1997
 # Whom:			brett@peloton.physics.montana.edu
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/11/04 13:42:42 tg Exp $
 #
 
 DISTNAME=	asprint
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://afterstep.foo.net/pub/AfterStep/apps/asprint/
 
 MAINTAINER=	brett@peloton.physics.montana.edu
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 ALL_TARGET=	asprint
 MAKEFILE=	makefile
 
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index 416299d8a53f..cff133033187 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		4 Mar 1998
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.2 1998/03/30 08:49:47 obrien Exp $
+# $Id: Makefile,v 1.3 1998/05/29 07:19:01 tg Exp $
 #
 
 DISTNAME=	mgv-2.4.3
@@ -15,7 +15,7 @@ MAINTAINER=	ports@freebsd.org
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 REQUIRES_MOTIF=	yes
 MAKEFILE=	GNUmakefile
 MAN1=		mgv.1
diff --git a/print/offix-printer/Makefile b/print/offix-printer/Makefile
index b5b066b36468..b8eac252990f 100644
--- a/print/offix-printer/Makefile
+++ b/print/offix-printer/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:30:47 tg Exp $
 #
 
 DISTNAME=	Printer-2.4
@@ -19,7 +19,7 @@ LIB_DEPENDS=	Dnd\\.1\\.:${PORTSDIR}/x11/libdnd \
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
-USE_X11=	YES
+USE_X_PREFIX=	YES
 MAN1=		printer.1
 
 .include <bsd.port.mk>
diff --git a/russian/X.language/Makefile b/russian/X.language/Makefile
index 8c848b26d79a..5480ad0b75f5 100644
--- a/russian/X.language/Makefile
+++ b/russian/X.language/Makefile
@@ -3,7 +3,7 @@
 # Date created:         31 Aug 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.18 1998/07/29 16:11:22 ache Exp $
+# $Id: Makefile,v 1.20 1998/08/03 08:49:00 ache Exp $
 #
 
 DISTNAME=       ru-X11-3.3
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${X11BASE}/bin/xinit:${PORTSDIR}/x11/XFree86
 
 NO_WRKSUBDIR=   YES
 NO_BUILD=       YES
-USE_X11=        YES
+USE_X_PREFIX=   YES
 
 PKGTMP = ${X11BASE}/.Xinstmp
 XLIB = ${X11BASE}/lib/X11
diff --git a/russian/netscape4.language/Makefile b/russian/netscape4.language/Makefile
index 239f9f3a97a2..42c12d563d90 100644
--- a/russian/netscape4.language/Makefile
+++ b/russian/netscape4.language/Makefile
@@ -3,7 +3,7 @@
 # Date created:         8 Apr 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.12 1996/12/08 01:15:22 max Exp $
+# $Id: Makefile,v 1.13 1998/06/27 05:19:29 asami Exp $
 #
 
 PKGNAME=        ru-netscape-3.01
@@ -18,7 +18,7 @@ RESTRICTED=     "Includes a copyrighted file from Netscape"
 NO_EXTRACT=     YES
 NO_BUILD=       YES
 NO_WRKDIR=      YES
-USE_X11=        YES
+USE_X_PREFIX=   YES
 
 APPDEF = ${X11BASE}/lib/X11/app-defaults
 
diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile
index b2390d16b7c6..aa0368464e9f 100644
--- a/sysutils/xlogmaster/Makefile
+++ b/sysutils/xlogmaster/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 July 1998
 # Whom:			Adrian Wontroba <aw1@stade.co.uk>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/12 22:49:03 steve Exp $
 #
 
 DISTNAME=	xlogmaster-1.2.2
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 
 MAN1=		xlogmaster.1
 WRKSRC=		${WRKDIR}/xlogmaster
-USE_X11=	yes
+USE_X_PREFIX=	yes
 NO_PACKAGE=	ignores cflags
 
 post-install:
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 0eac44a2ac96..3f6d47617c31 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 Nov 1997
 # Whom:			Brian Handy <handy@physics.montana.edu>
 #
-# $Id: Makefile,v 1.4 1998/05/22 06:36:00 mph Exp $
+# $Id: Makefile,v 1.5 1998/06/04 20:33:16 steve Exp $
 #
 
 DISTNAME=	xosview-1.6.1.a
@@ -14,7 +14,7 @@ MASTER_SITES=	http://lore.ece.utexas.edu/~bgrayson/xosview/ \
 MAINTAINER=	handy@physics.montana.edu
 
 FETCH_BEFORE_ARGS=	-b
-USE_X11=	yes
+USE_X_PREFIX=	yes
 HAS_CONFIGURE=	yes
 MAN1=		xosview.1
 
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index 16b7ee67d2d8..dc9e64676c9c 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -3,7 +3,7 @@
 # Date created:         7 August 1995
 # Whom:                 torstenb
 #
-# $Id: Makefile,v 1.14 1998/05/10 22:15:45 steve Exp $
+# $Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp $
 #
 
 DISTNAME=       Mosaic-src-2.7b5
@@ -18,7 +18,7 @@ LIB_DEPENDS=    jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 REQUIRES_MOTIF=	yes
 WRKSRC=		${WRKDIR}/Mosaic-src
 ALL_TARGET=	bsdi
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/Mosaic ${PREFIX}/bin
diff --git a/www/ashe/Makefile b/www/ashe/Makefile
index 8597f2ab963d..23d4308d0838 100644
--- a/www/ashe/Makefile
+++ b/www/ashe/Makefile
@@ -5,7 +5,7 @@
 #
 # WARNING WARNING: Requires Motif to compile & link
 #
-# $Id: Makefile,v 1.3 1996/04/11 08:59:26 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/18 11:40:39 asami Exp $
 #
 
 DISTNAME=	ashe-1.1.2
@@ -17,6 +17,6 @@ DISTFILES=	ashe_cci.tar.Z cci.tar.Z libhtmlw.tar.Z
 
 REQUIRES_MOTIF=	yes
 NO_WRKSUBDIR=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 .include <bsd.port.mk>
diff --git a/www/vrweb/Makefile b/www/vrweb/Makefile
index f1398f226b09..938331491d04 100644
--- a/www/vrweb/Makefile
+++ b/www/vrweb/Makefile
@@ -3,7 +3,7 @@
 # Date created:        20 June 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.4 1998/04/23 16:50:35 mph Exp $
+# $Id: Makefile,v 1.5 1998/07/20 10:13:53 asami Exp $
 #
 
 DISTNAME=	vrweb-1.5
@@ -16,7 +16,7 @@ MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 LIB_DEPENDS=	GL\\.13\\.:${PORTSDIR}/graphics/Mesa2
 
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 do-configure:
 	(cd ${WRKSRC}; \
diff --git a/x11-clocks/rclock/Makefile b/x11-clocks/rclock/Makefile
index 34a323bf3211..9a8030afc0eb 100644
--- a/x11-clocks/rclock/Makefile
+++ b/x11-clocks/rclock/Makefile
@@ -4,7 +4,7 @@
 # Date created:			  24th Feburary 1997
 # Whom:				  obrien@NUXI.com
 #
-# $Id: Makefile,v 1.10 1996/12/08 02:30:29 obrien Exp $
+# $Id: Makefile,v 1.1.1.1 1997/03/03 16:27:10 obrien Exp $
 #
 
 PKGNAME=	rclock-2.20
@@ -19,7 +19,7 @@ MASTER_SITE_SUBDIR=	utils/file/managers/mc/rxvt
 MAINTAINER=	obrien@FreeBSD.org
 
 CFLAGS+=	'-DMAIL_SPOOL=\"/var/mail/\"'
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=  yes
 ALL_TARGET=	clock
 MAN1=		rclock.1
diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile
index ce5871187f52..b3dbc0f8d676 100644
--- a/x11-fm/dfm/Makefile
+++ b/x11-fm/dfm/Makefile
@@ -3,7 +3,7 @@
 # Date created:				25 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/11 03:41:58 mph Exp $
 #
 
 DISTNAME=	dfm-0.9.8
@@ -15,7 +15,7 @@ MAINTAINER=	andy@icc.surw.chel.su
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
 		xforms\\.0\\.:${PORTSDIR}/x11/xforms
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 WRKSRC=		${WRKDIR}/dfm
 
diff --git a/x11-fm/offix-files/Makefile b/x11-fm/offix-files/Makefile
index fa1d341d0429..06078c38e45c 100644
--- a/x11-fm/offix-files/Makefile
+++ b/x11-fm/offix-files/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:27:04 tg Exp $
 #
 
 DISTNAME=	Files-2.4
@@ -22,7 +22,7 @@ LIB_DEPENDS=	Dnd\\.1\\.:${PORTSDIR}/x11/libdnd \
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
-USE_X11=	YES
+USE_X_PREFIX=	YES
 MAN1=		files.1
 MAN3=		regexp.3
 
diff --git a/x11-fm/workplace/Makefile b/x11-fm/workplace/Makefile
index ebe18d8f03d9..14358a3893f3 100644
--- a/x11-fm/workplace/Makefile
+++ b/x11-fm/workplace/Makefile
@@ -3,7 +3,7 @@
 # Date created:				7 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.2 1998/03/28 22:18:38 asami Exp $
+# $Id: Makefile,v 1.3 1998/04/14 07:59:03 tg Exp $
 #
 
 DISTNAME=	workplace-1.0.a3
@@ -16,7 +16,7 @@ MAINTAINER=	andy@icc.surw.chel.su
 LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11/gtk
 
 GNU_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 pre-configure:
 	@ ${RM} ${WRKSRC}/config.cache
diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile
index 7baf7d6479c7..8a9f2d565c0b 100644
--- a/x11-fm/x-files/Makefile
+++ b/x11-fm/x-files/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14 April 1998
 # Whom:			Donald J. Maddox <dmaddox@scsn.net>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/04/29 23:46:01 mph Exp $
 #
 
 DISTNAME=       X-Files-1.43
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
 
 WRKSRC=		${WRKDIR}/X-Files
 NO_BUILD=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 pre-install:
 	@wish8.0 ${SCRIPTDIR}/mktclIndex ${WRKSRC}
@@ -33,4 +33,6 @@ xfilesrc xflogo.gif
 	@${INSTALL_DATA} ${WRKSRC}/X-Files.xpm ${X11BASE}/include/X11/pixmaps
 	@${INSTALL_MAN} ${WRKSRC}/X-Files.1x ${X11BASE}/man/man1
 
+BROKEN=		DISPLAY
+
 .include <bsd.port.mk>
diff --git a/x11-fonts/Xg/Makefile b/x11-fonts/Xg/Makefile
index d879ea13ddd2..16ab7e46a2c7 100644
--- a/x11-fonts/Xg/Makefile
+++ b/x11-fonts/Xg/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.3 1996/11/12 02:19:36 obrien Exp $
+# $Id: Makefile,v 1.4 1997/01/27 15:59:35 erich Exp $
 #
 
 DISTNAME=	libXg.utf.fonts
@@ -14,6 +14,6 @@ MASTER_SITES=	ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 MAINTAINER=	erich@FreeBSD.org
 
 NO_WRKSUBDIR=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile
index f4e050bc19f1..512486b7f7d6 100644
--- a/x11-fonts/etlfonts/Makefile
+++ b/x11-fonts/etlfonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:		3 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.2 1997/01/02 19:32:25 max Exp $
+# $Id: Makefile,v 1.3 1997/07/13 18:49:31 max Exp $
 #
 
 DISTNAME=	non-cjk
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	mita@jp.FreeBSD.org
 
 EXTRACT_ARGS=	-xf
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 post-extract:
 	@gunzip ${WRKSRC}/*.gz
diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile
index beb7c358a9be..a529e37c1132 100644
--- a/x11-fonts/freefonts/Makefile
+++ b/x11-fonts/freefonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Thu Aug  1 21:32:14 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.4 1997/11/30 19:19:41 vanilla Exp $
+# $Id: Makefile,v 1.5 1997/12/04 13:58:06 vanilla Exp $
 #
 
 DISTNAME=	freefonts-0.10
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/fonts/
 MAINTAINER=	erich@FreeBSD.org
 
 NO_WRKSUBDIR=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 post-install:
 	@cat ${PKGDIR}/DESCR
diff --git a/x11-fonts/getbdf/Makefile b/x11-fonts/getbdf/Makefile
index e4c2a9413a3e..750254449255 100644
--- a/x11-fonts/getbdf/Makefile
+++ b/x11-fonts/getbdf/Makefile
@@ -3,7 +3,7 @@
 # Date created:         30 August 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.3 1996/08/31 05:11:40 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/18 11:43:12 asami Exp $
 #
 
 DISTNAME=       getbdf
@@ -14,7 +14,7 @@ EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=     ache@FreeBSD.org
 
-USE_X11=        yes
+USE_X_PREFIX=   yes
 NO_WRKSUBDIR=   yes
 ALL_TARGET=     getbdf
 
diff --git a/x11-fonts/sharefonts/Makefile b/x11-fonts/sharefonts/Makefile
index d11147724b19..ff7aa69ac941 100644
--- a/x11-fonts/sharefonts/Makefile
+++ b/x11-fonts/sharefonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Thu Mar 26 04:50:00 PST 1998
 # Whom:                 dburr@FreeBSD.ORG
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/16 02:08:03 dburr Exp $
 #
 
 DISTNAME=	sharefonts-0.10
@@ -18,7 +18,7 @@ NO_PACKAGE=	${RESTRICTED}
 
 NO_BUILD=	yes
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 do-install:
 	${MKDIR} ${PREFIX}/lib/X11/fonts/sharefont
diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile
index 8a1beef27eee..dcb54d9f70e3 100644
--- a/x11-fonts/xmbdfed/Makefile
+++ b/x11-fonts/xmbdfed/Makefile
@@ -3,7 +3,7 @@
 # Date created:		June 20, 1997
 # Whom:			jfieber
 #
-# $Id: Makefile,v 1.3 1997/11/09 15:43:24 jfieber Exp $
+# $Id: Makefile,v 1.4 1998/03/12 23:09:54 jfieber Exp $
 #
 
 DISTNAME=	xmbdfed-2.7
@@ -17,7 +17,7 @@ PATCH_SITES=	${MASTER_SITES}
 
 BROKEN=		old version not available, new version needs debugging
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 REQUIRES_MOTIF=	yes
 
 MAN1=		xmbdfed.1
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 75ff15d96637..ad26c08489f9 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/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-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 75ff15d96637..ad26c08489f9 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/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-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index ee2af7f01b72..aa432d3ed0bb 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -3,7 +3,7 @@
 # Date created:		December 10, 1996
 # Whom:			1wardd@airmail.net
 #
-# $Id: Makefile,v 1.19 1998/06/05 06:33:35 tg Exp $
+# $Id: Makefile,v 1.20 1998/07/01 11:35:32 tg Exp $
 #
 
 DISTNAME=	lesstif-0.85
@@ -19,7 +19,7 @@ MANUAL_PACKAGE_BUILD=	do not want to install during interactive build
 GNU_CONFIGURE=  yes
 # comment this and remove the strip statement in post-install for debugging
 CONFIGURE_ARGS=	--disable-debug
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 MAN1=	mwm.1 xmbind.1 lesstif.1
 MAN3=	XmClipboard.3 LessTifInternals.3 \
diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index a72fb65b65f6..d7e6b5a2d3b1 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.18 1998/07/20 16:51:14 andreas Exp $
+# $Id: Makefile,v 1.19 1998/07/21 14:05:32 asami Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
@@ -17,8 +17,8 @@ LIB_DEPENDS=	MesaGL\\.13\\.:${PORTSDIR}/graphics/Mesa2
 MAJ=		1
 MIN=		40
 USE_GMAKE=	yes
-USE_X11=	yes
-MAKE_ENV+=	QTDIR=${WRKSRC}
+USE_X_PREFIX=	yes
+MAKE_ENV=	QTDIR=${WRKSRC}
 
 MAN1=	moc.1
 MAN3=	QAccel.3qt QApplication.3qt QArray.3qt QAsyncIO.3qt \
diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index a72fb65b65f6..d7e6b5a2d3b1 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.18 1998/07/20 16:51:14 andreas Exp $
+# $Id: Makefile,v 1.19 1998/07/21 14:05:32 asami Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
@@ -17,8 +17,8 @@ LIB_DEPENDS=	MesaGL\\.13\\.:${PORTSDIR}/graphics/Mesa2
 MAJ=		1
 MIN=		40
 USE_GMAKE=	yes
-USE_X11=	yes
-MAKE_ENV+=	QTDIR=${WRKSRC}
+USE_X_PREFIX=	yes
+MAKE_ENV=	QTDIR=${WRKSRC}
 
 MAN1=	moc.1
 MAN3=	QAccel.3qt QApplication.3qt QArray.3qt QAsyncIO.3qt \
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index a72fb65b65f6..d7e6b5a2d3b1 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.18 1998/07/20 16:51:14 andreas Exp $
+# $Id: Makefile,v 1.19 1998/07/21 14:05:32 asami Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
@@ -17,8 +17,8 @@ LIB_DEPENDS=	MesaGL\\.13\\.:${PORTSDIR}/graphics/Mesa2
 MAJ=		1
 MIN=		40
 USE_GMAKE=	yes
-USE_X11=	yes
-MAKE_ENV+=	QTDIR=${WRKSRC}
+USE_X_PREFIX=	yes
+MAKE_ENV=	QTDIR=${WRKSRC}
 
 MAN1=	moc.1
 MAN3=	QAccel.3qt QApplication.3qt QArray.3qt QAsyncIO.3qt \
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index a72fb65b65f6..d7e6b5a2d3b1 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.18 1998/07/20 16:51:14 andreas Exp $
+# $Id: Makefile,v 1.19 1998/07/21 14:05:32 asami Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
@@ -17,8 +17,8 @@ LIB_DEPENDS=	MesaGL\\.13\\.:${PORTSDIR}/graphics/Mesa2
 MAJ=		1
 MIN=		40
 USE_GMAKE=	yes
-USE_X11=	yes
-MAKE_ENV+=	QTDIR=${WRKSRC}
+USE_X_PREFIX=	yes
+MAKE_ENV=	QTDIR=${WRKSRC}
 
 MAN1=	moc.1
 MAN3=	QAccel.3qt QApplication.3qt QArray.3qt QAsyncIO.3qt \
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index a72fb65b65f6..d7e6b5a2d3b1 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.18 1998/07/20 16:51:14 andreas Exp $
+# $Id: Makefile,v 1.19 1998/07/21 14:05:32 asami Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
@@ -17,8 +17,8 @@ LIB_DEPENDS=	MesaGL\\.13\\.:${PORTSDIR}/graphics/Mesa2
 MAJ=		1
 MIN=		40
 USE_GMAKE=	yes
-USE_X11=	yes
-MAKE_ENV+=	QTDIR=${WRKSRC}
+USE_X_PREFIX=	yes
+MAKE_ENV=	QTDIR=${WRKSRC}
 
 MAN1=	moc.1
 MAN3=	QAccel.3qt QApplication.3qt QArray.3qt QAsyncIO.3qt \
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index a72fb65b65f6..d7e6b5a2d3b1 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.18 1998/07/20 16:51:14 andreas Exp $
+# $Id: Makefile,v 1.19 1998/07/21 14:05:32 asami Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
@@ -17,8 +17,8 @@ LIB_DEPENDS=	MesaGL\\.13\\.:${PORTSDIR}/graphics/Mesa2
 MAJ=		1
 MIN=		40
 USE_GMAKE=	yes
-USE_X11=	yes
-MAKE_ENV+=	QTDIR=${WRKSRC}
+USE_X_PREFIX=	yes
+MAKE_ENV=	QTDIR=${WRKSRC}
 
 MAN1=	moc.1
 MAN3=	QAccel.3qt QApplication.3qt QArray.3qt QAsyncIO.3qt \
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index a72fb65b65f6..d7e6b5a2d3b1 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.18 1998/07/20 16:51:14 andreas Exp $
+# $Id: Makefile,v 1.19 1998/07/21 14:05:32 asami Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
@@ -17,8 +17,8 @@ LIB_DEPENDS=	MesaGL\\.13\\.:${PORTSDIR}/graphics/Mesa2
 MAJ=		1
 MIN=		40
 USE_GMAKE=	yes
-USE_X11=	yes
-MAKE_ENV+=	QTDIR=${WRKSRC}
+USE_X_PREFIX=	yes
+MAKE_ENV=	QTDIR=${WRKSRC}
 
 MAN1=	moc.1
 MAN3=	QAccel.3qt QApplication.3qt QArray.3qt QAsyncIO.3qt \
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index 4875b76bb414..338d5d3916ba 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -3,7 +3,7 @@
 # Date created:        5 March 1997
 # Whom:                Pedro Giffuni
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/03 22:53:07 asami Exp $
+# $Id: Makefile,v 1.2 1998/02/20 18:39:58 steve Exp $
 #
 
 DISTNAME=	SlingShot2.1
@@ -17,7 +17,7 @@ MAINTAINER=	giffunip@asme.org
 LIB_DEPENDS=	xview\\.3\\.:${PORTSDIR}/x11/xview-lib
 
 WRKSRC=		$(WRKDIR)/sspkg2.1
-USE_X11=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 MAKE_ENV=       OPENWINHOME=$(X11BASE)
 
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index c50c25c2c768..419f13f3350b 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -3,7 +3,7 @@
 # Date created:         8 Feb 1998
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1998/07/19 06:56:14 dburr Exp $
+# $Id: Makefile,v 1.5 1998/07/25 12:51:12 asami Exp $
 #
 
 DISTNAME=	v-1.19
@@ -16,7 +16,7 @@ BROKEN=		fetch
 
 WRKSRC=		${WRKDIR}/v
 
-USE_X11=	YES
+USE_X_PREFIX=	YES
 USE_GMAKE=	YES
 MAKE_ENV=	INSTALLDIR=${PREFIX} HOMEV=${WRKSRC}
 
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index 0e3b63405575..824d01b9d4ee 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -3,7 +3,7 @@
 # Date created:		28 March 1997
 # Whom:			gena
 #
-# $Id: Makefile,v 1.15 1998/02/09 02:02:24 jseger Exp $
+# $Id: Makefile,v 1.16 1998/05/12 06:34:18 tg Exp $
 #
 
 DISTNAME=	bxform-088
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gena@NetVision.net.il
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/xforms
 MAN1=		fdesign.1 fd2ps.1
 MAN5=		xforms.5
diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile
index ca6a48456b24..d16de02b701c 100644
--- a/x11-toolkits/xview-clients/Makefile
+++ b/x11-toolkits/xview-clients/Makefile
@@ -3,7 +3,7 @@
 # Date created:         22 November 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.10 1996/11/15 16:12:19 erich Exp $
+# $Id: Makefile,v 1.11 1996/11/16 10:49:52 asami Exp $
 #
 
 DISTNAME=	xview-clients
@@ -14,7 +14,7 @@ DEPENDS=        ${PORTSDIR}/x11/xview-lib
 
 WRKSRC=      	${PORTSDIR}/x11/xview-config/work/xview3.2p1-X11R6/clients
 NO_WRKDIR=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 do-fetch:
 do-extract:	# don't use NO_EXTRACT, dependency won't work
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index f39f572c9938..a544ec108468 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -3,7 +3,7 @@
 # Date created:		October 29th 1996
 # Whom:			jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.17 1997/05/17 19:48:20 jfitz Exp $
+# $Id: Makefile,v 1.18 1997/06/07 02:55:41 jfitz Exp $
 #
 
 DISTNAME=	AfterStep-1.0
@@ -15,7 +15,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 INSTALL_TARGET=	install install.man
 MANCOMPRESSED=	yes
 MAN1=		afterstep.1 asclock.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1
diff --git a/x11-wm/amiwm/Makefile b/x11-wm/amiwm/Makefile
index 633b43338dc8..4eb854c0a9e3 100644
--- a/x11-wm/amiwm/Makefile
+++ b/x11-wm/amiwm/Makefile
@@ -3,7 +3,7 @@
 # Date created: 13 November 1997
 # Whom: Douglas Carmichael <dcarmich@mcs.com>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/11/14 09:37:44 tg Exp $
 #
 
 DISTNAME=	amiwm0.20pl28
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/amiwm
 GNU_CONFIGURE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 MAN1=		amiwm.1
 
 post-install:
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 34a4ad1a0af1..cde7c77b8284 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -3,7 +3,7 @@
 # Date created:        10 June 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.17 1998/07/20 17:02:01 vanilla Exp $
+# $Id: Makefile,v 1.18 1998/07/20 17:38:13 vanilla Exp $
 #
 
 DISTNAME=	enlightenment-0.14
@@ -21,7 +21,7 @@ LIB_DEPENDS=	esd\\.0\\.0:${PORTSDIR}/audio/esound \
 		Imlib\\.1\\.7:${PORTSDIR}/graphics/imlib
 
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS=-L${LOCALBASE}/lib
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 34a4ad1a0af1..cde7c77b8284 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:        10 June 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.17 1998/07/20 17:02:01 vanilla Exp $
+# $Id: Makefile,v 1.18 1998/07/20 17:38:13 vanilla Exp $
 #
 
 DISTNAME=	enlightenment-0.14
@@ -21,7 +21,7 @@ LIB_DEPENDS=	esd\\.0\\.0:${PORTSDIR}/audio/esound \
 		Imlib\\.1\\.7:${PORTSDIR}/graphics/imlib
 
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS=-L${LOCALBASE}/lib
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 34a4ad1a0af1..cde7c77b8284 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -3,7 +3,7 @@
 # Date created:        10 June 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.17 1998/07/20 17:02:01 vanilla Exp $
+# $Id: Makefile,v 1.18 1998/07/20 17:38:13 vanilla Exp $
 #
 
 DISTNAME=	enlightenment-0.14
@@ -21,7 +21,7 @@ LIB_DEPENDS=	esd\\.0\\.0:${PORTSDIR}/audio/esound \
 		Imlib\\.1\\.7:${PORTSDIR}/graphics/imlib
 
 USE_GMAKE=	yes
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS=-L${LOCALBASE}/lib
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index b1546562fd5d..00031a4ed522 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa   1 Feb 1997 14:46:05 MET
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.16 1997/12/04 22:47:32 vanilla Exp $
+# $Id: Makefile,v 1.17 1997/12/24 01:21:18 alex Exp $
 #
 
 DISTNAME=	fvwm95-2.0.43a-Autoconf
@@ -18,7 +18,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 BUILD_DEPENDS=	${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
 RUN_DEPENDS=	${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --includedir=${LOCALBASE}/include \
 		--libdir=${LOCALBASE}/lib
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index b1546562fd5d..00031a4ed522 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa   1 Feb 1997 14:46:05 MET
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.16 1997/12/04 22:47:32 vanilla Exp $
+# $Id: Makefile,v 1.17 1997/12/24 01:21:18 alex Exp $
 #
 
 DISTNAME=	fvwm95-2.0.43a-Autoconf
@@ -18,7 +18,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 BUILD_DEPENDS=	${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
 RUN_DEPENDS=	${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --includedir=${LOCALBASE}/include \
 		--libdir=${LOCALBASE}/lib
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 7b3683c4072c..3759d79013e4 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -3,7 +3,7 @@
 # Date created:        10 August 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.11 1998/07/03 08:19:24 asami Exp $
+# $Id: Makefile,v 1.12 1998/07/27 00:40:53 steve Exp $
 #
 
 DISTNAME=	icewm-0.9.10
@@ -15,7 +15,7 @@ MAINTAINER=	Nakai@technologist.com
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 
 pre-patch:
 .if defined(TITLE_BOTTOM)
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 83d8d6bedbaf..3f5bb212b2ae 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -3,7 +3,7 @@
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.16 1998/07/08 14:48:52 tg Exp $
+# $Id: Makefile,v 1.17 1998/07/28 06:17:29 tg Exp $
 
 DISTNAME=	WindowMaker-0.17.5
 PKGNAME=	windowmaker-0.17.5
@@ -19,7 +19,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
 		png\\.2\\.:${PORTSDIR}/graphics/png \
 		tiff34\\.1:${PORTSDIR}/graphics/tiff34
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE}
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 83d8d6bedbaf..3f5bb212b2ae 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -3,7 +3,7 @@
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.16 1998/07/08 14:48:52 tg Exp $
+# $Id: Makefile,v 1.17 1998/07/28 06:17:29 tg Exp $
 
 DISTNAME=	WindowMaker-0.17.5
 PKGNAME=	windowmaker-0.17.5
@@ -19,7 +19,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
 		png\\.2\\.:${PORTSDIR}/graphics/png \
 		tiff34\\.1:${PORTSDIR}/graphics/tiff34
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE}
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile
index 50bda1597699..2dc44a5874b1 100644
--- a/x11-wm/wm2/Makefile
+++ b/x11-wm/wm2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 February 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/07/08 06:23:30 max Exp $
 #
 
 DISTNAME=	wm2-3
@@ -13,7 +13,7 @@ MASTER_SITES=   http://www.netcomuk.co.uk/~cannam/
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/wm2
 ALL_TARGET=	depend wm2
 
diff --git a/x11-wm/wmx/Makefile b/x11-wm/wmx/Makefile
index bf59c32ccbd0..8b66c7c5cc2e 100644
--- a/x11-wm/wmx/Makefile
+++ b/x11-wm/wmx/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11. Jan 1998
 # Whom:			Stefan Zehl <sec@42.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/24 10:52:08 max Exp $
 #
 
 DISTNAME=	wmx-4
@@ -15,7 +15,7 @@ MAINTAINER=	sec@42.org
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
-USE_X11=	yes
+USE_X_PREFIX=	yes
 ALL_TARGET=	depend wmx
 
 do-install:
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
author	Satoshi Asami <asami@FreeBSD.org>	1998-08-05 09:31:52 +0000
committer	Satoshi Asami <asami@FreeBSD.org>	1998-08-05 09:31:52 +0000
commit	ceba2112833ea325577af308d27cad5d00490059 (patch)
tree	43770c600bd76bb00bd98dc59b4e2b6d76064eb1
parent	4f43ab018ab882c42157803c6c7856dce3689cdc (diff)
download	ports-ceba2112833ea325577af308d27cad5d00490059.tar.gz ports-ceba2112833ea325577af308d27cad5d00490059.zip