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.
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.
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.
