1 files changed, 18 insertions, 10 deletions
diff --git a/mail/cue/Makefile b/mail/cue/Makefile
index e1a6224b98f..536a7b46812 100644
--- a/mail/cue/Makefile
+++ b/mail/cue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/02/10 08:45:50 itojun Exp $
+# $NetBSD: Makefile,v 1.44 2005/03/23 09:42:33 jlam Exp $
 
 DISTNAME=	cue-snap-20050131
 PKGNAME=	cue-20050131
@@ -13,28 +13,38 @@ USE_BUILDLINK3=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=	USE_INET6 USE_IDEA CUE_USE_CANNA
+# Global & legacy options
+.if defined(CUE_USE_CANNA) && !empty(CUE_USE_CANNA:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	canna
+.endif
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.cue
+PKG_SUPPORTED_OPTIONS=	canna idea inet6
+.include "../../mk/bsd.options.mk"
 
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss]) && \
-    ${OPSYS} != "SunOS"
+.if !empty(PKG_OPTIONS:Minet6) && (${OPSYS} != "SunOS")
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if defined(CUE_USE_CANNA) && !empty(CUE_USE_CANNA:M[Yy][Ee][Ss])
-.include "../../inputmethod/canna-lib/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mcanna)
+.  include "../../inputmethod/canna-lib/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-canna=${BUILDLINK_PREFIX.canna}
 .else
 CONFIGURE_ARGS+=	--without-canna
 .endif
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
-.if defined(USE_IDEA) && !empty(USE_IDEA:M[Yy][Ee][Ss])
+
+.if !empty(PKG_OPTIONS:Midea)
 CONFIGURE_ARGS+=	--enable-idea
 .endif
 
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 
+.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cue ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cue
@@ -42,6 +52,4 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cue
 	${INSTALL_DATA} ${WRKSRC}/cue.hlp  ${PREFIX}/share/doc/cue
 
-.include "../../security/openssl/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"