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.
This is a bugfix-release. It should be compatible with bones files
and savegames all the way back to 3.4.0 (but of course it's safer
to ascend before upgrade).
Assorted fixes (full list in doc/fixes34.3):
* Correct several inconsistencies
* Correct a potentially fatal bug caused by dropping loadstones
* Handle level completely filled with monsters better
* X11 player selection fixes, one of which could be fatal
* Eliminated a gold-in-shop-container cheat
This is a bugfix release which fixes over 100 bugs including but
not limited to:
* Fixed a fatal bug that triggered a panic when your secondary weapon
was cursed during bones file creation
* Fixed a fatal bug that caused a crash when applying figurine, candle,
or bell that gets used up
for a complete list, see doc/fixes34.2
Old savegames and bones levels from nethack 3.4.1 (and 3.4.0) should
still work, but as usual, caution is advised.
This is a bugfix release, no new features introduced.
As a compensation for no new features, savegames and bones levels
from NetHack 3.4.0 should work, and that's why I kept the datafile
directory named nethackdir340. In theory you should be able to
simply update the nethack pkgs and continue playing, but I'll not
accept any death threats if it doesn't work, so please make sure
you make the appropriate backups before trying.
called nethackdir340). This is to ease the lives of people who wish to
have multiple versions nethack installed at the same time. It is not fully
automated, because doing pkgsrc magic will most likely screw things up
one funny way or another. And we all know that the most important thing
in this world is the nethack scorefile ...
Manually bump version to 3.4.0nb1.
Highlights of the new release:
* numerous bugfixes
* stamina affects ability to throw heavy things
* objects merge in containers
* several small refinements to race/role separation
* more feedback about skill advancement from #enhance command
* "autodig" option
* option for starting without a pet
+ many more, read doc/fixes34.0
Old savegames naturally don't work, so make sure you finish old ones
before upgrading the package.
Also fixes the rest of pkg/15717 by Bernd Ernesti. Solution was the same
as what Thomas Klausner used to fix angband (ie. simply duplicate the
patches)
references of the pkglint package.
_PKGSRCDIR is an internal definition in bsd.pkg.mk, and a few packages
which would like to refer to other packages in the build tree. It should
not be set by users, but neither should it stop a user from building a
package if it is defined, so make it obvious that this is the case.
redefines about which buildlink.mk files would care is BUILDLINK_X11_DIR,
which points to the location of the X11R6 hierarchy used during building.
If x11.buildlink.mk isn't included, then BUILDLINK_X11_DIR defaults to
${X11BASE} (set in bsd.pkg.mk), so its value is always safe to use. Remove
the ifdefs surrounding the use of BUILDLINK_X11_DIR in tk/buildlink.mk and
revert changes to move x11.buildlink.mk before the other buildlink.mk files.
use X11_BUILDLINK_MK as a test value. Generally just reordering the
inclusions so that x11.buildlink.mk comes before the other buildlink.mk
files will make everthing work.
to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links. These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.
Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
