Convert to use bsd.options.mk, the following options are available:

	ldap xface canna

# XXX Support for the following variables will be removed after the
# XXX pkgsrc-2004Q4 branch is released:
# XXX
# XXX USE_OPENLDAP
# XXX USE_XFACE
# XXX XEMACS_USE_CANNA

2 files changed, 50 insertions, 25 deletions

diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common
index ec7c35ebc6f..c38fda6b1a4 100644
--- a/editors/xemacs/Makefile.common
+++ b/editors/xemacs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2004/05/02 00:23:40 snj Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/11/25 21:34:59 xtraeme Exp $
 
 DISTNAME=	xemacs-21.4.15
 CATEGORIES=	editors
@@ -12,14 +12,13 @@ NOT_FOR_PLATFORM=	*-*-mips*	# fails purespace dumping
 
 USE_BUILDLINK3=	YES
 
-BUILD_DEFS+=	USE_OPENLDAP USE_XFACE XEMACS_USE_CANNA
 DIST_SUBDIR=	xemacs
 EXTRA_FILES=	${DISTNAME}-elc.tar.gz ${DISTNAME}-info.tar.gz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 PLIST_SUBST+=	DISTNAME="${DISTNAME}"
 MESSAGE_SUBST+=	DISTNAME="${DISTNAME}"
 
-.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 # XXX GUI configuration is a mess...
 #
@@ -69,27 +68,6 @@ CONFIGURE_ARGS+=	--with_sound=none
 .  endif
 .endif
 
-.if defined(USE_OPENLDAP) && (${USE_OPENLDAP} == "YES")
-WITH_LDAP=	--with-ldap
-.  include "../../databases/openldap/buildlink3.mk"
-.else
-WITH_LDAP=	--without-ldap
-.endif
-
-.if defined(USE_XFACE) && (${USE_XFACE} == "YES")
-WITH_XFACE=	--with-xface
-.  include "../../mail/faces/buildlink3.mk"
-.else
-WITH_XFACE=	--without-xface
-.endif
-
-.if defined(XEMACS_USE_CANNA) && (${XEMACS_USE_CANNA} == "YES")
-.  include "../../inputmethod/canna-lib/buildlink3.mk"
-WITH_CANNA=	--with-canna
-.else
-WITH_CANNA=	--without-canna
-.endif
-
 .if defined(MANZ)
 PLIST_SUBST+=	ELSUFX='.gz'
 .else
@@ -110,7 +88,7 @@ CONFIGURE_ARGS+=	--with-mule=yes
 CONFIGURE_ARGS+=	--with-ncurses=no
 .endif
 CONFIGURE_ARGS+=	--with-msw=no
-CONFIGURE_ARGS+=	${WITH_DIALOGS} ${WITH_LDAP} ${WITH_XFACE} ${WITH_CANNA}
+CONFIGURE_ARGS+=	${WITH_DIALOGS}
 CONFIGURE_ARGS+=	--infopath="${INFOPATH}"
 CONFIGURE_ARGS+=	--site-includes=${BUILDLINK_DIR}/include:${WRKDIR}
 CONFIGURE_ARGS+=	--site-libraries=${BUILDLINK_DIR}/lib
diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk
new file mode 100644
index 00000000000..a5ba8d78666
--- /dev/null
+++ b/editors/xemacs/options.mk
@@ -0,0 +1,47 @@
+# $NetBSD: options.mk,v 1.1 2004/11/25 21:34:59 xtraeme Exp $
+#
+# XXX Support for the following variables will be removed after the
+# XXX pkgsrc-2004Q4 branch is released:
+# XXX
+# XXX USE_OPENLDAP
+# XXX USE_XFACE
+# XXX XEMACS_USE_CANNA
+
+.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	ldap
+.endif
+
+.if defined(USE_XFACE) && !empty(USE_XFACE:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	xfaces
+.endif
+
+.if defined(XEMACS_USE_CANNA) && !empty(XEMACS_USE_CANNA:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	canna
+.endif
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.xemacs
+PKG_SUPPORTED_OPTIONS=	ldap xface canna
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mldap)
+CONFIGURE_ARGS=	--with-ldap
+.  include "../../databases/openldap/buildlink3.mk"
+.else
+CONFIGURE_ARGS=	--without-ldap
+.endif
+
+.if !empty(PKG_OPTIONS:Mxface)
+CONFIGURE_ARGS=	--with-xface
+.  include "../../mail/faces/buildlink3.mk"
+.else
+CONFIGURE_ARGS=	--without-xface
+.endif
+
+.if !empty(PKG_OPTIONS:Mcanna)
+.  include "../../inputmethod/canna-lib/buildlink3.mk"
+CONFIGURE_ARGS=	--with-canna
+.else
+CONFIGURE_ARGS=	--without-canna
+.endif
+