Remove USE_X11BASE and X11PREFIX.

16 files changed, 20 insertions, 34 deletions

diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index 7258c0c0547..f58d905e629 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2015/01/04 02:55:02 dholland Exp $
+# $NetBSD: Makefile,v 1.29 2015/07/04 16:18:34 joerg Exp $
 
 DISTNAME=		abuse_pd
 PKGNAME=		abuse-2.0
@@ -11,7 +11,6 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		# AWOL
 COMMENT=		Full color 320x200 arcade quality platform shooter
 
-USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		LDFLAGS=${X11_LDFLAGS:Q}
 USE_TOOLS+=		gmake gtar
diff --git a/games/finalbattle/Makefile b/games/finalbattle/Makefile
index c58bd7f0eaa..05a071236a3 100644
--- a/games/finalbattle/Makefile
+++ b/games/finalbattle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/06 11:54:37 asau Exp $
+# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:34 joerg Exp $
 #
 
 DISTNAME=	finalbattle.0.0
@@ -15,8 +15,6 @@ COMMENT=	Multiplayer space battle simulation for X
 WRKSRC=		${WRKDIR}/final
 MAKE_FILE=	makefile
 
-USE_X11BASE=	yes
-
 INSTALLATION_DIRS+=	bin
 
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/games/golddig/Makefile b/games/golddig/Makefile
index 80ebf3ace86..907342f678d 100644
--- a/games/golddig/Makefile
+++ b/games/golddig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/06 11:54:42 asau Exp $
+# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:34 joerg Exp $
 #
 
 DISTNAME=	golddigC3.1
@@ -10,8 +10,6 @@ MASTER_SITES=	http://www.NetBSD.org/~chuck/gz/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Fast action game designed for use with X
 
