summaryrefslogtreecommitdiff
path: root/editors/emacs-nox11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2007-08-13 12:40:57 +0000
committerjlam <jlam@pkgsrc.org>2007-08-13 12:40:57 +0000
commitd2c1168fbb33c62ba2c6951260591d6645ec3f0f (patch)
tree8552a79498067dda4b7f3f68a15003858bc3d074 /editors/emacs-nox11
parentfde3ce040605d5b3726bfafe7fc0dd2178190dfa (diff)
downloadpkgsrc-d2c1168fbb33c62ba2c6951260591d6645ec3f0f.tar.gz
Fix up the use of package options in the Emacs packages:
(1) Get rid of "nox11" -- the concept of "no" in package options is expressed by negating an option; use "-x11" instead. (2) Teach editors/emacs20 to use package options instead of EMACS_USE_POP, EMACS_USE_X, EMACS_USE_X_TOOLKIT and USE_INET6. We now use similar options as the other emacs packages, i.e. "x11", "motif", "xaw", as well as "pop" and "inet6". (3) Make the emacs*-nox11 packages simply remove all X11 options by setting PKG_OPTIONS.emacs appropriately and include the corresponding emacs Makefile. This allows for modifications to the emacs "X11" versions to be automatically picked up by the "non-X11" versions. The two corresponding versions of emacs now share the same version numbering, including PKGREVISIONs. Bump the PKGREVISIONs on all Emacs editor packages.
Diffstat (limited to 'editors/emacs-nox11')
-rw-r--r--editors/emacs-nox11/Makefile20
1 files changed, 7 insertions, 13 deletions
diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile
index 0eb08db4eef..6c76626f8f3 100644
--- a/editors/emacs-nox11/Makefile
+++ b/editors/emacs-nox11/Makefile
@@ -1,19 +1,13 @@
-# $NetBSD: Makefile,v 1.26 2007/06/11 13:57:21 markd Exp $
+# $NetBSD: Makefile,v 1.27 2007/08/13 12:40:57 jlam Exp $
-DISTNAME= emacs-${EMACSVERSION}
PKGNAME= emacs-nox11-${EMACSVERSION}
-CATEGORIES= editors
-COMMENT= GNU editing macros (editor) - non X11 version
-
-.include "../../editors/emacs/Makefile.common"
+COMMENT_EXTRA= : non-X11 version
CONFLICTS+= emacs-[0-9]*
-CONFIGURE_ARGS+= --without-x
-CONFIGURE_ARGS+= --without-xpm
-CONFIGURE_ARGS+= --without-jpeg
-CONFIGURE_ARGS+= --without-tiff
-CONFIGURE_ARGS+= --without-gif
-CONFIGURE_ARGS+= --without-png
+.include "../../mk/bsd.prefs.mk"
+
+# Forcibly remove any "x11" options.
+PKG_OPTIONS.emacs+= -x11 -gtk -motif -xaw
-.include "../../mk/bsd.pkg.mk"
+.include "../../editors/emacs/Makefile"