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
editors/xemacs-nox11
The latter is now just editors/xemacs built with a specific set of
options. Changes include:
+ Add support for the following new options in options.mk:
x11 Support X11 displays
lucid Use Lucid widget set
Also add commented out support for the following options for
alternative widget sets:
gtk GTK widgets
motif Motif widgets
xaw Athena widgets
Note that USE_ATHENA, USE_GTK, and USE_MOTIF are legacy variables for
the corresponding options.
+ Remove Makefile.common and move all logic into xemacs/Makefile and
xemacs/options.mk.
+ Rename the "mule" PLIST variable to "canna", which more accurately
reflects what is conditionally installed.
+ Include termcap.buildlink3.mk to properly deal with termcap/curses
issues (xemacs needs termcap). Drop the --with-ncurses=no setting
as the issue is handled by termcap.buildlink3.mk.
+ In xemacs/Makefile, we don't need separate EXTRACT_ONLY and EXTRA_FILES
if we're actually going to extract all of those files all of the time.
Just list them all in DISTFILES.
+ Be slightly more aware of ${X11_TYPE} == "modular" by not referring to
${X11BASE} in that case.
+ In patch-ak, directly substitute the local value of etcdir (``../etc/'')
into src/Makefile.in.in. This allows for overriding etcdir via
INSTALL_MAKE_FLAGS at install-time so that destdir-style installation
will work.
+ 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 and xemacs-nox11 to 4. Both packages
now track and use the same PKGREVISION number.
packages with the modular Xorg equivalent. Those are falling back
to the old location by default, so this commmit doesn't change
dependencies.
graphics/xpm ==> x11/libXpm
fonts/Xft2 ==> x11/libXft
x11/Xfixes ==> x11/libXfixes
x11/xcursor ==> x11/libXcursor
x11/Xrender ==> x11/libXrender
x11/Xrandr ==> libXrandr
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.
install mule-x-init.elc which breaks "make package"
Fix this by uncommenting the entry for mule-x-init.elc in the
nox11 package as suggested by the submitter of pr 30020.
This fixes pr 30020
* Move library/header path configurations from xemacs/Makefile.common
to xemacs/Makefile and xemacs-nox11/Makefile. Don't add X-related
paths for -nox11. Fix build failure reported by bulk builds.
Fix the movemail.c format string vulnerability. Other changes are
mostly build & documentation fixes.
In pkgsrc, pass ${LOCALBASE} and ${X11BASE} as the --site-includes
/ --sith-libraries / --site-runtime-libraries to configure more
correctly. No visible change.
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_USE_CANNA
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.
Changes in this version:
* etc/OXYMORONS: Inserted "Corporate Culture" for 21.4.15.
* etc/package-index.LATEST.gpg: New, replaces
`package-index.LATEST.pgp'.
* etc/package-index.LATEST.pgp: Removed, replaced with
`package-index.LATEST.gpg'.
* configure.in: The icc compiler pretends to be gcc. It isn't.
* etc/PACKAGES (ERC): new.
* configure.usage (--with-widgets): widgets now defaults to
--with-widgets=no. Patch inspired by Jim Schumacher.
* etc/PACKAGES (riece): New package.
* etc/PACKAGES (liece): Mark as deprecated.
* configure.in: Add Intel C++ compiler detection to compiler
version reporting.
* configure.in: record additional info about compiler and libc
versions, to assist in debugging.
* configure.in (line 3573):
(Mule input methods):
Deprecate Motif for Linux.
(Installation): Report when LessTif is used.
* configure.in: installexe.sh is under srcdir, not blddir.
* aclocal.m4: Add icc (Intel compiler) support.
* configure.in: Ditto.
* configure.in (OS_RELEASE): Add support for SunOS 5.10.
On current OSes produced by Sun, `uname -r' prints "5.9".
It seems likely that on future OSes, `uname -r' will print "5.10".
We need to accept multi-digit release numbers.
* PROBLEMS: Propose bash as an alternative to buggy Solaris
/bin/sh.
* configure.in: XEmacs failed to build on Solaris9.