-USE_X11BASE=	yes
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX} \
 			MAN=${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 7c98ecded65..948ce2a6b1b 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2012/10/06 11:54:43 asau Exp $
+# $NetBSD: Makefile,v 1.30 2015/07/04 16:18:34 joerg Exp $
 
 DISTNAME=		imaze1.3
 PKGNAME=		imaze-1.3
@@ -14,7 +14,6 @@ COMMENT=		Multiplayer, networked, action,x 3D maze game
 EXTRACT_ONLY=		imaze1.3.tar.Z
 
 WRKSRC=			${WRKDIR}/imaze
-USE_X11BASE=		yes
 USE_TOOLS+=		pax
 
 INSTALLATION_DIRS=	bin lib/X11/app-defaults ${PKGMANDIR}/man6
diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile
index 41c0e1b034d..0477e851538 100644
--- a/games/maelstrom-x11/Makefile
+++ b/games/maelstrom-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2014/08/21 11:47:17 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2015/07/04 16:18:34 joerg Exp $
 
 DISTNAME=		Maelstrom-1.4.3-L2.0.6-src.tar.gz
 PKGNAME=		maelstrom-x11-2.0.6
@@ -24,7 +24,6 @@ EXTRACT_ONLY=		${DISTNAME}
 WRKSRC=			${WRKDIR}/Maelstrom
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		pax
-USE_X11BASE=		YES
 LDFLAGS.SunOS+=		-lsocket -lnsl
 LIBS.SunOS+=		-lsocket -lnsl
 MAKE_FLAGS+=		EXTRALIBS=${LIBS:Q}
diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile
index 14a4a302d82..4601becf96a 100644
--- a/games/spellcast/Makefile
+++ b/games/spellcast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/06 11:54:55 asau Exp $
+# $NetBSD: Makefile,v 1.15 2015/07/04 16:18:34 joerg Exp $
 #
 
 DISTNAME=		spellcast
@@ -12,7 +12,6 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.eblong.com/zarf/spellcast.html
 COMMENT=		Game of dueling wizards for two players
 
-USE_X11BASE=		yes
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/games/tanked/distinfo b/games/tanked/distinfo
index a679d51c064..0d0e272dd9d 100644
--- a/games/tanked/distinfo
+++ b/games/tanked/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2010/06/25 22:38:40 joerg Exp $
+$NetBSD: distinfo,v 1.9 2015/07/04 16:18:34 joerg Exp $
 
 SHA1 (tanked-0.90.tar.gz) = 781e4d23e5b59bfff53e921e9b20d94a15609f23
 RMD160 (tanked-0.90.tar.gz) = 5473310798a9cf4a7403bd90fe9a7c241920baa1
 Size (tanked-0.90.tar.gz) = 151105 bytes
 SHA1 (patch-aa) = 29d6f519832103df13517ffe611f2d68b4a97553
 SHA1 (patch-ab) = f25cd592b5571c4e35d9e3160a1f5bcfacee1ad7
-SHA1 (patch-ac) = 097e1252deabeb2a6a9b9981bfb51b9c6c409672
+SHA1 (patch-ac) = 4d944d7380757e40c706bf0062b766dd72460ea9
 SHA1 (patch-ad) = 09931ca419399dbcbcea690381f7b68916fb0efa
 SHA1 (patch-ae) = 8244fbccb0e9109ec246e32f97844400dd9167a5
 SHA1 (patch-af) = c6bd8d7766639f0ef4e8ed6818cf736928410f17
diff --git a/games/tanked/patches/patch-ac b/games/tanked/patches/patch-ac
index 5354f77cc85..89e1acf9cdd 100644
--- a/games/tanked/patches/patch-ac
+++ b/games/tanked/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/10/21 12:11:05 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2015/07/04 16:18:34 joerg Exp $
 
 --- server/Makefile.orig	Sun Apr 12 04:18:42 1998
 +++ server/Makefile
@@ -9,7 +9,7 @@ $NetBSD: patch-ac,v 1.3 2002/10/21 12:11:05 wiz Exp $
 -EXTRAFLAGS = -g -Wall -DLIFE -DLIFEFREQ=300
 +EXTRAFLAGS = -g -Wall -DLIFE -DLIFEFREQ=300 -DTANKDIR=\"$(TANKDIR)\"
 +
-+TANKDIR= $(X11PREFIX)/share/tanked
++TANKDIR= $(PREFIX)/share/tanked
  
  INCLUDES = -I../common
  
diff --git a/games/xboing/distinfo b/games/xboing/distinfo
index f7d22457894..8da4e64d185 100644
--- a/games/xboing/distinfo
+++ b/games/xboing/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2010/02/14 21:52:53 joerg Exp $
+$NetBSD: distinfo,v 1.12 2015/07/04 16:18:35 joerg Exp $
 
 SHA1 (xboing2.4.tar.gz) = 57fad37ab99e6a3ff87ff814d0de1baad3b93b91
 RMD160 (xboing2.4.tar.gz) = 3aa027dd7a7abe9b4119362a1c8b5fb968971567
 Size (xboing2.4.tar.gz) = 588811 bytes
-SHA1 (patch-aa) = d28a7f42480fba31f703ef1e4327142de3b7579b
+SHA1 (patch-aa) = 06048ae0ac114f6f929dcac93807f5981ec3ec98
 SHA1 (patch-ab) = 70d125ef4d34ad0dc92556b59cf6e4165d96004c
 SHA1 (patch-ac) = 97ac52a5f8095178f690a33df6ede70498c28fb7
 SHA1 (patch-ad) = 444331ce4cbca8e291331bc3d5e698e9f01d8f6e
diff --git a/games/xboing/patches/patch-aa b/games/xboing/patches/patch-aa
index e4166552271..f132428ad98 100644
--- a/games/xboing/patches/patch-aa
+++ b/games/xboing/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2010/02/14 21:52:53 joerg Exp $
+$NetBSD: patch-aa,v 1.11 2015/07/04 16:18:35 joerg Exp $
 
 --- Imakefile.orig	1996-11-22 01:28:46.000000000 +0000
 +++ Imakefile
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.10 2010/02/14 21:52:53 joerg Exp $
  XCOMM placed. Default will be the current directory.
  
 -    XBOING_DIR = .
-+    XBOING_DIR = ${DESTDIR}$(X11PREFIX)/share/xboing
++    XBOING_DIR = ${DESTDIR}$(PREFIX)/share/xboing
  
  XCOMM These are some defines that must be set. Some may be overwritten in the
  XCOMM machine arch section.
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 0b94b7611e2..2d4f5984f7d 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2014/01/11 14:42:03 adam Exp $
+# $NetBSD: Makefile,v 1.46 2015/07/04 16:18:35 joerg Exp $
 
 DISTNAME=		xconq-7.4.1
 PKGREVISION=		13
@@ -9,7 +9,6 @@ MAINTAINER=		kleink@NetBSD.org
 HOMEPAGE=		http://sources.redhat.com/xconq/
 COMMENT=		Xconq is a general strategy game system
 
-USE_X11BASE=		YES
 USE_TOOLS+=		gmake makeinfo
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-alternate-scoresdir=${SCOREDIR}
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 2db914356c3..fbbf02a3ff3 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2015/01/04 03:08:30 dholland Exp $
+# $NetBSD: Makefile,v 1.52 2015/07/04 16:18:35 joerg Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10
@@ -17,7 +17,6 @@ LICENSE=	xdoom-license
 DEPENDS+=	doom1-[0-9]*:../../games/doom1
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	yes
 USE_TOOLS+=	gmake gunzip tar unzip
 MAKE_ENV+=	X11BASE=${X11BASE:Q} INSTALL_PREFIX=${PREFIX:Q}
 
diff --git a/games/xfreecell/Makefile b/games/xfreecell/Makefile
index 2d1e837b95e..cb1729625dc 100644
--- a/games/xfreecell/Makefile
+++ b/games/xfreecell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/23 10:24:05 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2015/07/04 16:18:35 joerg Exp $
 
 DISTNAME=	xfreecell-1.0.5b
 PKGREVISION=	2
@@ -10,7 +10,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www2.giganet.net/~nakayama/
 COMMENT=	Popular freecell card game for X
 
-USE_X11BASE=	yes
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
 MAKE_FILE=	makefile
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index c8aa5f5c59d..4ca34bbd676 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2012/10/06 11:55:02 asau Exp $
+# $NetBSD: Makefile,v 1.45 2015/07/04 16:18:35 joerg Exp $
 
 DISTNAME=		xpuyopuyo-0.9.1
 PKGREVISION=		9
@@ -11,7 +11,6 @@ HOMEPAGE=		http://chaos2.org/xpuyopuyo/
 COMMENT=		Tetris-like puzzle game
 
 USE_TOOLS+=		automake autoconf gmake
-USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/games/xtris/Makefile b/games/xtris/Makefile
index 9eb5f39b702..95f09a2955d 100644
--- a/games/xtris/Makefile
+++ b/games/xtris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/10/06 11:55:04 asau Exp $
+# $NetBSD: Makefile,v 1.21 2015/07/04 16:18:35 joerg Exp $
 #
 
 DISTNAME=	xtris-1.15
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.iagora.com/~espel/xtris/xtris.html
 COMMENT=	Multi-player version of a popular game for the X Window system
 
 WRKSRC=		${WRKDIR}/xtris
-USE_X11BASE=	yes
 LIBS.SunOS+=	-lsocket -lnsl
 MAKE_ENV+=	LIBS=${LIBS:Q}
 
diff --git a/games/xzip/Makefile b/games/xzip/Makefile
index d153a1b932d..0445c928446 100644
--- a/games/xzip/Makefile
+++ b/games/xzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/06 11:55:04 asau Exp $
+# $NetBSD: Makefile,v 1.18 2015/07/04 16:18:35 joerg Exp $
 
 DISTNAME=		xzip180
 PKGNAME=		xzip-1.8
@@ -12,7 +12,6 @@ HOMEPAGE=		http://www.eblong.com/zarf/xzip.html
 COMMENT=		Z-code interpreter for X11 (Infocom game format)
 
 WRKSRC=			${WRKDIR}/xzip
-USE_X11BASE=		yes
 BUILD_TARGET=		xzip
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6