From cc8ee8766ed98eb48347819d4d54e53ada8da5db Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Sat, 30 Jun 2007 13:21:13 +0000
Subject: 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.

---
 www/emacs-w3m/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'www')

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
 
-- 
cgit v1.2.3