scripts so that they are properly added and removed if xpkgwedge is
installed as a binary package. Also, add some protection against the case
where ${X11BASE} == ${PREFIX} by checking this isn't true before removing
these font-manipulation programs.
This is the same as the one in X11.tmpl, but without the LinkConfDirectory.
LinkConfDirectory removes the app-defaults directory in $(PREFIX)/lib/X11
and creates a link to the real X11 app-defaults directory and moves the old
app-defaults files into it. This is not what we want for pkgsrc.
This is for the people who use the real XFree86 version and not the one from
xsrc/xfree which has a NetBSD specific hack which breaks sharing /usr/X11R6.
Bump to version 1.2.
Convert most MESSAGE files to new syntax (${VARIABLE} gets replaced,
not @VARIABLE@, nor @@VARIABLE@@).
By default, substitutions are done for LOCALBASE, PKGNAME, PREFIX,
X11BASE, X11PREFIX; additional patterns can be added via MESSAGE_SUBST.
Clean up some packages while I'm there; add RCS tags to most MESSAGEs.
Remove some uninteresting MESSAGEs.
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.
(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.
(even imake ones) that will install in /usr/pkg instead of /usr/X11R6.
This is NOT (yet?) the standard X11 pkg build procedure, but it does
provide a "way out" for users that do not want to pollute their /usr/X11R6
tree with pkgs.
