CVS commit: pkgsrc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Mar 10 10:09:42 UTC 2022

Modified Files:
        pkgsrc/meta-pkgs/modular-xorg-apps: Makefile
        pkgsrc/sysutils/deforaos-terminal: Makefile
        pkgsrc/x11/libqtxdg: Makefile
        pkgsrc/x11/modular-xorg-xquartz: Makefile

Log Message:
*: 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.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/meta-pkgs/modular-xorg-apps/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/deforaos-terminal/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/libqtxdg/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/modular-xorg-xquartz/Makefile

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

Modified files:

Index: pkgsrc/meta-pkgs/modular-xorg-apps/Makefile
diff -u pkgsrc/meta-pkgs/modular-xorg-apps/Makefile:1.43 pkgsrc/meta-pkgs/modular-xorg-apps/Makefile:1.44
--- pkgsrc/meta-pkgs/modular-xorg-apps/Makefile:1.43    Sat Jan 18 23:32:55 2020
+++ pkgsrc/meta-pkgs/modular-xorg-apps/Makefile Thu Mar 10 10:09:42 2022
@@ -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

Index: pkgsrc/sysutils/deforaos-terminal/Makefile
diff -u pkgsrc/sysutils/deforaos-terminal/Makefile:1.27 pkgsrc/sysutils/deforaos-terminal/Makefile:1.28
--- pkgsrc/sysutils/deforaos-terminal/Makefile:1.27     Wed Dec  8 16:06:27 2021
+++ pkgsrc/sysutils/deforaos-terminal/Makefile  Thu Mar 10 10:09:42 2022
@@ -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

Index: pkgsrc/x11/libqtxdg/Makefile
diff -u pkgsrc/x11/libqtxdg/Makefile:1.16 pkgsrc/x11/libqtxdg/Makefile:1.17
--- pkgsrc/x11/libqtxdg/Makefile:1.16   Wed Dec  8 16:02:55 2021
+++ pkgsrc/x11/libqtxdg/Makefile        Thu Mar 10 10:09:42 2022
@@ -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]*:../../
 
 .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"

Index: pkgsrc/x11/modular-xorg-xquartz/Makefile
diff -u pkgsrc/x11/modular-xorg-xquartz/Makefile:1.14 pkgsrc/x11/modular-xorg-xquartz/Makefile:1.15
--- pkgsrc/x11/modular-xorg-xquartz/Makefile:1.14       Thu Feb 25 12:30:58 2021
+++ pkgsrc/x11/modular-xorg-xquartz/Makefile    Thu Mar 10 10:09:42 2022
@@ -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]*:../..
 
 # 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=