Commit graph

47 commits

Author SHA1 Message Date
uebayasi
28c4854853 Correct dependency patterns for xemacs*nox (xemacs-nox -> xemacs-nox11). 2007-11-12 01:58:24 +00:00
uebayasi
7a7c67a977 Support xemacs215nox (XEmacs 21.5.x without X). 2007-11-12 01:55:03 +00:00
rillig
171c4b82b8 Variables that are not lists should not use the empty(...:M) construct
if the same can be expressed more clearly.

Added some internal variables to be shown by "bmake show-all-emacs".
2007-11-03 11:23:06 +00:00
uebayasi
04325ed444 Fix a typo. 2007-10-29 13:13:31 +00:00
uebayasi
f1e0ce13c4 Enable buildlink3.mk for EmacsLisp package build.
This works very straightfoward; create set of symbolic links of *.el / *.elc
files under ${BUILDLINK_DIR}/share/emacs.  At configure and build stage,
emacs / xemacs binaries run with the EMACSLOADPATH pointed to there.  This
should work because those EmacsLisp packages assume the Emacs / XEmacs program
running at build time and that running after installation are identical and
the task looking for other *.el / *.elc files is Emacs / XEmacs's business.

I have tested only Emacs 21 and Emacs 22.  XEmacs should work ... at least
XEmacs supports EMACSLOADPATH too if grep worked correctly.

While here change the following:

* Provide {FOR,NOTFOR}_emacs_{x,nox} switches to be used in PLIST.

* Add the xemacs214nox entry.

* Clean up "leim" handling code; avoid .if ... .endif as far as possible.
2007-10-29 12:52:36 +00:00
dsainty
2e3ae84d55 Fix some typos in comments, no functional change 2007-08-08 08:12:12 +00:00
joerg
4c6eff78c5 Don't use open-ended dependencies for emacs20 and emacs21 to avoid
the wrong version from being picked up by pkg_add or bin-install.

OK uebayasi@
2007-06-30 05:13:24 +00:00
uebayasi
6dca21bcf0 I forgot it's freeze, revert the previous for safety.
But actually, the default didn't change because EMACS_TYPE is set to
emacs21 in pkgsrc/mk/defaults/mk.conf.

I will clean up all Emacs Lisp packages to be emacs22-capable, then change
the default.
2007-06-30 05:04:41 +00:00
uebayasi
7d167f62c4 Now the recommended GNU Emacs version (pkgsrc/editors/emacs) is Emacs 22.
Depend & install it if users don't set EMACS_TYPE explicitly.
2007-06-30 04:42:45 +00:00
uebayasi
965f24b7d2 leim for Emacs 22 is always installed with the base. Nothing additional is
needed.
2007-06-21 13:20:59 +00:00
markd
0efad1146f EMACS_ETCPREFIX is documented as being substituted in PLIST's.
Make it so.
2007-06-20 11:40:22 +00:00
markd
7f1ee5089b update locations of emacs 21 and emacs 22 packages. 2007-06-11 14:01:58 +00:00
rillig
fd3be0a23a Fixed a typo, which has been discovered by Mark E. Perkins. 2007-06-07 10:46:32 +00:00
rillig
1618d58608 Made the generation of the PLIST_SUBST entries a bit simpler. 2007-06-06 08:33:54 +00:00
rillig
136a6388fe Added BUILD_DEFS. 2007-06-06 08:25:04 +00:00
rillig
7c0810303e Removed the comment about REPLACE_EMACS, since there isn't any code
implementing it.

