summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cad/geda/Makefile4
-rw-r--r--cad/spice/Makefile4
-rw-r--r--comms/xisp/Makefile4
-rw-r--r--converters/kdesupport/Makefile4
-rw-r--r--converters/xdeview/Makefile4
-rw-r--r--databases/gtksql/Makefile4
-rw-r--r--devel/glade/Makefile4
-rw-r--r--devel/libgtop/Makefile4
-rw-r--r--editors/xvile/Makefile4
-rw-r--r--emulators/bochs/Makefile4
-rw-r--r--emulators/vice/Makefile4
-rw-r--r--emulators/wine/Makefile4
-rw-r--r--emulators/xmame/Makefile4
-rw-r--r--emulators/xmess/Makefile4
-rw-r--r--fonts/Xg/Makefile4
-rw-r--r--games/abuse/Makefile4
-rw-r--r--games/battalion/Makefile4
-rw-r--r--games/craft/Makefile4
-rw-r--r--games/finalbattle/Makefile4
-rw-r--r--games/galaxa/Makefile4
-rw-r--r--games/gemdropx/Makefile4
-rw-r--r--games/golddig/Makefile4
-rw-r--r--games/icbm3d/Makefile4
-rw-r--r--games/imaze/Makefile4
-rw-r--r--games/kdegames/Makefile4
-rw-r--r--games/lincity/Makefile4
-rw-r--r--games/maelstrom/Makefile4
-rw-r--r--games/mirrormagic/Makefile4
-rw-r--r--games/spellcast/Makefile4
-rw-r--r--games/tanked/Makefile4
-rw-r--r--games/wormz/Makefile4
-rw-r--r--games/xbomber/Makefile4
-rw-r--r--games/xdoom/Makefile4
-rw-r--r--games/xevil/Makefile4
-rw-r--r--games/xgalaga/Makefile4
-rw-r--r--games/xnibbles/Makefile4
-rw-r--r--games/xworm/Makefile4
-rw-r--r--games/xzip/Makefile4
-rw-r--r--graphics/Mesa/Makefile4
-rw-r--r--graphics/fnlib/Makefile4
-rw-r--r--graphics/gimp/Makefile4
-rw-r--r--graphics/hp2xx/Makefile4
-rw-r--r--graphics/imlib/Makefile4
-rw-r--r--graphics/kdegraphics/Makefile4
-rw-r--r--graphics/mpeg2codec/Makefile4
-rw-r--r--graphics/plotutils/Makefile4
-rw-r--r--graphics/sane/Makefile4
-rw-r--r--graphics/xpdf/Makefile4
-rw-r--r--graphics/xplot/Makefile4
-rw-r--r--mail/coolmail/Makefile4
-rw-r--r--mail/faces/Makefile4
-rw-r--r--mail/wmmail/Makefile4
-rw-r--r--mail/xfmail/Makefile4
-rw-r--r--math/abacus/Makefile4
-rw-r--r--math/abs/Makefile4
-rw-r--r--math/scilab/Makefile4
-rw-r--r--math/vista/Makefile4
-rw-r--r--math/xldlas/Makefile4
-rw-r--r--math/xlispstat/Makefile4
-rw-r--r--mbone/rat/Makefile4
-rw-r--r--mbone/sdr/Makefile4
-rw-r--r--mbone/vic/Makefile4
-rw-r--r--misc/astrolog/Makefile4
-rw-r--r--misc/kdeutils/Makefile4
-rw-r--r--mk/bsd.pkg.mk12
-rw-r--r--net/gaim/Makefile4
-rw-r--r--net/kdenetwork/Makefile4
-rw-r--r--net/pload/Makefile4
-rw-r--r--plan9/Xg/Makefile4
-rw-r--r--sysutils/asapm/Makefile4
-rw-r--r--sysutils/xosview/Makefile4
-rw-r--r--textproc/t1libx/Makefile4
-rw-r--r--www/Mosaic/Makefile4
-rw-r--r--www/arena/Makefile4
-rw-r--r--www/mozilla/Makefile4
-rw-r--r--x11/afterstep/Makefile4
-rw-r--r--x11/amiwm/Makefile4
-rw-r--r--x11/asclock/Makefile4
-rw-r--r--x11/dxpc/Makefile4
-rw-r--r--x11/enlightenment/Makefile4
-rw-r--r--x11/filerunner/Makefile4
-rw-r--r--x11/fvwm-wharf/Makefile4
-rw-r--r--x11/fvwm95/Makefile4
-rw-r--r--x11/gnome-core/Makefile4
-rw-r--r--x11/gnome-libs/Makefile4
-rw-r--r--x11/gtk/Makefile4
-rw-r--r--x11/gtk10/Makefile4
-rw-r--r--x11/gtkglarea/Makefile4
-rw-r--r--x11/kdebase/Makefile4
-rw-r--r--x11/kdelibs/Makefile4
-rw-r--r--x11/lesstif/Makefile4
-rw-r--r--x11/qt/Makefile4
-rw-r--r--x11/rclock/Makefile4
-rw-r--r--x11/rxvt/Makefile4
-rw-r--r--x11/tk80/Makefile4
-rw-r--r--x11/windowmaker/Makefile4
-rw-r--r--x11/wmthemes/Makefile4
-rw-r--r--x11/xforms/Makefile4
-rw-r--r--x11/xglobe/Makefile4
-rw-r--r--x11/xlockmore/Makefile4
-rw-r--r--x11/xneko/Makefile4
-rw-r--r--x11/xpns/Makefile4
-rw-r--r--x11/xscreensaver/Makefile4
-rw-r--r--x11/xtermset/Makefile4
-rw-r--r--x11/xwrits/Makefile4
105 files changed, 214 insertions, 214 deletions
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 60a907ee3c5..a22b53ed005 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/12/31 12:05:52 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:44 agc Exp $
#
DISTNAME= gEDA-19981213
@@ -16,7 +16,7 @@ DEPENDS+= guile-1.3:../../lang/guile
CONFLICTS= gEDA-19981117
GNU_CONFIGURE= yes
-USE_X11= yes
+USE_X11BASE= yes
USE_LIBTOOL= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index ad9ce95e9c5..f44134b3060 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/08/26 14:17:15 tsarna Exp $
+# $NetBSD: Makefile,v 1.8 1999/01/30 23:18:45 agc Exp $
# FreeBSD Id: Makefile,v 1.10 1998/06/08 09:21:37 tg Exp
#
@@ -17,7 +17,7 @@ HOMEPAGE= http://infopad.eecs.berkeley.edu/~icdesign/SPICE/
#PATCH_SITES= ftp://ilpsoft.eecs.berkeley.edu/pub/SPICE3F5/
#PATCHFILES= grid.patch newcoms.patch spsmp.patch
-USE_X11= yes
+USE_X11BASE= yes
NO_WRKSUBDIR= yes
do-configure:
diff --git a/comms/xisp/Makefile b/comms/xisp/Makefile
index e44cb63c507..25e59088e2c 100644
--- a/comms/xisp/Makefile
+++ b/comms/xisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/01/16 17:26:03 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:45 agc Exp $
#
DISTNAME= xisp-2.5p4
@@ -14,7 +14,7 @@ DEPENDS+= xforms-0.88:../../x11/xforms
ONLY_FOR_ARCHS= arm32 i386 m68k sparc ns32k
-USE_X11= yes
+USE_X11BASE= yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xisp
diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile
index 792ef464dfe..17cfe664fca 100644
--- a/converters/kdesupport/Makefile
+++ b/converters/kdesupport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1998/12/29 19:42:09 tron Exp $
+# $NetBSD: Makefile,v 1.18 1999/01/30 23:18:45 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp
#
@@ -14,7 +14,7 @@ DEPENDS+= qt-1.42:../../x11/qt
CONFLICTS= kdesupport-2.1b kdesupport-3.1b kdesupport-4.1b
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index 2911a027e32..10913775360 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/09/28 13:43:36 tron Exp $
+# $NetBSD: Makefile,v 1.12 1999/01/30 23:18:45 agc Exp $
# FreeBSD Id: Makefile,v 1.11 1998/02/24 21:43:45 jseger Exp
#
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.informatik.uni-frankfurt.de/~fp/uudeview/
DEPENDS+= tk-8.0p2:../../x11/tk80
DEPENDS+= uulib-0.5.13:../../converters/uulib
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-tcl="${LOCALBASE}" --enable-tk="${LOCALBASE}"
# Season to taste --- anything over tcl7.5
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index 788085d1e6b..5022d57ee3b 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/01/17 00:56:43 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:45 agc Exp $
#
DISTNAME= gtksql-0.2
@@ -15,7 +15,7 @@ DEPENDS+= postgresql-6.4.2:../../databases/postgresql
# restriction inherit from postgresql
NOT_FOR_ARCHS= alpha mips
-USE_X11= yes
+USE_X11BASE= yes
PGUSER?= pgsql
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 58d5140a259..8ed6c840ab6 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/12/31 13:15:22 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1999/01/30 23:18:45 agc Exp $
# FreeBSD Id: Makefile,v 1.10 1998/11/18 17:35:16 vanilla Exp
#
@@ -16,7 +16,7 @@ DEPENDS+= gtk+-1.0.6:../../x11/gtk10
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
-USE_X11= yes
+USE_X11BASE= yes
post-install:
${MKDIR} ${PREFIX}/share/doc/glade
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index e893076724f..b515224a68e 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/01/16 04:10:05 tron Exp $
+# $NetBSD: Makefile,v 1.10 1999/01/30 23:18:45 agc Exp $
#
DISTNAME= libgtop-0.99.2
@@ -18,7 +18,7 @@ CONFLICTS= libgtop-*
NOT_FOR_ARCHS= alpha # problems with gtk
GNU_CONFIGURE= yes
-USE_X11= yes
+USE_X11BASE= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index b3f0ac6137f..446042c495a 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/10/05 12:43:46 agc Exp $
+# $NetBSD: Makefile,v 1.15 1999/01/30 23:18:46 agc Exp $
# FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp
#
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= packages@netbsd.org
-USE_X11= yes
+USE_X11BASE= yes
MAKEFILE= makefile
GNU_CONFIGURE= yes
USE_PERL5= yes
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 0dd3e73f358..e35e14058e6 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/11/12 23:03:40 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:46 agc Exp $
DISTNAME= bochs-980707a
CATEGORIES= emulators
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/bochs-980707
USE_GMAKE= yes
CONFIGURE_ARGS+= --enable-vga #--with-x11
GNU_CONFIGURE= yes
-USE_X11= yes
+USE_X11BASE= yes
post-configure:
${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' < ${WRKSRC}/.bochsrc > ${WRKSRC}/bochsrc
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 9cc4de214af..cd0d07c1226 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/09/16 09:37:28 matthias Exp $
+# $NetBSD: Makefile,v 1.5 1999/01/30 23:18:46 agc Exp $
DISTNAME= vice-0.15.0
CATEGORIES= emulators
@@ -14,7 +14,7 @@ MIRROR_DISTFILE= no
GNU_CONFIGURE= yes
CONFIGURE_ENV+= LDFLAGS="-Wl,-R${X11BASE}/lib"
USE_GMAKE= yes
-USE_X11= yes
+USE_X11BASE= yes
INFO_FILES= vice.info
post-install:
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 747e9ee8a2f..ac44ff730fa 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/12/14 02:17:10 tv Exp $
+# $NetBSD: Makefile,v 1.15 1999/01/30 23:18:46 agc Exp $
DISTNAME= Wine-981211
PKGNAME= wine-981211
@@ -15,7 +15,7 @@ DEPENDS+= xpm-3.4k:../../graphics/xpm
CONFLICTS= wine-980[26]*
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-dll
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 481766aebbd..b801dd9b424 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 1998/12/28 13:46:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.28 1999/01/30 23:18:46 agc Exp $
#
DISTNAME= xmame-0.34b8.1
@@ -17,7 +17,7 @@ CONFLICTS= xmame-0.30.1 xmame-0.33b6.1 xmame-0.34b1.1 \
NOT_FOR_ARCHS= alpha #gcc lossage
-USE_X11= yes
+USE_X11BASE= yes
USE_GMAKE= yes
MAKE_ENV+= OPSYS=${OPSYS} ARCH=${ARCH} DESTDIR=${DESTDIR} \
INSTALL_MAN="${INSTALL_MAN}" \
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index acdf99ccea8..bfb993f9b62 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/12/28 13:46:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 1999/01/30 23:18:46 agc Exp $
#
DISTNAME= unix02b4
@@ -17,7 +17,7 @@ CONFLICTS= xmess-0.1
NOT_FOR_ARCHS= alpha #gcc lossage
-USE_X11= yes
+USE_X11BASE= yes
USE_GMAKE= yes
MAKE_ENV+= OPSYS=${OPSYS} ARCH=${ARCH} DESTDIR=${DESTDIR} \
INSTALL_MAN="${INSTALL_MAN}" \
diff --git a/fonts/Xg/Makefile b/fonts/Xg/Makefile
index 0d7510cbbe5..582861972d1 100644
--- a/fonts/Xg/Makefile
+++ b/fonts/Xg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:31 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1999/01/30 23:18:53 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/01/27 15:59:35 erich Exp
#
@@ -10,6 +10,6 @@ MASTER_SITES= ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
MAINTAINER= packages@netbsd.org
NO_WRKSUBDIR= yes
-USE_X11= yes
+USE_X11BASE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index 248f66c6d6a..9246673e07b 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/28 12:55:42 garbled Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:46 agc Exp $
DISTNAME= abuse_pd
PKGNAME= abuse-2.0
@@ -9,7 +9,7 @@ DISTFILES= ${DISTNAME}.tgz abuse_data.tar.gz
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.crack.com/games/abuse/index.html
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= LDFLAGS="-Wl,-R${X11BASE}/lib"
USE_GMAKE= yes
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index 6df96629594..902524144bc 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/11/12 23:34:30 frueauf Exp $
+# $NetBSD: Makefile,v 1.11 1999/01/30 23:18:47 agc Exp $
#
DISTNAME= battalion
@@ -16,7 +16,7 @@ DEPENDS+= Mesa-3.0:../../graphics/Mesa
NOT_FOR_ARCHS= alpha # relies on Mesa (gcc)
EXTRACT_ONLY= battalionSource1.4.tar.Z
-USE_X11= yes
+USE_X11BASE= yes
do-install:
${INSTALL} -c -s -o root -g games -m 2755 ${WRKSRC}/battalion ${PREFIX}/bin
diff --git a/games/craft/Makefile b/games/craft/Makefile
index 7acaceeb500..c9810e7c06b 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/10/13 00:37:33 garbled Exp $
+# $NetBSD: Makefile,v 1.2 1999/01/30 23:18:47 agc Exp $
DISTNAME= craftcc35
PKGNAME= craft-3.5
@@ -11,7 +11,7 @@ HOMEPAGE= http://borneo.gmd.de/~hua/
NO_WRKSUBDIR= yes
USE_GMAKE= yes
-USE_X11= yes
+USE_X11BASE= yes
post-patch:
${RM} -f ${WRKSRC}/hcc/hcc
diff --git a/games/finalbattle/Makefile b/games/finalbattle/Makefile
index b1d37e113be..a8557fcad64 100644
--- a/games/finalbattle/Makefile
+++ b/games/finalbattle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/08/27 14:06:07 garbled Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:47 agc Exp $
#
DISTNAME= finalbattle.0.0
@@ -12,6 +12,6 @@ HOMEPAGE= http://www.sonic.net/~nbs/unix/x/finalbattle/
MAKEFILE= makefile
WRKSRC= ${WRKDIR}/final
-USE_X11= yes
+USE_X11BASE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/games/galaxa/Makefile b/games/galaxa/Makefile
index bdbe2cda256..6e931f06982 100644
--- a/games/galaxa/Makefile
+++ b/games/galaxa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/08/20 15:16:54 tsarna Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:47 agc Exp $
#
DISTNAME= galaxa.0.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.sonic.net/~nbs/unix/x/galaxa/
WRKSRC= ${WRKDIR}/galaxa
MAKEFILE= makefile
-USE_X11= yes
+USE_X11BASE= yes
pre-install:
${MKDIR} ${PREFIX}/share/doc/galaxa
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index 9a317712224..dd945494860 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/08/27 14:06:08 garbled Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:47 agc Exp $
#
DISTNAME= gemdropx
@@ -12,6 +12,6 @@ HOMEPAGE= http://www.sonic.net/~nbs/unix/x/gemdropx/
MAKEFILE= makefile
WRKSRC= ${WRKDIR}/gemdropx
-USE_X11= yes
+USE_X11BASE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/games/golddig/Makefile b/games/golddig/Makefile
index 887683e9628..ff29e17b357 100644
--- a/games/golddig/Makefile
+++ b/games/golddig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/27 14:06:08 garbled Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:47 agc Exp $
#
DISTNAME= golddig2
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://uiarchive.cso.uiuc.edu/pub/systems/linux/sunsite/games/arcad
MAINTAINER= root@garbled.net
-USE_X11= yes
+USE_X11BASE= yes
post-extract:
${RM} ${WRKSRC}/golddig ${WRKSRC}/makelev ${WRKSRC}/*.o
diff --git a/games/icbm3d/Makefile b/games/icbm3d/Makefile
index 4540bef226f..0927086a12c 100644
--- a/games/icbm3d/Makefile
+++ b/games/icbm3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/08/20 15:16:55 tsarna Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:47 agc Exp $
#
DISTNAME= icbm3d.0.3
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.sonic.net/~nbs/unix/x/icbm3d/
WRKSRC= ${WRKDIR}/icbm3d
MAKEFILE= makefile
-USE_X11= yes
+USE_X11BASE= yes
pre-install:
${MKDIR} ${PREFIX}/share/doc/icbm3d
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 67bad1366fa..a2024f8f689 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/08/27 14:06:08 garbled Exp $
+# $NetBSD: Makefile,v 1.5 1999/01/30 23:18:47 agc Exp $
DISTNAME= imaze1.3
PKGNAME= imaze-1.3
@@ -14,7 +14,7 @@ EXTRACT_ONLY= imaze1.3.tar.Z
WRKSRC= ${WRKDIR}/imaze
USE_MOTIF= yes
-USE_X11= yes
+USE_X11BASE= yes
post-build:
cd ${WRKSRC} && /bin/pax -rf ${DISTDIR}/imaze-sounds.tar
diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile
index fc28f518aa0..13359560153 100644
--- a/games/kdegames/Makefile
+++ b/games/kdegames/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 1998/12/29 19:46:49 tron Exp $
+# $NetBSD: Makefile,v 1.24 1999/01/30 23:18:48 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp
#
@@ -15,7 +15,7 @@ DEPENDS+= kdesupport-1.0:../../converters/kdesupport
CONFLICTS= kdegames-2.1b kdegames-3.1b kdegames-4.1b
-USE_X11= yes
+USE_X11BASE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= "--x-inc=${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index e63f9cb8daa..f0d31ba3e4a 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:55 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:48 agc Exp $
#
DISTNAME= lincity109-src
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.floot.demon.co.uk/lincity.html
WRKSRC= ${WRKDIR}/lincity109
USE_GMAKE= yes
-USE_X11= yes
+USE_X11BASE= yes
ALL_TARGET= freebsd
post-patch:
diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index 1df8ae0189c..353b4a545f1 100644
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/09/14 19:34:23 garbled Exp $
+# $NetBSD: Makefile,v 1.5 1999/01/30 23:18:48 agc Exp $
DISTNAME= Maelstrom-1.4.3-L2.0.6-src.tar.gz
PKGNAME= maelstrom-2.0.6
@@ -19,7 +19,7 @@ EXTRACT_ONLY= ${DISTNAME}
WRKSRC= ${WRKDIR}/Maelstrom
-USE_X11= yes
+USE_X11BASE= yes
MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP}
post-install:
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index 79d4055ad4f..9ea924f3ca9 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/11/09 21:20:18 garbled Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:48 agc Exp $
#
DISTNAME= mirrormagic-1.3
@@ -10,7 +10,7 @@ MAINTAINER= root@garbled.net
DEPENDS= xpm-3.4k:../../graphics/xpm
-USE_X11= YES
+USE_X11BASE= YES
do-install:
${INSTALL_PROGRAM} -o bin -g games -m 2755 ${WRKSRC}/mirrormagic ${X11BASE}/bin
diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile
index 0f5b06061f8..7534651f8ef 100644
--- a/games/spellcast/Makefile
+++ b/games/spellcast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:56 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:48 agc Exp $
#
DISTNAME= spellcast
@@ -10,6 +10,6 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.edoc.com/zarf/spellcast.html
-USE_X11= yes
+USE_X11BASE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/games/tanked/Makefile b/games/tanked/Makefile
index 84723505d0b..0df74bb8e3f 100644
--- a/games/tanked/Makefile
+++ b/games/tanked/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:56 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:48 agc Exp $
#
DISTNAME= tanked-0.90
@@ -10,7 +10,7 @@ HOMEPAGE= http://ogresoft.dyn.ml.org/tanked.html
DEPENDS+= xpm-3.4k:../../graphics/xpm
-USE_X11= yes
+USE_X11BASE= yes
post-patch:
@${TOUCH} ${WRKSRC}/client/tanked.man
diff --git a/games/wormz/Makefile b/games/wormz/Makefile
index f2c741afbbd..13823ede1e6 100644
--- a/games/wormz/Makefile
+++ b/games/wormz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/05 08:24:12 garbled Exp $
+# $NetBSD: Makefile,v 1.2 1999/01/30 23:18:48 agc Exp $
#
DISTNAME= Wormz-1.0b5
@@ -11,7 +11,7 @@ HOMEPAGE= http://lide.punknet.cz/miri/wormz.html
WRKSRC= ${WRKDIR}/Wormz
USE_GMAKE= yes
-USE_X11= yes
+USE_X11BASE= yes
post-extract:
${MKDIR} ${WRKSRC}/NetBSD
diff --git a/games/xbomber/Makefile b/games/xbomber/Makefile
index c882e744124..9081c504663 100644
--- a/games/xbomber/Makefile
+++ b/games/xbomber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/08/20 15:16:57 tsarna Exp $
+# $NetBSD: Makefile,v 1.5 1999/01/30 23:18:49 agc Exp $
#
DISTNAME= xbomber.0.8
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.sonic.net/~nbs/unix/x/xbomber/
WRKSRC= ${WRKDIR}/xbomber
MAKEFILE= makefile
-USE_X11= yes
+USE_X11BASE= yes
pre-install:
${MKDIR} ${PREFIX}/share/doc/xbomber
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 9a0385f3f15..242b5ed74f5 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/11/12 23:34:31 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:49 agc Exp $
DISTNAME= linuxdoom-1.10
PKGNAME= xdoom-1.10
@@ -18,7 +18,7 @@ LICENSE= shareware
EXTRACT_CMD= unzip
EXTRACT_BEFORE_ARGS= -qo
EXTRACT_ONLY= doomsrc.zip
-USE_X11= yes
+USE_X11BASE= yes
USE_GMAKE= yes
post-extract:
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 54761a58ace..5d46cba471e 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/08/27 14:06:08 garbled Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:49 agc Exp $
DISTNAME= xevil1.5.1e
PKGNAME= xevil-1.5.1e
@@ -14,6 +14,6 @@ MAKE_ENV= HOSTTYPE="netbsd" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
INSTALL_MAN="${INSTALL_MAN}"
-USE_X11= yes
+USE_X11BASE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index d8334d452e6..4fd68c0ed9d 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:58 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:49 agc Exp $
#
DISTNAME= xgalaga-2.0.34
@@ -10,7 +10,7 @@ HOMEPAGE= http://ogresoft.dyn.ml.org/xgal.html
DEPENDS+= xpm-3.4k:../../graphics/xpm
-USE_X11= yes
+USE_X11BASE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${X11BASE}/share/xgalaga
CONFIGURE_ARGS+= --exec-prefix=${X11BASE}/bin
diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index 0f111d0447f..050b99af1ae 100644
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/08/23 09:55:26 garbled Exp $
+# $NetBSD: Makefile,v 1.2 1999/01/30 23:18:49 agc Exp $
#
DISTNAME= xnibbles-1.0BETA4
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.tjhsst.edu/xnibbles/
DEPENDS+= xpm-3.4k:../../graphics/xpm
WRKSRC= ${WRKDIR}/xnibbles
-USE_X11= yes
+USE_X11BASE= yes
USE_GMAKE= yes
ALL_TARGET= netbsd
diff --git a/games/xworm/Makefile b/games/xworm/Makefile
index 590102ff8b9..d6801f48169 100644
--- a/games/xworm/Makefile
+++ b/games/xworm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/11/05 18:24:05 garbled Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:49 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1998/08/05 09:31:04 asami Exp
#
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.ekran.no/archive/x/
MAINTAINER= root@garbled.net
ALL_TARGET= freebsd
-USE_X11= yes
+USE_X11BASE= yes
WRKSRC= ${WRKDIR}/XWorm
do-install:
diff --git a/games/xzip/Makefile b/games/xzip/Makefile
index 5561fa09888..06c6a614293 100644
--- a/games/xzip/Makefile
+++ b/games/xzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/12/28 06:58:08 marc Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:49 agc Exp $
DISTNAME= xzip180
PKGNAME= xzip-1.8
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.eblong.com/zarf/xzip.html
WRKSRC= ${WRKDIR}/xzip
-USE_X11= yes
+USE_X11BASE= yes
ALL_TARGET= xzip
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index a72fe56ebee..db34150475b 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 1998/12/18 11:50:52 kleink Exp $
+# $NetBSD: Makefile,v 1.22 1999/01/30 23:18:50 agc Exp $
#
DISTNAME= MesaLib-3.0
@@ -19,7 +19,7 @@ NOT_FOR_ARCHS= alpha #gcc lossage
WRKSRC= ${WRKDIR}/${PKGNAME}
ALL_TARGET= netbsd
-USE_X11= yes
+USE_X11BASE= yes
MESA_LIBS= libMesaGL libMesaGLU
MESA_VERSION= 3.0
GLUT_LIBS= libglut
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 2004ab79f83..037c74a3793 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/12/21 17:05:52 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:50 agc Exp $
DISTNAME= fnlib_DR-0.3
PKGNAME= fnlib-0.3
@@ -12,6 +12,6 @@ DEPENDS+= imlib-1.8.2:../../graphics/imlib
WRKSRC= ${WRKDIR}/fnlib
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_X11= yes
+USE_X11BASE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 6e5a0d83b31..68948e577f6 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 1998/11/21 15:56:39 mycroft Exp $
+# $NetBSD: Makefile,v 1.30 1999/01/30 23:18:50 agc Exp $
DISTNAME= gimp-1.0.2
CATEGORIES= graphics
@@ -27,7 +27,7 @@ GIMP_DATA= gimp-data-extras-1.0.0
.ifndef DISPLAY
IS_INTERACTIVE= yes
.endif
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
CFLAGS= -pipe -O2 -I${LOCALBASE}/include
diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile
index 83edf82af3a..abbd52c7037 100644
--- a/graphics/hp2xx/Makefile
+++ b/graphics/hp2xx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/08/23 06:56:02 garbled Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:50 agc Exp $
#
DISTNAME= hp2xx-3.1.4
@@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MAINTAINER= mcmahill@alum.mit.edu
HOMEPAGE= http://www.gnu.org/software/hp2xx/hp2xx.html
-USE_X11= yes
+USE_X11BASE= yes
INFO_FILES= hp2xx.info
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index cc02b6388f4..1a13a10c074 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1999/01/18 19:35:30 tron Exp $
+# $NetBSD: Makefile,v 1.14 1999/01/30 23:18:50 agc Exp $
#
DISTNAME= imlib-1.9.0
@@ -18,7 +18,7 @@ DEPENDS+= giflib-3.0:../../graphics/giflib
CONFLICTS= imlib-*
-USE_X11= yes
+USE_X11BASE= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile
index 4068a302188..fc41e84d275 100644
--- a/graphics/kdegraphics/Makefile
+++ b/graphics/kdegraphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/12/29 19:46:49 tron Exp $
+# $NetBSD: Makefile,v 1.12 1999/01/30 23:18:50 agc Exp $
#
DISTNAME= kdegraphics-1.0
@@ -13,7 +13,7 @@ DEPENDS+= kdebase-1.0:../../x11/kdebase
CONFLICTS= kdegraphics-4.1b
-USE_X11= yes
+USE_X11BASE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= "--x-inc=${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
diff --git a/graphics/mpeg2codec/Makefile b/graphics/mpeg2codec/Makefile
index 779ed4adc4c..038ef9d6401 100644
--- a/graphics/mpeg2codec/Makefile
+++ b/graphics/mpeg2codec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/09/28 18:10:27 tron Exp $
+# $NetBSD: Makefile,v 1.2 1999/01/30 23:18:50 agc Exp $
DISTNAME= mpeg2vidcodec_v12
PKGNAME= mpeg2codec-1.2
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.mpeg.org/pub/mpeg/mssg/
MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.mpeg.org/MSSG/
-USE_X11= yes
+USE_X11BASE= yes
NO_CONFIGURE= yes
WRKSRC= ${WRKDIR}/mpeg2
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 026b7f1079d..81dd05f3501 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/07 15:23:49 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1999/01/30 23:18:50 agc Exp $
#
DISTNAME= plotutils-2.1.5
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnu.org/software/plotutils/plotutils.html
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_X11= yes
+USE_X11BASE= yes
INFO_FILES= plotutils.info
diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index 444e6a5ec4d..891bbe0866c 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/11/28 20:59:58 frueauf Exp $
+# $NetBSD: Makefile,v 1.10 1999/01/30 23:18:51 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1998/04/30 02:38:03 obrien Exp
#
@@ -16,7 +16,7 @@ CONFLICTS+= sane-0.72 sane-0.74
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_X11= yes
+USE_X11BASE= yes
# -O to workaorund bug with -O2 and egcs.
CFLAGS= -O -I${LOCALBASE}/include
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 8a04e565c36..55abe784905 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/12/20 23:05:19 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1999/01/30 23:18:51 agc Exp $
# FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
#
@@ -17,7 +17,7 @@ CONFLICTS= xpdf-0.7a
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include"
CONFIGURE_ARGS= --with-gzip
-USE_X11= yes
+USE_X11BASE= yes
MAN1= xpdf.1 pdftops.1 pdftotext.1 pdfinfo.1 pdftopbm.1 pdfimages.1
diff --git a/graphics/xplot/Makefile b/graphics/xplot/Makefile
index 1243156a5e5..b73c204a465 100644
--- a/graphics/xplot/Makefile
+++ b/graphics/xplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/01/29 20:19:10 tron Exp $
+# $NetBSD: Makefile,v 1.10 1999/01/30 23:18:51 agc Exp $
#
DISTNAME= xplot-0.90
@@ -7,7 +7,7 @@ MASTER_SITES= ftp://mercury.lcs.mit.edu/pub/shep/
MAINTAINER= thorpej@netbsd.org
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
DOCFILES= ANNOUNCE README README.tcp_plots demo.0 demo.1 demo.2 \
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index b93f0d832f6..278d1324924 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/07/19 13:11:49 tron Exp $
+# $NetBSD: Makefile,v 1.2 1999/01/30 23:18:51 agc Exp $
DISTNAME= coolmail-1.3
CATEGORIES= mail x11
@@ -9,7 +9,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= root@garbled.net
MAKE_ENV+= X11BASE=${PREFIX}
-USE_X11= yes
+USE_X11BASE= yes
post-install:
${INSTALL_DATA} ${WRKSRC}/Coolmail.ad \
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 2d26222356d..af076a56bb2 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/01/26 22:03:20 agc Exp $
+# $NetBSD: Makefile,v 1.11 1999/01/30 23:18:51 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1997/11/17 18:47:53 max Exp
#
@@ -12,7 +12,7 @@ MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE
WRKSRC= ${WRKDIR}/faces
-BUILD_USES_X11= yes
+USE_X11= yes
post-configure:
@for f in ${WRKSRC}/Makefile ${WRKSRC}/faces.h ${WRKSRC}/x11.c; do \
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index 7824d62e18a..fe692943c3f 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/01/23 15:23:38 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:51 agc Exp $
DISTNAME= WMMail.app-0.62
PKGNAME= wmmail-0.62
@@ -13,7 +13,7 @@ DEPENDS+= windowmaker-0.50.2:../../x11/windowmaker
CONFLICTS= wmmail-*
-USE_X11= yes
+USE_X11BASE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index e652314b857..ce24ec32455 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/01/16 17:26:03 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1999/01/30 23:18:51 agc Exp $
#
DISTNAME= xfmail-1.3
@@ -16,7 +16,7 @@ ONLY_FOR_ARCHS= arm32 i386 m68k sparc ns32k
RESTRICTED= "Selling this software requires permission of the authors."
-USE_X11= YES
+USE_X11BASE= YES
GNU_CONFIGURE= YES
post-install:
diff --git a/math/abacus/Makefile b/math/abacus/Makefile
index 0675f15854e..3d07f1fdece 100644
--- a/math/abacus/Makefile
+++ b/math/abacus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/12/13 00:29:20 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1999/01/30 23:18:52 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1998/09/25 10:07:44 asami Exp
#
@@ -14,7 +14,7 @@ DEPENDS+= tcl-8.0p2:../../lang/tcl80
DEPENDS+= tk-8.0p2:../../x11/tk80
USE_GMAKE= yes
-USE_X11= yes
+USE_X11BASE= yes
# Until we have tcl 8.0.3 in pkgsrc
pre-build:
diff --git a/math/abs/Makefile b/math/abs/Makefile
index 7794b6ab71c..06842c925b0 100644
--- a/math/abs/Makefile
+++ b/math/abs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/12/22 18:55:51 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:52 agc Exp $
#
DISTNAME= abs-src-0.5
@@ -13,7 +13,7 @@ DEPENDS+= xpm-3.4k:../../graphics/xpm
CONFLICTS= abs-0.4
-USE_X11= yes
+USE_X11BASE= yes
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/abs ${PREFIX}/bin
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index d9bd2665361..72a56eb65ee 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/01/14 13:57:05 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1999/01/30 23:18:52 agc Exp $
#
DISTNAME= scilab-2.4-src
@@ -15,7 +15,7 @@ DEPENDS+= xless-1.7:../../x11/xless
NOT_FOR_ARCHS= alpha #LP64 problems
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
PLIST_SRC= ${WRKDIR}/PLIST-src
diff --git a/math/vista/Makefile b/math/vista/Makefile
index 7ff2f60f09d..a3c7ff0abfb 100644
--- a/math/vista/Makefile
+++ b/math/vista/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/10/03 20:33:46 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1999/01/30 23:18:52 agc Exp $
#
DISTNAME= vista
@@ -12,7 +12,7 @@ HOMEPAGE= http://forrest.psych.unc.edu/research/vista.html
DEPENDS+= xlispstat-3.52.5:../../math/xlispstat
WRKSRC= ${WRKDIR}/vista-5.0.5
-USE_X11= yes
+USE_X11BASE= yes
USE_GMAKE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index fad367bd619..a4bfba2c98b 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/01/16 17:26:03 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:52 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1998/09/26 23:18:07 steve Exp
#
@@ -18,7 +18,7 @@ DEPENDS+= xforms-0.88:../../x11/xforms
ONLY_FOR_ARCHS= arm32 i386 m68k sparc ns32k
-USE_X11= yes
+USE_X11BASE= yes
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xldlas ${PREFIX}/bin
diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile
index f53a57fb132..42b68b142d4 100644
--- a/math/xlispstat/Makefile
+++ b/math/xlispstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/01/01 09:03:36 garbled Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:52 agc Exp $
# FreeBSD Id: Makefile,v 1.7 1998/08/20 07:35:21 asami Exp
#
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.stat.umn.edu/~luke/xls/xlsinfo/xlsinfo.html
CONFLICTS= xlispstat-3.52.5
GNU_CONFIGURE= yes
-USE_X11= yes
+USE_X11BASE= yes
NOT_FOR_ARCHS= alpha #core dumps
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 9166b0961ca..b5c19e47e56 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/11/16 14:56:07 agc Exp $
+# $NetBSD: Makefile,v 1.11 1999/01/30 23:18:52 agc Exp $
#
DISTNAME= rat-3.0.28
@@ -15,7 +15,7 @@ CONFLICTS= rat-3.0.24
RESTRICTED= "Contains DES encryption"
MIRROR_DISTFILE=no
USE_GMAKE= yes
-USE_X11= yes
+USE_X11BASE= yes
do-build:
cd ${WRKSRC} && PREFIX=${PREFIX} MAKE=${MAKE_PROGRAM} LDFLAGS="${LDFLAGS}" X11BASE=${X11BASE} LOCALBASE=${LOCALBASE} ./Build rat
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 401273fd2f6..b93fe05af0c 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1999/01/08 00:24:18 tron Exp $
+# $NetBSD: Makefile,v 1.17 1999/01/30 23:18:52 agc Exp $
#
DISTNAME= sdr-2.5.8
@@ -15,7 +15,7 @@ CONFLICTS= sdr-2.4a7mmrz
MIRROR_DISTFILE= no
WRKSRC= ${WRKDIR}/sdr
USE_GMAKE= yes
-USE_X11= yes
+USE_X11BASE= yes
_INTTYPES!= if [ -e /usr/include/sys/inttypes.h ]; then echo "Exists"; else echo "No go"; fi
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index 39bdd37db85..1716db0ac2a 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/08/20 15:17:12 tsarna Exp $
+# $NetBSD: Makefile,v 1.9 1999/01/30 23:18:53 agc Exp $
# FreeBSD Id: Makefile,v 1.12 1997/09/11 03:54:53 fenner Exp
#
@@ -13,7 +13,7 @@ HOMEPAGE= http://www-nrg.ee.lbl.gov/vic/
DEPENDS+= tk-8.0p2:../../x11/tk80
GNU_CONFIGURE= yes
-USE_X11= yes
+USE_X11BASE= yes
post-install:
strip ${PREFIX}/bin/vic
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 587f40aea43..1fe35ccab72 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/08/20 15:17:12 tsarna Exp $
+# $NetBSD: Makefile,v 1.9 1999/01/30 23:18:53 agc Exp $
# FreeBSD Id: Makefile,v 1.12 1997/08/10 22:31:15 fenner Exp
#
@@ -15,7 +15,7 @@ HOMEPAGE= http://www.astrolog.org/
EPHEM= LRZ5_24 CHI_24 CPJV_24
-USE_X11= yes
+USE_X11BASE= yes
EXTRACT_ONLY= ${DISTNAME}.shr
EXTRACT_CMD= ${SH}
diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile
index d0e7bba5c8f..92683e736a1 100644
--- a/misc/kdeutils/Makefile
+++ b/misc/kdeutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 1998/12/29 19:46:49 tron Exp $
+# $NetBSD: Makefile,v 1.23 1999/01/30 23:18:53 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp
#
@@ -14,7 +14,7 @@ DEPENDS+= kdebase-1.0:../../x11/kdebase
CONFLICTS= kdeutils-2.1b kdeutils-3.1b kdeutils-4.1b
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= "--x-inc=${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
"--x-lib=${PREFIX}/lib -L${LOCALBASE}/lib" \
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 3327aa2bcf2..9777ea96e18 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.205 1999/01/26 22:03:18 agc Exp $
+# $NetBSD: bsd.pkg.mk,v 1.206 1999/01/30 23:18:59 agc Exp $
#
# This file is in the public domain.
#
@@ -121,7 +121,7 @@ PKGDIR?= ${.CURDIR}/pkg.${MACHINE_ARCH}
PKGDIR?= ${.CURDIR}/pkg
.endif
-.if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11)
+.if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11BASE)
.if defined(USE_LOCALBASE_FOR_X11)
PREFIX= ${LOCALBASE}
BUILD_DEPENDS+= ${X11BASE}/lib/X11/config/xpkgwedge.def:../../pkgtools/xpkgwedge
@@ -192,7 +192,7 @@ MD5?= md5
.endif
MD5_FILE?= ${FILESDIR}/md5
-.if defined(USE_MOTIF) || defined(USE_X11) || defined(BUILD_USES_X11)
+.if defined(USE_MOTIF) || defined(USE_X11BASE) || defined(USE_X11)
LDFLAGS+= -Wl,-R${X11BASE}/lib
.endif
LDFLAGS+= -Wl,-R${LOCALBASE}/lib
@@ -263,13 +263,13 @@ EXTRACT_SUFX?= .tar.gz
# Figure out where the local mtree file is
.if !defined(MTREE_FILE)
.if (${OPSYS} == "NetBSD")
-.if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11)
+.if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11BASE)
MTREE_FILE= ${PKGSRCDIR}/mk/NetBSD.x11.dist
.else
MTREE_FILE= ${PKGSRCDIR}/mk/NetBSD.pkg.dist
.endif
.else # not NetBSD
-.if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11)
+.if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11BASE)
MTREE_FILE= /etc/mtree/BSD.x11.dist
.else
MTREE_FILE= /etc/mtree/BSD.local.dist
@@ -674,7 +674,7 @@ IGNORE= "may not be placed on a CDROM: ${NO_CDROM}"
.elif (defined(RESTRICTED) && defined(NO_RESTRICTED))
IGNORE= "is restricted: ${RESTRICTED}"
.elif ((defined(USE_IMAKE) || defined(USE_MOTIF) || \
- defined(USE_X11) || defined(BUILD_USES_X11)) && \
+ defined(USE_X11BASE) || defined(USE_X11)) && \
!exists(${X11BASE}))
IGNORE= "uses X11, but ${X11BASE} not found"
.elif defined(BROKEN)
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index 5f46ca15e93..690b82eb943 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/01/22 00:47:08 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1999/01/30 23:18:53 agc Exp $
#
DISTNAME= gaim-19981231
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.marko.net/gaim/
DEPENDS= gtk+-1.1.12:../../x11/gtk
-USE_X11= YES
+USE_X11BASE= YES
USE_GMAKE= YES
ALL_TARGET= aim
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index f76beb0ac06..2c225c06e44 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 1998/12/29 19:46:49 tron Exp $
+# $NetBSD: Makefile,v 1.24 1999/01/30 23:18:53 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
#
@@ -19,7 +19,7 @@ CONFLICTS= kdenetwork-2.1b kdenetwork-3.1b kdenetwork-4.1b
NOT_FOR_ARCHS= alpha # LP64/ELF problems
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= "--x-inc=${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
"--x-lib=${PREFIX}/lib -L${LOCALBASE}/lib" \
diff --git a/net/pload/Makefile b/net/pload/Makefile
index 631e0ada6a3..1d36432ce53 100644
--- a/net/pload/Makefile
+++ b/net/pload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/01/14 23:37:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:53 agc Exp $
#
DISTNAME= pload-0.9.2
@@ -9,7 +9,7 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.engr.utk.edu/~mdsmith/pload/
HAS_CONFIGURE= YES
-USE_X11= YES
+USE_X11BASE= YES
INSTALL_TARGET= install install.man
.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/Xg/Makefile b/plan9/Xg/Makefile
index 0d7510cbbe5..582861972d1 100644
--- a/plan9/Xg/Makefile
+++ b/plan9/Xg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:31 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1999/01/30 23:18:53 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/01/27 15:59:35 erich Exp
#
@@ -10,6 +10,6 @@ MASTER_SITES= ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
MAINTAINER= packages@netbsd.org
NO_WRKSUBDIR= yes
-USE_X11= yes
+USE_X11BASE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 89ecaecd9df..5e51150b0d0 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/12/03 13:35:47 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1999/01/30 23:18:54 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp
#
@@ -14,7 +14,7 @@ DEPENDS+= xpm-3.4k:../../graphics/xpm
ONLY_FOR_ARCHS= i386 # needs apm support
GNU_CONFIGURE= yes
-USE_X11= yes
+USE_X11BASE= yes
INSTALL_TARGET= install install.man
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index acdcad6da3b..7f6ff700ee4 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 1999/01/23 00:26:05 tron Exp $
+# $NetBSD: Makefile,v 1.22 1999/01/30 23:18:54 agc Exp $
#
DISTNAME= xosview-1.6.2.a
@@ -13,7 +13,7 @@ CONFLICTS= xosview-*
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${PREFIX}
-USE_X11= yes
+USE_X11BASE= yes
BUILD_DEFS= UVM
# On arm32, with UVM, pmap.h contains a C++ keyword. Workaround this.
diff --git a/textproc/t1libx/Makefile b/textproc/t1libx/Makefile
index 1a7dd9909dd..2af5dfb7851 100644
--- a/textproc/t1libx/Makefile
+++ b/textproc/t1libx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/11/13 16:29:18 tv Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:54 agc Exp $
#
DISTNAME= t1lib-0.8-beta
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/T1-0.8-beta
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_X11= yes
+USE_X11BASE= yes
PATCHFILES+= ${PKGSRCDIR}/textproc/t1lib/patches/patch-*
ALLFILES= ${DISTFILES} # don't checksum shared patches
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index aed3975cfe5..af50527e4d0 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/11/23 15:01:39 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 1999/01/30 23:18:54 agc Exp $
# FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp
#
@@ -17,7 +17,7 @@ DEPENDS= jpeg-6b:../../graphics/jpeg \
NOT_FOR_ARCHS= alpha #LP64 problems
-USE_X11= yes
+USE_X11BASE= yes
USE_MOTIF= yes
GNU_CONFIGURE= yes
diff --git a/www/arena/Makefile b/www/arena/Makefile
index 56f56be99dd..0aaa17e147a 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/01/09 03:19:02 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 1999/01/30 23:18:54 agc Exp $
# FreeBSD Id: Makefile,v 1.10 1998/05/04 20:22:31 jseger Exp
#
@@ -21,7 +21,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
USE_GMAKE= yes
MAKEFILE= makefile
GNU_CONFIGURE= yes
-USE_X11= yes
+USE_X11BASE= yes
CONFIGURE_ARGS+= --without-debug
CONFIGURE_ARGS+= --with-libwww-include=${LOCALBASE}/include/w3c-libwww
CONFIGURE_ARGS+= --with-libwww-libdir=${LOCALBASE}/lib
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 7099e72bda0..46b596b5a24 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 1999/01/04 09:30:46 frueauf Exp $
+# $NetBSD: Makefile,v 1.20 1999/01/30 23:18:54 agc Exp $
#
DISTNAME= mozilla-19981008
@@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla/source/ \
MAINTAINER= fvdl@netbsd.org
HOMEPAGE= http://www.mozilla.org/
-USE_X11= yes
+USE_X11BASE= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_MOTIF= yes
diff --git a/x11/afterstep/Makefile b/x11/afterstep/Makefile
index a2991630bd1..d081114f606 100644
--- a/x11/afterstep/Makefile
+++ b/x11/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/12/28 23:36:43 tron Exp $
+# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:55 agc Exp $
DISTNAME= AfterStep-1.6.0
PKGNAME= afterstep-1.6.0
@@ -17,7 +17,7 @@ DEPENDS+= asclock-11:../../x11/asclock
CONFLICTS= afterstep-*
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-png-includes=${LOCALBASE}/include \
diff --git a/x11/amiwm/Makefile b/x11/amiwm/Makefile
index 221966f1a9a..99d6814f836 100644
--- a/x11/amiwm/Makefile
+++ b/x11/amiwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/11/12 14:43:50 agc Exp $
+# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:55 agc Exp $
#
DISTNAME= amiwm0.20pl48
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/
MAINTAINER= rh@trapdoor.vip.at
HOMEPAGE= http://www.lysator.liu.se/~marcus/amiwm.html
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="-DHAVE_X11_EXTENSIONS_SHAPE_H=1 -O"
diff --git a/x11/asclock/Makefile b/x11/asclock/Makefile
index 18779dc244d..4e48b457485 100644
--- a/x11/asclock/Makefile
+++ b/x11/asclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/08/17 21:17:17 tron Exp $
+# $NetBSD: Makefile,v 1.11 1999/01/30 23:18:55 agc Exp $
#
DISTNAME= asclock
@@ -39,7 +39,7 @@ LANG?=1
# 3) 2bit greyscale ( 4 colors)
PANEL?=1
-USE_X11= yes
+USE_X11BASE= yes
INSTALL_TARGET= install install.man
do-configure:
diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile
index fb4273df326..d5d60c206f0 100644
--- a/x11/dxpc/Makefile
+++ b/x11/dxpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/08/20 15:17:33 tsarna Exp $
+# $NetBSD: Makefile,v 1.9 1999/01/30 23:18:55 agc Exp $
#
DISTNAME= dxpc-3.7.0
@@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://ccwf.cc.utexas.edu/~zvonler/dxpc/
GNU_CONFIGURE= yes
-USE_X11= yes
+USE_X11BASE= yes
post-install:
@strip ${PREFIX}/bin/dxpc
diff --git a/x11/enlightenment/Makefile b/x11/enlightenment/Makefile
index 6f5a77e2312..3ab005f29c6 100644
--- a/x11/enlightenment/Makefile
+++ b/x11/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/01/16 05:50:28 tron Exp $
+# $NetBSD: Makefile,v 1.6 1999/01/30 23:18:55 agc Exp $
DISTNAME= enlightenment-0.14
CATEGORIES= x11
@@ -15,7 +15,7 @@ DEPENDS+= p5-gtk-0.4:../../x11/p5-gtk
WRKSRC= ${WRKDIR}/e
USE_PERL5= yes
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11/filerunner/Makefile b/x11/filerunner/Makefile
index aba21a285f7..87e0b4920a6 100644
--- a/x11/filerunner/Makefile
+++ b/x11/filerunner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/08/20 15:17:33 tsarna Exp $
+# $NetBSD: Makefile,v 1.8 1999/01/30 23:18:55 agc Exp $
# $FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:11 jseger Exp
#
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.cd.chalmers.se/~hch/filerunner.html
DEPENDS+= tk-8.0p2:../../x11/tk80
-USE_X11= yes
+USE_X11BASE= yes
post-extract:
${RM} ${WRKSRC}/ext.so
diff --git a/x11/fvwm-wharf/Makefile b/x11/fvwm-wharf/Makefile
index 567b4387480..a8401636f2c 100644
--- a/x11/fvwm-wharf/Makefile
+++ b/x11/fvwm-wharf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/23 15:12:05 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:55 agc Exp $
DISTNAME= AfterStep-1.0
PKGNAME= fvwm-wharf-1.0
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.afterstep.org/
DEPENDS= xpm-3.4k:../../graphics/xpm
-USE_X11= yes
+USE_X11BASE= yes
do-configure:
(cd ${WRKSRC} ; xmkmf ; make Makefiles)
diff --git a/x11/fvwm95/Makefile b/x11/fvwm95/Makefile
index c4c9c8cb331..a4e5a75506b 100644
--- a/x11/fvwm95/Makefile
+++ b/x11/fvwm95/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/11/19 15:40:47 agc Exp $
+# $NetBSD: Makefile,v 1.15 1999/01/30 23:18:55 agc Exp $
# FreeBSD: Makefile,v 1.17 1997/12/24 01:21:18 alex Exp
#
@@ -15,7 +15,7 @@ DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= xpmroot-1.01:../../x11/xpmroot
DEPENDS+= rplay-3.2.0b6:../../audio/rplay
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir=${LOCALBASE}/include \
--libdir=${LOCALBASE}/lib
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 7ab01b93abe..e74a8811226 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/01/16 06:08:02 tron Exp $
+# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:56 agc Exp $
#
DISTNAME= gnome-core-0.99.3.1
@@ -17,7 +17,7 @@ CONFLICTS= gnome-core-*
NOT_FOR_ARCHS= alpha # problems with gtk
GNU_CONFIGURE= yes
-USE_X11= yes
+USE_X11BASE= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 1ce5d8e7653..95514700f6a 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1999/01/16 03:34:56 tron Exp $
+# $NetBSD: Makefile,v 1.14 1999/01/30 23:18:56 agc Exp $
#
DISTNAME= gnome-libs-0.99.3
@@ -18,7 +18,7 @@ NOT_FOR_ARCHS= alpha # problems with gtk
CONFLICTS= gnome-libs-*
GNU_CONFIGURE= yes
-USE_X11= yes
+USE_X11BASE= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
LDFLAGS+= "-L${LOCALBASE}/lib"
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 395d94ce2b1..3f3b97afca3 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 1999/01/16 01:43:29 tron Exp $
+# $NetBSD: Makefile,v 1.26 1999/01/30 23:18:56 agc Exp $
DISTNAME= gtk+-1.1.12
CATEGORIES= x11
@@ -17,7 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/perl:../../lang/perl5
CONFLICTS= gtk+-*
USE_LIBTOOL= yes
-USE_X11= yes
+USE_X11BASE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11/gtk10/Makefile b/x11/gtk10/Makefile
index 32e44c22fa3..0b99d425036 100644
--- a/x11/gtk10/Makefile
+++ b/x11/gtk10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/01/03 15:20:52 augustss Exp $
+# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:56 agc Exp $
DISTNAME= gtk+-1.0.6
CATEGORIES= x11
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.gtk.org/
CONFLICTS= gtk+-1.0.0 gtk+-1.0.4 gtk+-1.1.* glib-1.1.*
USE_LIBTOOL= yes
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index 32dcb44da7b..1a7a34a4fba 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/01/20 10:11:39 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:56 agc Exp $
DISTNAME= gtkglarea-1.1
CATEGORIES= x11 graphics
@@ -11,7 +11,7 @@ DEPENDS+= Mesa-3.0:../../graphics/Mesa
DEPENDS+= gtk+-1.1.12:../../x11/gtk
GNU_CONFIGURE= YES
-USE_X11= YES
+USE_X11BASE= YES
CONFIGURE_ARGS+= --with-gtk-prefix=${X11BASE}
CONFIGURE_ARGS+= --with-GL-prefix=${X11BASE}
CONFIGURE_ARGS+= --with-lib-MesaGL
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index bd11601d638..08ca5d9a54b 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 1998/12/29 19:46:49 tron Exp $
+# $NetBSD: Makefile,v 1.26 1999/01/30 23:18:56 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
#
@@ -15,7 +15,7 @@ DEPENDS+= kdelibs-1.0:../../x11/kdelibs
CONFLICTS= kdebase-2.1b kdebase-3.1b kdebase-4.1b
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= "--x-inc=${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
"--x-lib=${PREFIX}/lib -L${LOCALBASE}/lib" \
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index fd3e200b1c0..e65401f4049 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 1998/12/29 19:42:09 tron Exp $
+# $NetBSD: Makefile,v 1.24 1999/01/30 23:18:56 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
#
@@ -16,7 +16,7 @@ DEPENDS+= giflib-3.0:../../graphics/giflib
CONFLICTS= kdelibs-2.1b kdelibs-3.1b kdelibs-4.1b
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= "--x-inc=${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
"--x-lib=${X11BASE}/lib -L${LOCALBASE}/lib" \
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 561569b45b0..9353e33aa22 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 1999/01/14 08:18:42 tron Exp $
+# $NetBSD: Makefile,v 1.36 1999/01/30 23:18:57 agc Exp $
# FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp
#
@@ -14,7 +14,7 @@ CONFLICTS= lesstif-*
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_X11= yes
+USE_X11BASE= yes
# disable this for debugging
CONFIGURE_ARGS+=--enable-production
diff --git a/x11/qt/Makefile b/x11/qt/Makefile
index 14cdbad8c9a..b36a4073e8b 100644
--- a/x11/qt/Makefile
+++ b/x11/qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 1998/12/29 19:34:47 tron Exp $
+# $NetBSD: Makefile,v 1.23 1999/01/30 23:18:57 agc Exp $
#
DISTNAME= qt-1.42
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.troll.no/products/qt.html
CONFLICTS= qt-*
-USE_X11= yes
+USE_X11BASE= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
diff --git a/x11/rclock/Makefile b/x11/rclock/Makefile
index 0986d0abca1..317bb560a2d 100644
--- a/x11/rclock/Makefile
+++ b/x11/rclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/06/22 13:20:59 agc Exp $
+# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:57 agc Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1997/03/03 16:27:10 obrien Exp
#
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= utils/file/managers/mc/rxvt
MAINTAINER= packages@netbsd.org
CFLAGS+= '-DMAIL_SPOOL=\"/var/mail/\"'
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
ALL_TARGET= clock
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 8af26d1e65b..be140ad1561 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/06/22 13:21:00 agc Exp $
+# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:57 agc Exp $
# FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
#
@@ -12,7 +12,7 @@ MASTER_SITE_SUBDIR= utils/file/managers/mc/rxvt
MAINTAINER= packages@netbsd.org
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk80/Makefile b/x11/tk80/Makefile
index 3b01c743d5c..13d17a1e37d 100644
--- a/x11/tk80/Makefile
+++ b/x11/tk80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 1999/01/26 22:03:20 agc Exp $
+# $NetBSD: Makefile,v 1.23 1999/01/30 23:18:57 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/10/01 09:20:31 tg Exp
#
@@ -15,7 +15,7 @@ DEPENDS+= tcl-8.0p2:../../lang/tcl80
WRKSRC= ${WRKDIR}/tk8.0/unix
GNU_CONFIGURE= yes
-BUILD_USES_X11= yes
+USE_X11= yes
# let libtool look after shared libraries
USE_LIBTOOL= yes
diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index 8ba21891cec..8ebaa98c92e 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1999/01/19 22:12:15 tron Exp $
+# $NetBSD: Makefile,v 1.19 1999/01/30 23:18:57 agc Exp $
DISTNAME= WindowMaker-0.50.2
PKGNAME= windowmaker-0.50.2
@@ -20,7 +20,7 @@ DEPENDS+= tiff-3.4:../../graphics/tiff
CONFLICTS= windowmaker-*
USE_LIBTOOL= yes
-USE_X11= yes
+USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/share/locale \
--with-gfx-incs="-I${LOCALBASE}/include \
diff --git a/x11/wmthemes/Makefile b/x11/wmthemes/Makefile
index 5cbe0e6c6d3..b7348d24b7c 100644
--- a/x11/wmthemes/Makefile
+++ b/x11/wmthemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/01/23 15:01:28 tron Exp $
+# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:57 agc Exp $
DISTNAME= wmthemes-0.50.x
CATEGORIES= x11
@@ -12,7 +12,7 @@ DEPENDS+= windowmaker-0.50.2:../../x11/windowmaker
CONFLICTS= wm-themes-* wmthemes-*
-USE_X11= yes
+USE_X11BASE= yes
NO_BUILD= yes
NO_CONFIGURE= yes
NO_CHECKSUM= yes
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 81fb773f854..83db337c107 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/11/13 13:04:15 matthias Exp $
+# $NetBSD: Makefile,v 1.10 1999/01/30 23:18:57 agc Exp $
#
DISTNAME= bxform-088
@@ -29,7 +29,7 @@ OBJMACHINE= yes
NO_BUILD= yes
-USE_X11= yes
+USE_X11BASE= yes
post-patch:
${MV} ${WRKSRC}/mkconfig.h ${WRKSRC}/mkconfig.h.orig
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index 4bd9e5004cc..29527bd0e01 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/01/20 20:24:11 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1999/01/30 23:18:58 agc Exp $
#
DISTNAME= xglobe-0.2
@@ -17,7 +17,7 @@ DIST_SUBDIR= xglobe
MAPS= LE.400.gif Brill.400.gif mggd.gif
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-USE_X11= YES
+USE_X11BASE= YES
USE_GMAKE= YES
MAKE_ENV+= QTDIR=${X11BASE}
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index a69d5d6ae2f..e80c151915e 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 1998/09/30 19:49:43 tron Exp $
+# $NetBSD: Makefile,v 1.22 1999/01/30 23:18:58 agc Exp $
# FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp
#
@@ -19,6 +19,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-mesagl --without-motif --without-sx \
--without-editres --without-dtsaver --without-rplay \
--without-nas --without-gtk
-USE_X11= yes
+USE_X11BASE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xneko/Makefile b/x11/xneko/Makefile
index 6fbd01f9666..356f0999b94 100644
--- a/x11/xneko/Makefile
+++ b/x11/xneko/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/06/20 09:20:40 agc Exp $
+# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:58 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1997/03/12 08:21:35 asami Exp
#
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
MAINTAINER= packages@netbsd.org
-USE_X11= yes
+USE_X11BASE= yes
IGNOREFILES= ${DISTFILES}
WRKSRC= ${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xneko
diff --git a/x11/xpns/Makefile b/x11/xpns/Makefile
index 0db30d8027b..9cedb893452 100644
--- a/x11/xpns/Makefile
+++ b/x11/xpns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/10/15 19:51:09 agc Exp $
+# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:58 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1997/06/29 09:38:20 obrien Exp
#
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= pgiffuni@fps.biblos.unal.edu.co
HOMEPAGE= http://www.informatik.uni-stuttgart.de/ipvr/bv/pns/pns.html
-USE_X11= yes
+USE_X11BASE= yes
NO_WRKSUBDIR= yes
MAKEFILE= makefile
ALL_TARGET= pns
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 795bc3159a8..364c5e6a316 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1999/01/06 13:13:36 frueauf Exp $
+# $NetBSD: Makefile,v 1.19 1999/01/30 23:18:58 agc Exp $
#
DISTNAME= xscreensaver-3.07
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=--without-shadow --with-zippy=/usr/games/fortune \
--enable-subdir=${PREFIX}/libexec/xscreensaver
CONFIGURE_ENV+= INSTALL=/usr/bin/install
-USE_X11= yes
+USE_X11BASE= yes
USE_MOTIF= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xtermset/Makefile b/x11/xtermset/Makefile
index 1d1b7ea7e6b..690db4471d0 100644
--- a/x11/xtermset/Makefile
+++ b/x11/xtermset/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/01/07 23:43:40 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:58 agc Exp $
#
DISTNAME= xtermset-0.2
@@ -8,7 +8,7 @@ MASTER_SITES= http://www.cs.vu.nl/~bernsti/xtermset/src/
MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.cs.vu.nl/~bernsti/xtermset/
-USE_X11= YES
+USE_X11BASE= YES
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xtermset
diff --git a/x11/xwrits/Makefile b/x11/xwrits/Makefile
index d27381b111d..a09c5b45583 100644
--- a/x11/xwrits/Makefile
+++ b/x11/xwrits/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/01/17 09:27:34 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:58 agc Exp $
DISTNAME= xwrits-2.7.3
CATEGORIES= x11
@@ -9,7 +9,7 @@ HOMEPAGE= http://www.lcdf.org/~eddietwo/xwrits/
CONFLICTS= xwrits-*
-USE_X11= YES
+USE_X11BASE= YES
GNU_CONFIGURE= YES
.include "../../mk/bsd.pkg.mk"