Module Name:	pkgsrc
Committed By:	uebayasi
Date:		Wed Nov 27 09:13:48 UTC 2002

Modified Files:
	pkgsrc/mk: emacs.mk

Log Message:
* EMACS_VERSION_ACCEPTED -> EMACS_VERSIONS_ACCEPTED

* Set CONFLICTS appropriately so that Emacs version and XEmacs version of a
  package can't be installed at once.


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 pkgsrc/mk/emacs.mk

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