diff options
| author | jperkin <jperkin@pkgsrc.org> | 2022-03-10 10:09:42 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2022-03-10 10:09:42 +0000 |
| commit | 724163215ff68502b986786f27cafd0976ac0cf3 (patch) | |
| tree | dc030901e488d96552b13655678e4aacd333f701 | |
| parent | 273b4dccbbda002fce7c53bc93b9e31199d6aa0d (diff) | |
| download | pkgsrc-724163215ff68502b986786f27cafd0976ac0cf3.tar.gz | |
*: 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.
| -rw-r--r-- | meta-pkgs/modular-xorg-apps/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/deforaos-terminal/Makefile | 4 | ||||
| -rw-r--r-- | x11/libqtxdg/Makefile | 4 | ||||
| -rw-r--r-- | x11/modular-xorg-xquartz/Makefile | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/meta-pkgs/modular-xorg-apps/Makefile b/meta-pkgs/modular-xorg-apps/Makefile index 6cd60090970..c873037ab2c 100644 --- 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 index fce4396e8a5..7aec7ce8857 100644 --- 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 index 1ec9b70d719..52ebec371f6 100644 --- 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 index 15d1bbef09a..d5f02972348 100644 --- 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= |