alternative from mk/jpeg.buildlink3.mk
This allows selection of an alternative jpeg library (namely the x86 MMX,
SSE, SSE2 accelerated libjpeg-turbo) via JPEG_DEFAULT=libjpeg-turbo, and
follows the current standard model for alternatives (fam, motif, fuse etc).
The mechanical edits were applied via the following script:
#!/bin/sh
for d in */*; do
[ -d "$d" ] || continue
for i in "$d/"Makefile* "$d/"*.mk; do
case "$i" in *.orig|*"*"*) continue;; esac
out="$d/x"
sed -e 's;graphics/jpeg/buildlink3\.mk;mk/jpeg.buildlink3.mk;g' \
-e 's;BUILDLINK_PREFIX\.jpeg;JPEGBASE;g' \
< "$i" > "$out"
if cmp -s "$i" "$out"; then
rm -f "$out"
else
echo "Edited $i"
mv -f "$i" "$i.orig" && mv "$out" "$i"
fi
done
done
This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.
Don't call pkg_info to get the installed Emacs version; always use the
version matching EMACS_TYPE set by users. Be DEPENDS to it. This should
address pkg/37146 by Aleksey Cheusov.
While here convert some emacs lisp packages to user-destdir.
editors/xemacs-current
editors/xemacs-current-nox11
The latter is now just editors/xemacs-current built with a specific set
of options. Changes include:
+ Rename the "xaw" option to "lucid" to match the option name used in
xemacs/options.mk. Also comment out the "esound" option which isn't
fully supported yet. Add some comments to the options.mk file to
make it a little easier to understand.
XXX Should probably add a pgsql option as this version of XEmacs has
XXX some sort of PostgreSQL support. Also need to sort out native
XXX sound support.
+ Remove Makefile.common and move all logic into xemacs-current/Makefile
and xemacs-current/options.mk.
+ As of version 21.5, xemacs switched to using GNU autoconf, so set
GNU_CONFIGURE=yes.
+ Include termcap.buildlink3.mk to properly deal with termcap/curses
issues (xemacs needs termcap). Drop the --without-ncurses setting
as the issue is handled by termcap.buildlink3.mk.
+ Be slightly more aware of ${X11_TYPE} == "modular" by not referring to
${X11BASE} in that case.
+ Include buildlink3.mk files for zlib and gettext, which are detected
automatically if they're in the base system. Gettext is needed for
MULE support.
+ In the Makefile and the PLIST, don't substitute for ${EMACSVER}.
Instead substitute for ${DISTNAME} so the PLIST looks closer to
xemacs/PLIST.
+ Add patch-al which handles a difference between bmake and gmake in
using $< in a makefile target.
+ Support DESTDIR installation by adding INSTALL_MAKE_FLAGS to override
where files are installed during the install phase.
+ Honor PKGMANDIR.
+ Bump the PKGREVISION for xemacs-current and xemacs-current-nox11 to 1.
Both packages now track and use the same PKGREVISION number.
reading info files. Also strip the split info files from the PLIST
as the plist module handles them automatically. Lastly, define
INFO_FILES so that the pkginstall framework properly manages the "dir"
info file database index in the xemacs info directory.
Bump the PKGREVISION.
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.
From the ChangeLog:
* XEmacs 21.5.19 "chives" is released.
"chives" is the twentieth in the VEGETABLE series.
Relative to XEmacs 21.5.18 "chestnut", "chives" includes a large
number of minor enhancements and work-in-progress. Some important or
annoying bugs have been fixed:
- The lstream data truncation bug (often observed as truncated emails
or truncated process input in buffers) has been identified and
fixed, we believe (hard to test).
- The bug where process output insertion replaced the whole buffer,
rather than just the region, has been fixed.
- The "Metacity maximize" bug (which was XEmacs's fault, not the
window manager's) has been fixed.
Known remaining bugs include:
- Aborts due to recursive entry to the allocation code from error
handlers. Workaround: avoid getting the memory full warnings (at
75% and 95% of memory space).
- A regression test failure in no-Mule builds. Workaround: don't
run the c-tests.el series when running tests. (Simply move
tests/automated/c-tests.el out of the way.)
Currently fairly stable, this seems to be a good point to release a
beta as a checkpoint. At the user level the most visible changes are
extension of the "behavior" mechanism for enabling and disabling
features, and a major reorganization of the documentation in the
source tree. For behaviors, see the Options->Behaviors submenu.
The source documentation changes include
At top level,
README has been gutted, with most content moved to the FAQ.
BUGS and README.packages were removed, with much of their content
moved to the FAQ.
GETTING.GNU.SOFTWARE was removed.
In etc,
BETA, CHARSETS, CODING-STANDARDS, CODINGS, DEBUG, DISTRIB, MACHINES,
and PACKAGES were removed, with most content moved to various Texinfo
documents.
FTP, GNU, LPF, MAILINGLISTS MORE.STUFF, MOTIVATION, ORDERS,
ORDERS.EUROPE, ORDERS.JAPAN, README.HYPERBOLE, README.OO-BROWSER,
SERVICE, and TERMS were removed.
PROBLEMS and etc/README were revised.
For developers, the following important internal API changes occurred.
- Initialization code (called from emacs.c:main_1()) has been
refactored. See the ChangeLog (2004-10-27, Ben Wing) for details.
- The GCPRO API has been refactored. See the ChangeLog (2004-10-27,
Ben Wing) for details. (Yes, it was a megapatch: same log entry.)
For more detailed information, there is a list of credits, and then
the full ChangeLogs, following the availability information.
For general information about XEmacs, the developers, and the user
community, see our home page,
http://www.xemacs.org/
Remove esound-support from options.mk until i find the reason why
libossaudio is not used.
Fix canna-support with a patch from Thomas Klausner. Thanks.
esound ldap xface canna
# XXX Support for the following variables will be removed after the
# XXX pkgsrc-2004Q4 branch is released:
# XXX
# XXX USE_OPENLDAP
# XXX USE_XFACE
# XXX XEMACS_ESD
# XXX XEMACS_USE_CANNA
From the Releasenotes:
Relative to XEmacs 21.5.17 "chayote", "chestnut" has Jerry James's new
bignum support. You can now keep track of the U.S. national debt to
the penny, or count to Avogadro's number by ones! Speaking of really
big numbers, Malcolm Purvis has one in mind: "two". To GTK+ fans,
that's an awfully big number. It's not here yet, but Malcolm has put
in a lot of patches, and a port to GTK+ v2 could start soon. Jerry
James has started using the Uno code checker to clean up unused
variables and other ugliness. Completion of the portable dumper
project is in sight, as Olivier Galibert has contributed code to
attach the dumpfile to the executable.
A large number of contributors have provided the usual assortment of
bug fixes and feature additions, small and large.
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.
