pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors/xemacs-current Convert to use bsd.options.mk, ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b1c664032b4e
branches: trunk
changeset: 484191:b1c664032b4e
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Thu Nov 25 21:42:59 2004 +0000
description:
Convert to use bsd.options.mk, the following options are available:
esound 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_ESD
# XXX XEMACS_USE_CANNA
diffstat:
editors/xemacs-current/Makefile | 35 ++--------------------
editors/xemacs-current/options.mk | 58 +++++++++++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+), 31 deletions(-)
diffs (132 lines):
diff -r 4d5262b71ab7 -r b1c664032b4e editors/xemacs-current/Makefile
--- a/editors/xemacs-current/Makefile Thu Nov 25 21:34:59 2004 +0000
+++ b/editors/xemacs-current/Makefile Thu Nov 25 21:42:59 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2004/11/25 18:09:06 magick Exp $
+# $NetBSD: Makefile,v 1.42 2004/11/25 21:42:59 xtraeme Exp $
DISTNAME= xemacs-21.5.18
CATEGORIES= editors
@@ -11,7 +11,7 @@
USE_BUILDLINK3= YES
USE_X11= YES
-BUILD_DEFS+= XEMACS_WIDGETS XEMACS_ESD USE_OPENLDAP USE_XFACE XEMACS_USE_CANNA
+BUILD_DEFS+= XEMACS_WIDGETS
PLIST_SUBST+= EMACSVER=xemacs-21.5-b18
MESSAGE_SUBST+= EMACSVER=xemacs-21.5-b18
@@ -19,7 +19,7 @@
GCC_REQD+= 2.95.3
.endif
-.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
XEMACS_WIDGETS?= lucid
.if ${XEMACS_WIDGETS} == "gtk"
@@ -35,33 +35,6 @@
WITH_WIDGETS= --with-widgets=lucid
.endif
-.if defined(XEMACS_ESD) && (${XEMACS_ESD} == "YES")
-. include "../../audio/esound/buildlink3.mk"
-.else
-CONFIGURE_ARGS += --with-sound=none
-.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")
-. include "../../mail/faces/buildlink3.mk"
-WITH_XFACE= --with-xface
-.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
-
.include "../../databases/gdbm/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
@@ -77,7 +50,7 @@
CONFIGURE_ARGS+= --with-mule=yes
CONFIGURE_ARGS+= --without-ncurses
CONFIGURE_ARGS+= --without-msw
-CONFIGURE_ARGS+= ${WITH_WIDGETS} ${WITH_LDAP} ${WITH_XFACE} ${WITH_CANNA}
+CONFIGURE_ARGS+= ${WITH_WIDGETS}
CONFIGURE_ARGS+= --infopath="${INFOPATH}"
CONFIGURE_ARGS+= --site-includes=${PREFIX}/include:${WRKDIR}
CONFIGURE_ARGS+= --site-libraries=${PREFIX}/lib
diff -r 4d5262b71ab7 -r b1c664032b4e editors/xemacs-current/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/xemacs-current/options.mk Thu Nov 25 21:42:59 2004 +0000
@@ -0,0 +1,58 @@
+# $NetBSD: options.mk,v 1.1 2004/11/25 21:42: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_ESD
+# 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
+
+.if defined(XEMACS_ESD) && !empty(XEMACS_ESD:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+= esoundd
+.endif
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs
+PKG_SUPPORTED_OPTIONS= esoundd 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
+
+.if !empty(PKG_OPTIONS:Mesound)
+. include "../../audio/esound/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --with-sound=none
+.endif
+
Home |
Main Index |
Thread Index |
Old Index