diff options
| author | uebayasi <uebayasi@pkgsrc.org> | 2003-07-17 09:09:58 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi@pkgsrc.org> | 2003-07-17 09:09:58 +0000 |
| commit | 223429e75fca6d8867fbaf2376f7165847c47ba1 (patch) | |
| tree | 7d9f21f7c5a792a8f9102784d697f26608e0551c | |
| parent | 5e4225a2a71b84cc6e0473db6c9891fdf1e6c681 (diff) | |
| download | pkgsrc-223429e75fca6d8867fbaf2376f7165847c47ba1.tar.gz | |
Introduce CUE_USE_CANNA, which determines whether to enable Canna support.
Default is NO.
This addresses PR19010 by Takashi Yamamoto.
| -rw-r--r-- | mail/cue/Makefile | 15 | ||||
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 7 |
2 files changed, 15 insertions, 7 deletions
diff --git a/mail/cue/Makefile b/mail/cue/Makefile index 6fc2896d0d5..5e56254978f 100644 --- a/mail/cue/Makefile +++ b/mail/cue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2003/07/16 09:24:14 itojun Exp $ +# $NetBSD: Makefile,v 1.22 2003/07/17 09:09:59 uebayasi Exp $ DISTNAME= cue-snap-20030714 PKGNAME= cue-20030714 @@ -13,16 +13,20 @@ USE_BUILDLINK2= yes .include "../../mk/bsd.prefs.mk" -BUILD_DEFS+= USE_INET6 USE_IDEA USE_CANNA +BUILD_DEFS+= USE_INET6 USE_IDEA CUE_USE_CANNA -.if defined(USE_INET6) && ${USE_INET6} == "YES" +.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss]) CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif -# require Canna, for now, cue assumes Japanese encoding anyways -CONFIGURE_ARGS+= --with-canna=${BUILDLINK_PREFIX.canna-lib} +.if defined(CUE_USE_CANNA) && !empty(CUE_USE_CANNA:M[Yy][Ee][Ss]) +.include "../../inputmethod/canna-lib/buildlink2.mk" +CONFIGURE_ARGS+= --with-canna=${BUILDLINK_PREFIX.canna} +.else +CONFIGURE_ARGS+= --without-canna +.endif CONFIGURE_ARGS+= --with-openssl=${SSLBASE} .if defined(USE_IDEA) CONFIGURE_ARGS+= --enable-idea @@ -36,6 +40,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/cue.hlp ${PREFIX}/share/doc/cue ${INSTALL_DATA} ${WRKSRC}/cue.html ${PREFIX}/share/doc/cue -.include "../../inputmethod/canna-lib/buildlink2.mk" .include "../../security/openssl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 5f7dde5ca6f..0e60cdcc26b 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.160 2003/07/12 14:24:15 salo Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.161 2003/07/17 09:09:58 uebayasi Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -621,6 +621,11 @@ CLAMAV_USER?= clamav # Possible: any user name # Default: clamav +CUE_USE_CANNA?= NO +# Used by cue package to determine whether to enable Canna support. +# Possible: YES, NO +# Default: NO + CUPS_GROUP?= sys # Used in cups to specify the group to run CUPS commands as. # Possible: any group name |