4 files changed, 16 insertions, 31 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 45359b62eb1..f69c9ba2f81 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.488 2000/06/27 20:14:45 hubertf Exp $			\
+#	$NetBSD: bsd.pkg.mk,v 1.489 2000/06/28 15:02:31 agc Exp $			\
 #
 # This file is in the public domain.
 #
@@ -84,8 +84,16 @@ CONFIGURE_ENV+=		CLASSPATH=${CLASSPATH} JAVA_HOME=${JAVA_HOME}
 SCRIPTS_ENV+=		CLASSPATH=${CLASSPATH} JAVA_HOME=${JAVA_HOME}
 .endif
 
+# if xpkgwedge is installed, set _USE_LOCALBASE_FOR_X11 and X11PREFIX
+.if exists(${X11BASE}/lib/X11/config/xpkgwedge.def)
+_USE_LOCALBASE_FOR_X11=	yes
+X11PREFIX=		${LOCALBASE}
+.else
+X11PREFIX=		${X11BASE}
+.endif
+
 .if defined(USE_MOTIF)
-.if defined(USE_LOCALBASE_FOR_X11)
+.if defined(_USE_LOCALBASE_FOR_X11)
 MOTIFBASE?=		${LOCALBASE}
 .elif ${OPSYS} == "SunOS"
 MOTIFBASE?=		/usr/dt
@@ -95,9 +103,8 @@ MOTIFBASE?=		${X11BASE}
 .endif # USE_MOTIF
 
 .if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11BASE)
-.if defined(USE_LOCALBASE_FOR_X11)
+.if defined(_USE_LOCALBASE_FOR_X11)
 PREFIX=			${LOCALBASE}
-BUILD_DEPENDS+=		${X11BASE}/lib/X11/config/xpkgwedge.def:../../pkgtools/xpkgwedge
 .else
 PREFIX=			${X11BASE}
 .endif
@@ -853,7 +860,7 @@ CONFIGURE_ENV+=		PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin
 .if defined(GNU_CONFIGURE)
 CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM} --prefix=${PREFIX}
 HAS_CONFIGURE=		yes
-.if defined(USE_LOCALBASE_FOR_X11)
+.if defined(_USE_LOCALBASE_FOR_X11)
 CONFIGURE_ARGS+=        --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 .endif
 .endif
@@ -2754,7 +2761,7 @@ COMMON_DIRS!= 	${AWK} 'BEGIN  { 				\
 
 .if !target(print-PLIST)
 print-PLIST:
-	@${ECHO} '@comment $$NetBSD: bsd.pkg.mk,v 1.488 2000/06/27 20:14:45 hubertf Exp $$'
+	@${ECHO} '@comment $$NetBSD: bsd.pkg.mk,v 1.489 2000/06/28 15:02:31 agc Exp $$'
 	@${FIND} ${PREFIX}/. -newer ${EXTRACT_COOKIE} \! -type d 	\
 	 | ${SED} s@${PREFIX}/./@@ 				\
 	 | sort							\
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.