Subject: CVS commit: pkgsrc/editors
To: None <pkgsrc-changes@NetBSD.org>
From: Johnny C. Lam <jlam@netbsd.org>
List: pkgsrc-changes
Date: 08/13/2007 12:40:59
Module Name:	pkgsrc
Committed By:	jlam
Date:		Mon Aug 13 12:40:59 UTC 2007

Modified Files:
	pkgsrc/editors/emacs: Makefile options.mk
	pkgsrc/editors/emacs-nox11: Makefile
	pkgsrc/editors/emacs20: Makefile
	pkgsrc/editors/emacs21: Makefile
	pkgsrc/editors/emacs21-nox11: Makefile
Added Files:
	pkgsrc/editors/emacs20: options.mk
	pkgsrc/editors/emacs21: options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -r1.104 -r1.105 pkgsrc/editors/emacs/Makefile
cvs rdiff -r1.1 -r1.2 pkgsrc/editors/emacs/options.mk
cvs rdiff -r1.26 -r1.27 pkgsrc/editors/emacs-nox11/Makefile
cvs rdiff -r1.31 -r1.32 pkgsrc/editors/emacs20/Makefile
cvs rdiff -r0 -r1.1 pkgsrc/editors/emacs20/options.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/editors/emacs21/Makefile
cvs rdiff -r0 -r1.1 pkgsrc/editors/emacs21/options.mk
cvs rdiff -r1.4 -r1.5 pkgsrc/editors/emacs21-nox11/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.