Module Name:	pkgsrc
Committed By:	jlam
Date:		Mon Oct 23 17:32:09 UTC 2000

Modified Files:
	pkgsrc/mk: bsd.pkg.mk
	pkgsrc/pkgtools/xpkgwedge: Makefile
	pkgsrc/pkgtools/xpkgwedge/files: xpkgwedge.def
	pkgsrc/pkgtools/xpkgwedge/pkg: COMMENT DESCR MESSAGE.pre PLIST
Added Files:
	pkgsrc/pkgtools/xpkgwedge/files: pkgxmkmf.in
	pkgsrc/pkgtools/xpkgwedge/pkg: DEINSTALL INSTALL
Removed Files:
	pkgsrc/pkgtools/xpkgwedge/files: Imakefile

Log Message:
Update xpkgwedge to 1.0 and make appropriate changes to bsd.pkg.mk to handle
the new version of xpkgwedge.  Changes from xpkgwedge 0.4:

	* Redefine ImakeCmd to "imake -I$(PREFIX)/lib/X11/config" to
	  pick up X11 config files in $(PREFIX)/lib/X11/config before the
	  ones in the standard X11 tree.

	* Install a program called "pkgxmkmf" that's actually xmkmf, but
	  checks in $(PREFIX)/lib/X11/config before the standard X11 config
	  directory.

	* Create the host.def file in $(PREFIX)/lib/X11/config instead of
	  always in ${X11BASE}/lib/X11/config.

The benefits of this are:

	1) xpkgwedge can now install into $(PREFIX) instead of always into
	   $(X11BASE).

	2) Keeps the X11 tree "pure", and doesn't affect people who want
	   to run xmkmf and not include all the xpkgwedge stuff, even if
	   it's installed.

	3) Packages that install config files (lesstif, xview-config) can
	   now do so in $(PREFIX).

	4) People only have to use 'pkgxmkmf' instead of 'xmkmf', and
	   (hopefully) no other changes, if they want to use the config
	   files in xpkgwedge'd packages.


To generate a diff of this commit:
cvs rdiff -r1.591 -r1.592 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.14 -r1.15 pkgsrc/pkgtools/xpkgwedge/Makefile
cvs rdiff -r1.2 -r0 pkgsrc/pkgtools/xpkgwedge/files/Imakefile
cvs rdiff -r0 -r1.1 pkgsrc/pkgtools/xpkgwedge/files/pkgxmkmf.in
cvs rdiff -r1.2 -r1.3 pkgsrc/pkgtools/xpkgwedge/files/xpkgwedge.def
cvs rdiff -r1.1 -r1.2 pkgsrc/pkgtools/xpkgwedge/pkg/COMMENT
cvs rdiff -r0 -r1.5 pkgsrc/pkgtools/xpkgwedge/pkg/DEINSTALL
cvs rdiff -r1.3 -r1.4 pkgsrc/pkgtools/xpkgwedge/pkg/DESCR \
    pkgsrc/pkgtools/xpkgwedge/pkg/PLIST
cvs rdiff -r0 -r1.1 pkgsrc/pkgtools/xpkgwedge/pkg/INSTALL
cvs rdiff -r1.5 -r1.6 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.