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.
in the process. (More information on tech-pkg.)
Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.
Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
* Replace ELK_USE_{X11,MOTIF} with ELK_GUI, which is either "none" or is
some combination of "xaw" and/or "motif".
* Reenable Motif -- it seems to build properly with OpenMotif-2.0.x.
* Modernize this package a bit and clean up how linker flags are passed to
the build process by using the new variables available.
Regen the patches files (one file per patch).
Fix for NetBSD ELF platform: files/stab-elf.c and config/untested/elf-netbsd-cc
(by way of patches/patch-af) adjusted.
Thanks to Nick for the helping hand and to Alistair for the previous work.
This should close PR 13527.
Make X11 support conditional by way if the ELK_USE_X11 variable.
I tried to enable Motif support: only Motif 1.X should work but
even with the lesstif12 package it does not - it does compile though.
So Motif support if commented out but leaved in case someone want to fix
ELK.
The somewhat bizarre "patching" method was used because I rewrote the
routine which grabs global text symbols from an object file, and this
should be independent of a.out or ELF. The result bears no similarity
to what was there before, so I decided to keep the original file with
a "-dist" suffix.
headers and libs.
Make this package work on Solaris.
Use the same "pkgsrc" configuration file for locations of objects on
NetBSD (both ELF and a.out) and Solaris.
Use a Makefile target, rather than a separate script.
Avoid clash with ALIGN definition in <sys/param.h>
- New, optional Makefile variable HOMEPAGE, specifies a URL for
the home page of the software if it has one.
- The value of HOMEPAGE is used to add a link from the
README.html files.
- pkglint updated to know about it. The "correct" location for
HOMEPAGE in the Makefile is after MAINTAINER, in that same
section.
file. Work out, form the architecture, what format of executable to
use (a.out or ELF), and use the appropriate configuration file.
However, here is (as yet) no ELF configuration file, because I have no
ELF system to try this on.
Clean up - do all the installation into the correct directories in
the "make install" step, so we don't need to putz around in the Makefile.
The patches have all been cleaned up, so that no -p1 argument is needed
to patch.
