From 7823cbd3fdf4594d61188cdc4a357c28d2544aa5 Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Wed, 28 Jun 2000 15:02:31 +0000
Subject: Remove the user setting of the USE_LOCALBASE_FOR_X11 definition.
 (Users can still set it if they want, but it won't make much difference).

In bsd.pkg.mk, check for the presence of the xpkgwedge package to
determine whether to use LOCALBASE for X11 programs.  Set
_USE_LOCALBASE_FOR_X11 (an internal definition) if xpkgwedge is
installed. Remove BUILD_DEPENDS on xpkgwedge (it would always have
been true anyway).

Add a new X11PREFIX definition, which reflects the PREFIX for X11
packages, and set it to LOCALBASE or X11BASE accordingly.

Remove all references to USE_LOCALBASE_FOR_X11 from the xpkgwedge
package.

In all, make the installation of xpkgwedge a tad less clumsy.
---
 pkgtools/xpkgwedge/Makefile        |  4 ++--
 pkgtools/xpkgwedge/pkg/DEINSTALL   | 19 -------------------
 pkgtools/xpkgwedge/pkg/MESSAGE.pre |  5 +----
 3 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100755 pkgtools/xpkgwedge/pkg/DEINSTALL

(limited to 'pkgtools/xpkgwedge')

diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index 85065e2624e..3f8c5662277 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/09/27 18:38:30 tron Exp $
+# $NetBSD: Makefile,v 1.13 2000/06/28 15:02:32 agc Exp $
 #
 
 DISTNAME=	xpkgwedge-0.4
@@ -32,7 +32,7 @@ pre-install:
 .include "../../mk/bsd.pkg.mk"
 
 # In order to force xpkgwedge to install into X11BASE, we forcibly override
-# any user setting of USE_LOCALBASE_FOR_X11.  _NO_ other pkg should do this.
+# the PREFIX definition.  _NO_ other pkg should do this.
 PREFIX=${X11BASE}
 
 # Clear the build dependencies list so that xpkgwedge will not be recursively
diff --git a/pkgtools/xpkgwedge/pkg/DEINSTALL b/pkgtools/xpkgwedge/pkg/DEINSTALL
deleted file mode 100755
index 18a73128823..00000000000
--- a/pkgtools/xpkgwedge/pkg/DEINSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.3 1999/10/05 07:58:41 jlam Exp $
-#
-
-case "$2" in
-	DEINSTALL) cat <<EOF
-
-================================================================
-
-Note that you now need to undefine USE_LOCALBASE_FOR_X11 in your
-/etc/mk.conf!  If you do not remove that change, X11 pkgs will
-no longer build.
-
-================================================================
-
-EOF
-	;;
-esac
diff --git a/pkgtools/xpkgwedge/pkg/MESSAGE.pre b/pkgtools/xpkgwedge/pkg/MESSAGE.pre
index 8b58d584e01..c85d923d8e3 100644
--- a/pkgtools/xpkgwedge/pkg/MESSAGE.pre
+++ b/pkgtools/xpkgwedge/pkg/MESSAGE.pre
@@ -1,11 +1,8 @@
 ==========================================================================
-$NetBSD: MESSAGE.pre,v 1.4 1999/10/05 07:58:41 jlam Exp $
+$NetBSD: MESSAGE.pre,v 1.5 2000/06/28 15:02:33 agc Exp $
 
 NOTES:
 
-* You MUST define the environment variable USE_LOCALBASE_FOR_X11 in
-  /etc/mk.conf in order to allow pkgsrc to work with this special package.
-
 * You MUST set the environment variable XAPPLRESDIR in /etc/profile and
   /etc/csh.login by hand in order to make pkgs built with xpkgwedge run
   properly, e.g.
-- 
cgit v1.2.3