[pkgsrc/trunk]: pkgsrc *: Allow mxterm as an alternate xterm dependency.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/17d5ede2b84c
branches:  trunk
changeset: 375231:17d5ede2b84c
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Mar 10 10:09:42 2022 +0000

description:
*: Allow mxterm as an alternate xterm dependency.

The two packages conflict due to bin/resize but binary package users should be
able to use mxterm instead.  Resolves part of joyent/pkgsrc#324.

diffstat:

 meta-pkgs/modular-xorg-apps/Makefile |  4 ++--
 sysutils/deforaos-terminal/Makefile  |  4 ++--
 x11/libqtxdg/Makefile                |  4 ++--
 x11/modular-xorg-xquartz/Makefile    |  4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r de73a81c412b -r 17d5ede2b84c meta-pkgs/modular-xorg-apps/Makefile
--- a/meta-pkgs/modular-xorg-apps/Makefile      Thu Mar 10 08:49:27 2022 +0000
+++ b/meta-pkgs/modular-xorg-apps/Makefile      Thu Mar 10 10:09:42 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2020/01/18 23:32:55 rillig Exp $
+# $NetBSD: Makefile,v 1.44 2022/03/10 10:09:42 jperkin Exp $
 
 DISTNAME=      # empty
 PKGNAME=       modular-xorg-apps-1.14.1.14
@@ -85,7 +85,7 @@
 DEPENDS+=      xsetroot-[0-9]*:../../x11/xsetroot
 DEPENDS+=      xsm-[0-9]*:../../x11/xsm
 DEPENDS+=      xstdcmap-[0-9]*:../../x11/xstdcmap
-DEPENDS+=      xterm-[0-9]*:../../x11/xterm
+DEPENDS+=      {xterm,mxterm}-[0-9]*:../../x11/xterm
 DEPENDS+=      xtrans-[0-9]*:../../x11/xtrans
 DEPENDS+=      xvinfo-[0-9]*:../../x11/xvinfo
 DEPENDS+=      xwininfo-[0-9]*:../../x11/xwininfo
diff -r de73a81c412b -r 17d5ede2b84c sysutils/deforaos-terminal/Makefile
--- a/sysutils/deforaos-terminal/Makefile       Thu Mar 10 08:49:27 2022 +0000
+++ b/sysutils/deforaos-terminal/Makefile       Thu Mar 10 10:09:42 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2021/12/08 16:06:27 adam Exp $
+# $NetBSD: Makefile,v 1.28 2022/03/10 10:09:42 jperkin Exp $
 #
 
 DISTNAME=      Terminal-0.2.0
@@ -25,7 +25,7 @@
 MAKE_FLAGS+=   LDFLAGS=${LDFLAGS:Q}
 AUTO_MKDIRS=   yes
 
-DEPENDS+=      xterm-[0-9]*:../../x11/xterm
+DEPENDS+=      {xterm,mxterm}-[0-9]*:../../x11/xterm
 
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/share/man/html1/terminal.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/terminal.html
diff -r de73a81c412b -r 17d5ede2b84c x11/libqtxdg/Makefile
--- a/x11/libqtxdg/Makefile     Thu Mar 10 08:49:27 2022 +0000
+++ b/x11/libqtxdg/Makefile     Thu Mar 10 10:09:42 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/12/08 16:02:55 adam Exp $
+# $NetBSD: Makefile,v 1.17 2022/03/10 10:09:42 jperkin Exp $
 
 DISTNAME=      libqtxdg-3.8.0
 PKGREVISION=   1
@@ -40,7 +40,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} != "NetBSD" || ${X11_TYPE} == "modular"
-DEPENDS+=      xterm-[0-9]*:../../x11/xterm
+DEPENDS+=      {xterm,mxterm}-[0-9]*:../../x11/xterm
 .endif
 
 .include "../../devel/glib2/buildlink3.mk"
diff -r de73a81c412b -r 17d5ede2b84c x11/modular-xorg-xquartz/Makefile
--- a/x11/modular-xorg-xquartz/Makefile Thu Mar 10 08:49:27 2022 +0000
+++ b/x11/modular-xorg-xquartz/Makefile Thu Mar 10 10:09:42 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/02/25 12:30:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2022/03/10 10:09:42 jperkin Exp $
 
 DISTNAME=      xorg-server-1.17.2
 PKGNAME=       ${DISTNAME:S/xorg-server/modular-xorg-xquartz/}
@@ -31,7 +31,7 @@
 
 # Needed by X11.app:
 DEPENDS+=              quartz-wm-[0-9]*:../../wm/quartz-wm
-DEPENDS+=              xterm-[0-9]*:../../x11/xterm
+DEPENDS+=              {xterm,mxterm}-[0-9]*:../../x11/xterm
 DEPENDS+=              xinit-[0-9]*:../../x11/xinit
 
 LEGACY_FONT_PATHS=