Added the variable description (_VARGROUPS).
2007-06-06 08:23:23 +00:00
uebayasi
d660bce7c0 Teach emacs22nox and leim22. 2007-02-20 12:36:02 +00:00
jnemeth
ae54396f9d Fix _EMACS_VERSION_NOREV. Thanks to dsl@ for spotting the missing ".". 2007-02-19 09:20:59 +00:00
jnemeth
a4a461c83c add emacs22nox stuff 2007-02-11 11:38:43 +00:00
wiz
0d9cad1ded Remove obsolete EMACS_USE_LEIM after 3 branches. 2007-01-30 07:10:05 +00:00
uebayasi
8b10f06a4c Support Emacs 22, which is hold in wip/emacs-current. Prompted by wiz.
(Should I put a note "emacs22" EMACS_TYPE is experimental somewhere?)
2007-01-27 12:27:42 +00:00
jlam
78c3fbd8fe Create a new variable EMACS_MODULES that is a list of "standard" elisp
modules that is required by the package.  The allowed modules are
"base" and "leim".  EMACS_USE_LEIM is deprecated and should be replaced
with EMACS_MODULES+=leim.
2006-03-20 05:24:33 +00:00
jlam
29fefe52e3 * Creates a new variable PKGINFODIR (named similarly to PKGMANDIR)
that is a purely user-settable variable to represent the relative
  path under ${PREFIX} where info files are stored and "dir" files
  are managed.  PKGINFODIR defaults to "info".  INFO_DIR still works,
  but will be obsoleted after the 2006Q1 branch.

* Modify GNU_CONFIGURE_INFODIR to only honor ${PKGINFODIR} if the
  package installs directly into ${PREFIX} and not some subdirectory
  under ${PREFIX}.  This fixes packages that don't really honor
  $(infodir) all that well, and also avoids PLIST problems relating
  to directory removal for those packages.

* Since the majority of Emacs Lisp packages use GNU_CONFIGURE, just
  set GNU_CONFIGURE_INFODIR directly to ${EMACS_INFOPREFIX}, which is
  the Emacs-distro-specific location for info files.  Also pass
  EMACS_INFOPREFIX through PLIST_SUBST for PLIST substitution.

* INFO_FILES should be defined if the package installs info files.
  If the info files are not listed in the PLIST, then INFO_FILES
  must list the filenames for the info files installed by the package,
  which are assumed to be located in ${PREFIX}/${PKGINFODIR}.

* The plist module can now better detect info files listed in PLISTs
  and exports a command to the pkginstall module to append info file
  names to the +INFO_FILES scriptlet at install-time.

* The print-PLIST target is updated to properly list info files in
  the auto-generated PLIST.

* The check-files code is updated to skip all "dir" Info database files.
2006-03-20 01:48:57 +00:00
uebayasi
9062d05971 Export EMACS_VERSION_MAJOR and EMACS_VERSION_MINOR to packages using emacs.mk. 2006-03-11 06:23:20 +00:00
rillig
999f8b6e04 Applied all quoting fixes found by "pkglint --autofix". 2005-12-05 22:07:07 +00:00
rillig
fddefa4338 Removed trailing white-space in comments. 2005-09-01 22:23:41 +00:00
uebayasi
e199dccb5a Correct a make(1) syntax to fix a malformed conditional error seen
on older NetBSD or other *BSD systems.  Reported by Krister
Walfridsson and Jeremy Reed respectively.
2005-08-30 05:55:05 +00:00
uebayasi
aa8e85bcfd Rework emacs.mk:
1) Simplify the way how an emacs version is picked when no emacs
   is installed, but a user try to install an Emacs Lisp package.
   Just pick up the version set as EMACS_TYPE than searching for
   versions already installed etc.  If the EMACS_TYPE version is
   not supported by the Emacs Lisp Package, just fail.  EMACS_TYPE
   be default to GNU Emacs 21.

   (In other words, users should set EMACS_TYPE as they want.
   Otherwise GNU Emacs 21 is used.)

2) All Emacs Lisp Packages *must* prepend EMACS_PKGNAME_PREFIX to
   a) the PKGNAME itself, and b) PKGNAME in its dependency lines.
   EMACS_PKGNAME_PREFIX is expanded to "xemacs-" when XEmacs is
   used.  This keeps dependency graph of Emacs-Lisp-packages-
   installed-for-XEmacs consistent.

3) Document EMACS_* variables as much as possible.

4) Provide more cookies for PLIST.  Maybe utilized later.

Note that the 2) change doesn't affect the default, GNU Emacs 21
behaviour.  So no version / revision bumps in this commit.
2005-08-28 04:25:28 +00:00
rillig
04222ada9c Replaced three instances of $s with ${s} to make it consistent with the
three instances that were already ${s}.
2005-05-22 21:52:49 +00:00
jwise
e73be0151f Second cut of a fix for the problem where PKGNAME is geting set to xemacs-${VERRSION}
(not xemacs-${PKGNAME}-${VERSION}) for all packages using this and not explicitly
setting PKGNAME>

