diff options
| author | joerg <joerg@pkgsrc.org> | 2007-06-30 13:21:13 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-06-30 13:21:13 +0000 |
| commit | 4701a293ecfb784b865ea99492551c844e235260 (patch) | |
| tree | 52ca0f22571410fde2fe9fbf6e9d157ed0f691e5 | |
| parent | f96c6ae7ef10627961182032170188bcbd0b953f (diff) | |
| download | pkgsrc-4701a293ecfb784b865ea99492551c844e235260.tar.gz | |
Fix an issue that bothered me ever since I started working on the
bulk build code. emacs-w3m uses EMACS_FLAVOR and EMACS_VERSION_MAJOR
to conditionally add a build time dependency on Mule-UCS. The latter
variable is not set when no emacs package is installed though and
therefore a dependency got added between scan phase and build phase,
possibly resulting in multiple builds of Mule-UCS in older
(non-pbulk) bulk builds. Fix this by switching to EMACS_TYPE for
the logic.
| -rw-r--r-- | www/emacs-w3m/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index 14c54213ced..11f93afdbb5 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2007/02/19 09:22:30 jnemeth Exp $ +# $NetBSD: Makefile,v 1.20 2007/06/30 13:21:13 joerg Exp $ DISTNAME= emacs-w3m-1.4.4 PKGREVISION= 1 @@ -21,8 +21,7 @@ DEPENDS+= ${EMACS_PKGNAME_PREFIX}semi-[0-9]*:../../devel/semi DEPENDS+= ${EMACS_PKGNAME_PREFIX}apel>=10.3:../../devel/apel .endif -.if ${EMACS_FLAVOR} == "emacs" && \ - (${EMACS_VERSION_MAJOR} == 21 || ${EMACS_VERSION_MAJOR} == 22) +.if ${EMACS_TYPE} == "emacs21" || ${EMACS_TYPE} == "emacs22" BUILD_DEPENDS+= ${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.84:../../editors/mule-ucs .endif |