*: 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 TritonDataCenter#324.
NetBSD · Mar 10, 2022 · 7241632 · 7241632
1 parent 273b4dc
commit 7241632
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/meta-pkgs/modular-xorg-apps/Makefile b/meta-pkgs/modular-xorg-apps/Makefile
@@ -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+=	xset-[0-9]*:../../x11/xset
 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 --git a/sysutils/deforaos-terminal/Makefile b/sysutils/deforaos-terminal/Makefile
@@ -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+=	CFLAGS=${CFLAGS:Q}
 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 --git a/x11/libqtxdg/Makefile b/x11/libqtxdg/Makefile
@@ -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 @@ TOOL_DEPENDS+=	qt5-qttools-[0-9]*:../../x11/qt5-qttools
 
 .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 --git a/x11/modular-xorg-xquartz/Makefile b/x11/modular-xorg-xquartz/Makefile
@@ -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 @@ DEPENDS+=		xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
 
 # 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=