Remove USE_X11BASE and X11PREFIX.

4 files changed, 6 insertions, 22 deletions

diff --git a/pkgtools/createbuildlink/files/createbuildlink b/pkgtools/createbuildlink/files/createbuildlink
index beff63e0cc9..a4e5ee88bc5 100755
--- a/pkgtools/createbuildlink/files/createbuildlink
+++ b/pkgtools/createbuildlink/files/createbuildlink
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: createbuildlink,v 1.35 2010/01/13 15:27:52 wiz Exp $
+#	$NetBSD: createbuildlink,v 1.36 2015/07/04 16:18:39 joerg Exp $
 #
 # Copyright (c) 2002 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -39,7 +39,7 @@
 # Create an initial buildlink3.mk from a package's Makefile and PLIST
 #
 
-REV=`echo '$Revision: 1.35 $' | sed 's/\\$//g'`
+REV=`echo '$Revision: 1.36 $' | sed 's/\\$//g'`
 tmpdir=/tmp
 spacesintab=8
 makefile=Makefile
@@ -90,13 +90,7 @@ PKGNAME=`@MAKE@ show-var VARNAME=PKGNAME`
 PKGVER=`echo $PKGNAME | sed -e 's/^.*-//'`
 PKGNOVER=`echo $PKGNAME | sed -e 's/-[^-]*$//'`
 PKGUPPER=`echo $PKGNOVER | tr '[:lower:]' '[:upper:]' | tr - _`
-PREFIX=X11PREFIX
-USE_X11BASE=`@MAKE@ show-var VARNAME=USE_X11BASE`
-if [ -z "$USE_X11BASE" ]; then
-	if ! grep "^USE_X11BASE" $makefile $commons > /dev/null; then
-		PREFIX=LOCALBASE
-	fi
-fi
+PREFIX=LOCALBASE
 
 ##
 ## create sed rules
diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile
index 9d3961ac4c2..2c69a6e1460 100644
--- a/pkgtools/pkg_filecheck/Makefile
+++ b/pkgtools/pkg_filecheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2015/06/12 10:50:56 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2015/07/04 16:18:39 joerg Exp $
 #
 
 PKGNAME=		pkg_filecheck-0.4
@@ -14,7 +14,6 @@ WRKSRC=		${WRKDIR}
 USE_TOOLS+=	perl:run
 USE_FEATURES=	fts_open
 
-FILES_SUBST+=	X11PREFIX=${X11PREFIX:Q}
 FILES_SUBST+=	PKG_DBDIR=${PKG_DBDIR:Q}
 CONF_FILES=	${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf \
 		${PKG_SYSCONFDIR}/pkg_filecheck.conf
@@ -27,7 +26,6 @@ SUBST_FILES.paths=	builddb.pl builddb.1 pkg_filecheck.conf
 SUBST_FILES.paths+=	pkg_filecheck.conf.5 pkg_filecheck.c pkg_filecheck.1
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@PERL5@,${PERL5},g'
-SUBST_SED.paths+=	-e 's,@X11PREFIX@,${X11PREFIX},g'
 SUBST_SED.paths+=	-e 's,@PKG_DBDIR@,${PKG_DBDIR},g'
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_STAGE.paths=	post-patch
diff --git a/pkgtools/pkg_filecheck/files/pkg_filecheck.conf b/pkgtools/pkg_filecheck/files/pkg_filecheck.conf
index 07308a43c15..fc601e272c6 100644
--- a/pkgtools/pkg_filecheck/files/pkg_filecheck.conf
+++ b/pkgtools/pkg_filecheck/files/pkg_filecheck.conf
@@ -1,4 +1,4 @@
-# $NetBSD: pkg_filecheck.conf,v 1.3 2006/07/02 10:32:09 rillig Exp $
+# $NetBSD: pkg_filecheck.conf,v 1.4 2015/07/04 16:18:39 joerg Exp $
 
 # location of package database
 dir @PKG_DBDIR@
@@ -7,12 +7,6 @@ db pkgdb.byfile.db
 # installation prefix for packages
 check @PREFIX@
 
-# If not using xpkgwedge:
-# xdb.byfile.db has to be created by running builddb
-#db xdb.byfile.db
-# installation prefix for X11-based packages
-#check @X11PREFIX@
-
 ignore @PREFIX@/etc
 ignore @PREFIX@/var/scrollkeeper
 ignore @PKG_DBDIR@
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index 8398e48bd24..d42c414b7a6 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.266 2015/07/03 09:52:04 abs Exp $
+# $NetBSD: makevars.map,v 1.267 2015/07/04 16:18:39 joerg Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -757,7 +757,6 @@ USE_PKGLOCALEDIR	YesNo [$package]
 USE_PKGSRC_GCC		Yes [$user]
 USE_TOOLS		List of Tool [*:a]
 USE_X11			Yes [$package]
-USE_X11BASE		Yes [$package]
 WARNING_MSG		ShellCommand [$system]
 WARNING_CAT		ShellCommand [$system]
 WRAPPER_REORDER_CMDS	List of WrapperReorder [b:a,c:a,m:a]
@@ -765,6 +764,5 @@ WRAPPER_TRANSFORM_CMDS	List of WrapperTransform [b:a,c:a,m:a]
 WRKDIR			Pathname [$system]
 WRKSRC			WrkdirSubdirectory [$package]
 X11_PKGSRCDIR.*		Pathname [$system]
-X11PREFIX		Pathname [$system]
 XAW_TYPE		{ 3d neXtaw standard xpm } [$user]
 XMKMF_FLAGS		List of ShellWord