A better way of doing this should be found, but this fixes builds.
2005-04-08 19:05:29 +00:00
jwise
c7e28bb93b Do NOT assume that DISTNAME == PKG_NAME just to avoid using :=.
Doing so broke any package (such as matlab-mode) where these were not equal,
and in a particularly damaging and non-obvious way.
2005-03-07 17:48:08 +00:00
jlam
841b57441b Merge pkgviews-mk branch into the HEAD by running:
cd pkgsrc/mk
	cvs update -Pd -A
	cvs update -Pd -j pkgviews-mk-base -j pkgviews-mk
2003-09-02 06:59:37 +00:00
minoura
123ee8783e XEmacs is 21.4, not 21.1. 2003-08-18 13:16:24 +00:00
jmc
d9a2327baa Fix typo with use of _EMACS_VERSION_FIRSTACCEPTED 2003-04-24 18:22:07 +00:00
uebayasi
5d1db033e4 Our XEmacs stable version is 21.4.x. 2003-04-11 01:23:14 +00:00
uebayasi
05ad69e68f Reflect the Emacs/Leim 20/21 move. 2003-04-11 01:20:44 +00:00
uebayasi
3e16e4b300 Skip if no valid Emacs version found. For bulk builds. 2003-01-25 03:21:30 +00:00
seb
21fc387aba Better use '-[0-9]*' than '-*' for wildcard conflicts registration. 2002-12-23 11:24:40 +00:00
drochner
75bd8ee495 let it recognize emacs-nox11, patch submitted by Hiramatsu Yoshifumi
per PR pkg/19147, with a small variable name change by me
(emacs21-nox11->emacs21nox)
2002-12-17 16:54:13 +00:00
schmonz
a2849a9dca Replace IGNORE into PKG_FAIL_REASON and PKG_SKIP_REASON, so pkgsrc
can stop builds when a dependency is broken, yet continue builds
when a dependency is merely skipped (usually because it duplicates
functionality in the base system). Thus IGNORE_FAIL, the
oft-misunderstood and naught-documented option, goes away.

This addresses many people's complaints on tech-pkg@ and other
lists, as well as PR pkg/18157.
2002-12-07 02:37:56 +00:00
uebayasi
09bd111644 * EMACS_VERSION_ACCEPTED -> EMACS_VERSIONS_ACCEPTED
* Set CONFLICTS appropriately so that Emacs version and XEmacs version of a
  package can't be installed at once.
2002-11-27 09:13:47 +00:00
wiz
07ada65434 Use ${PKG_INFO} instead of ${PKG_TOOLS_BIN}/pkg_info; replace leading spaces
with tabs.
2002-11-14 03:56:53 +00:00
minoura
0472a082cd 1. Strip out nb? suffix from EMACS_VERSION
2. New variable PKGNAME_PREFIX, which is either null string or xemacs-
depending on EMACS_FLAVOR.  Intended to use like:
DEPENDS+=	${PKGNAME_PREFIX}apel>=10.4:../../devel/apel
BUILD_DEPENDS+=	${PKGNAME_PREFIX}apel>=10.4:../../devel/apel
2002-10-19 06:48:03 +00:00
uebayasi
561b979f39 Nuke a bogus invocation of 'pkg_info -I' and use 'pkg_info -e' instead.
Simplify the '!=' lines.

Pointed out by wiz (a.k.a. wizd(8)).
2002-09-28 14:19:51 +00:00
uebayasi
bde7f9bfcb * Assume each Emacs lisp package supports only (GNU) Emacs 20/21 by default.
* Slightly modify the way to prefix "xemacs-" to a package compiled for XEmacs.

* Suppress warnings issued when Emacs/XEmacs are not installed.
2002-09-16 12:51:34 +00:00
uebayasi
bf3386ac95 * Prefix PKGNAME with "xemacs-" if the package is for XEmacs.
* Do the trick in mk/emacs.mk instead of each package's Makefile.
2002-09-14 02:19:29 +00:00
uebayasi
d177730c30 A Makefile fragment for Emacs Lisp packages. 2002-09-13 10:36:20 +00:00