the make required by the imake config files, which is specified by
${IMAKE_MAKE}. This allows differing make programs to be used for
the main build versus xmkmf.
invoking the make(1) program as "make" instead of hardcoding the
(wrong) path in ${MAKE_PROGRAM}. This will rely on the tools framework
to have set up "make" to properly call the correct make(1) program.
This should fix cases where pkgxmkmf called the wrong make(1) program
on Linux systems.
Several changes are involved since they are all interrelated. These
changes affect about 1000 files.
The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files. Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred. This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.
The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.
The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc. The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.
The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files. Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories. These files are used as input
to imake since imake can't use stdin for that purpose.
The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead. This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed. Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries. Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
which are the full option names used to set rpath directives for the
linker and the compiler, respectively. In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath. The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use. They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively. Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.
required to install fonts/jmk-fonts and fonts/sgi-fonts with recent X.
Suggested by Kibum Han.
Also add mkfontscale to CONFLICTS because mkfontscale installs
bin/mkfontscale.
Bump PKGVERSION to 1.11.
this package work in a pkgviews world by looking for imake config files
in ${PREFIX}/lib/X11/config, then ${VIEWBASE}/lib/X11/config, then
${X11BASE}/lib/X11/config. The second directory is where some packages
may share a commonly-editted host.def file.
the font program symlinks at both view-deinstall and normal deinstallation
time since the files aren't listed in the PLIST (the font programs are
handled completely by the INSTALL/DEINSTALL scripts).
yes, this deliberately does not expand ${X11BASE}, as that would
lead to the same confusion (X11R6 vs. openwin, etc.) when we use
this pkg's COMMENT on the web site/search.
sed at install time which override the versions in the /usr/openwin
tree.
PREFIX no longer has a default value, as this relied on nonportable
BSD make syntax. Makefiles generated with pkgxmkmf will now always
need PREFIX set in the environment.
USE_PKGINSTALL is "YES". bsd.pkg.install.mk will no longer automatically
pick up a INSTALL/DEINSTALL script in the package directory and assume that
you want it for the corresponding *_EXTRA_TMPL variable.
* Use bsd.pkg.install.mk instead of supplying custom INSTALL/DEINSTALL
scripts.
* Note that this package doesn't really use buildlink.
* Remove ancient BUILDLINK_DEPENDS= line at the bottom of the file that
we no longer need since the buildlink1 days of yore.
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.
