Module Name:	pkgsrc
Committed By:	agc
Date:		Wed Jun 28 15:02:34 UTC 2000

Modified Files:
	pkgsrc/mk: bsd.pkg.mk
	pkgsrc/pkgtools/xpkgwedge: Makefile
	pkgsrc/pkgtools/xpkgwedge/pkg: MESSAGE.pre
Removed Files:
	pkgsrc/pkgtools/xpkgwedge/pkg: DEINSTALL

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -r1.488 -r1.489 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.12 -r1.13 pkgsrc/pkgtools/xpkgwedge/Makefile
cvs rdiff -r1.3 -r0 pkgsrc/pkgtools/xpkgwedge/pkg/DEINSTALL
cvs rdiff -r1.4 -r1.5 pkgsrc/pkgtools/xpkgwedge/pkg/MESSAGE.pre

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.