options.mk.
Since Makefile.common now does not see the x11 option, we have to move
all x11 related commands into options.mk. Within options, move
.includes to the end for consistency.
because of a problem with NetBSD-current libarchive-as-tar, see bin/56080.
Note this depencency is not a burden, since xemacs-packages requires
gtar, anyway.
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.
