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.
* xhippo.c: Changed version to 2.0. A while ago I forked this
version to experiment with using a CList rather than a List; I
think this will be the way to go in the future, so I'm sticking
with it. The scrolled window now always has the right scrollbar
and never the bottom one; this was HiP's behaviour, and I rather
liked it. It occurred to me that I hadn't done much development on
xhippo since it became a GNU project, so I figured that it was
time to spend some time on the improved version and tidy it up a
little. Reenabled scroll_catchup that I'd commented out; it now
works but gets positioning slightly wrong. Made the load requester
OK handler scroll the list back up to the top. Added -Wall to the
compilation options to find compiler warnings (and removed
them). Noticed that ID3 tag reading is horribly broken, reading
(apparently) 4 more characters than it should; fixed, although I
don't have the ID3 spec to fix it properly. Added HiP-esque
keyboard accelerators for Stop and Random. (I've bound both KP*
and KP- to Random because on the Amiga keyboard the star is in the
top right corner. I have no idea what HiP's accelerator for Stop
was, so I've bound / to it.) Fixed the Restart button (adding
last_played along the way). Also, I have no idea what I did, but
it fixed the resizing problem, so that's good. Checked the look of
the interface with several GTK themes... it's looking good!
(Particularly with XFCE.)
