CVS commit: pkgsrc/editors/emacs

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sat May 14 21:57:01 UTC 2022

Modified Files:
        pkgsrc/editors/emacs: modules.mk

Log Message:
editors/emacs/modules.mk: remove explicit CONFLICTS

There's no need for CONFLICTS between the xemacs and emacs versions of
the same elisp package unless the PLISTs overlap, and if they do (most
don't because they install into different subtrees), that fact is
sufficient.

As suggested by PR 39886, a long long time ago.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/editors/emacs/modules.mk

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

Modified files:

Index: pkgsrc/editors/emacs/modules.mk
diff -u pkgsrc/editors/emacs/modules.mk:1.30 pkgsrc/editors/emacs/modules.mk:1.31
--- pkgsrc/editors/emacs/modules.mk:1.30        Thu Apr  7 10:35:28 2022
+++ pkgsrc/editors/emacs/modules.mk     Sat May 14 21:57:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.30 2022/04/07 10:35:28 ryoon Exp $
+# $NetBSD: modules.mk,v 1.31 2022/05/14 21:57:01 dholland Exp $
 #
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
 #
@@ -12,8 +12,9 @@
 #              XEmacs
 #                      ->${PREFIX}/lib/xemacs/site-packages/lisp/foo/...
 #
-#      * You can't install an ELP for both Emacs and XEmacs
-#        simultaneously.
+#      * You can't necessarily install an ELP for both Emacs and XEmacs
+#        simultaneously, though because of the above path difference many
+#        do not conflict with one another.
 #
 #      * XEmacs packages' names are prefixed by "xemacs-".
 #
@@ -259,13 +260,11 @@ _EMACS_ETCDIR.emacs=              share
 _EMACS_INFODIR.emacs=          ${PKGINFODIR}
 _EMACS_LISPDIR.emacs=          share/emacs/site-lisp
 _EMACS_PKGNAME_PREFIX.emacs=
-_EMACS_CONFLICTS.emacs=                xemacs-${PKGBASE}-[0-9]*
 
 _EMACS_ETCDIR.xemacs=          lib/xemacs/site-packages/etc
 _EMACS_INFODIR.xemacs=         lib/xemacs/site-packages/info
 _EMACS_LISPDIR.xemacs=         lib/xemacs/site-packages/lisp
 _EMACS_PKGNAME_PREFIX.xemacs=  xemacs-
-_EMACS_CONFLICTS.xemacs=       ${PKGBASE:C|^xemacs-||}-[0-9]*
 
 #
 # Version decision
@@ -299,7 +298,6 @@ _EMACS_PKGDIR=      ${_EMACS_PKGDIR_MAP:M${_E
 #
 
 DEPENDS+=      ${_EMACS_REQD}:${_EMACS_PKGDIR}
-CONFLICTS+=    ${_EMACS_CONFLICTS.${_EMACS_FLAVOR}}
 
 EMACS_MODULES?=
 .for _mod_ in ${EMACS_MODULES}