12 files changed, 24 insertions, 24 deletions

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: