summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authoruebayasi <uebayasi@pkgsrc.org>2007-10-29 04:38:47 +0000
committeruebayasi <uebayasi@pkgsrc.org>2007-10-29 04:38:47 +0000
commit407fff5c5d961a034e8b95bdf756e0dfc31f0ec0 (patch)
tree7c8d4d37fff1179ea560741783e2fabcf966ea5c /chat
parent5424cd00c120886d91987f6ba6e87f6c3abb1dee (diff)
downloadpkgsrc-407fff5c5d961a034e8b95bdf756e0dfc31f0ec0.tar.gz
Sort EMACS_VERSIONS_ACCEPTED.
Sort variables depending on ${EMACS_FLAVOR} (emacs or xemacs). Prefer assignment to conditional. Include mk/emacs.mk lazily. No functional changes intended.
Diffstat (limited to 'chat')
-rw-r--r--chat/riece/Makefile19
1 files changed, 9 insertions, 10 deletions
diff --git a/chat/riece/Makefile b/chat/riece/Makefile
index a975f0fc317..c41ac96a3d4 100644
--- a/chat/riece/Makefile
+++ b/chat/riece/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/05/30 13:46:13 uebayasi Exp $
+# $NetBSD: Makefile,v 1.13 2007/10/29 04:38:47 uebayasi Exp $
#
DISTNAME= riece-4.0.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.nongnu.org/riece/
COMMENT= IRC client for Emacs
EMACS_VERSIONS_ACCEPTED= \
- emacs21 emacs21nox emacs22 emacs22nox xemacs214
+ emacs22 emacs22nox emacs21 emacs21nox xemacs214
WRKSRC= ${WRKDIR}/${DISTNAME:C|[^0-9]$||}
@@ -19,15 +19,14 @@ GNU_CONFIGURE= YES
INFO_FILES= # PLIST
EMACS_MODULES= base
-.include "../../mk/emacs.mk"
+# --with-emacs=... or --with-xemacs=...
+CONFIGURE_ARGS+= --with-${EMACS_FLAVOR}=${EMACS_BIN:Q}
+CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${EMACS_FLAVOR}}
-.if ${EMACS_FLAVOR} == "emacs"
-CONFIGURE_ARGS+= --with-emacs=${EMACS_BIN:Q}
-.elif ${EMACS_FLAVOR} == "xemacs"
-CONFIGURE_ARGS+= --with-xemacs=${EMACS_BIN:Q}
-CONFIGURE_ARGS+= --with-packagedir=${EMACS_LISPPREFIX:C|/lisp\$||}
-.endif
# Riece digs sub directory.
-CONFIGURE_ARGS+= --with-lispdir=${EMACS_LISPPREFIX:Q}
+CONFIGURE_ARGS.emacs= --with-lispdir=${EMACS_LISPPREFIX:Q}
+CONFIGURE_ARGS.xemacs= --with-packagedir=${EMACS_LISPPREFIX:C|/lisp\$||}
+
+.include "../../mk/emacs.mk"
.include "../../mk/bsd.pkg.mk"